Merge remote-tracking branch 'origin' into hm-standalone-config

flake.nix

@@ -13,6 +13,14 @@
     };
     ghostty.url = "github:ghostty-org/ghostty";
     rust-overlay.url = "github:oxalica/rust-overlay";
+    aagl = {
+      url = "github:ezKEa/aagl-gtk-on-nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    # My personal flakes
+    swaytreesave.url = "git+https://scm.wyattjmiller.com/wymiller/swaytreesave-nix.git";
+    vintage-story.url = "git+https://scm.wyattjmiller.com/wymiller/vintage-story-nix.git";
   };
 
   outputs = inputs @ {
@@ -22,17 +30,25 @@
     darwin,
     home-manager,
     rust-overlay,
+    aagl,
+    swaytreesave,
+    vintage-story,
     ...
   }: let
     userName = "wyatt";
     userEmail = "wyatt@wyattjmiller.com";
     extraSpecialArgs = {
+<<<<<<< HEAD
       inherit userName userEmail;
+=======
+      inherit userName userEmail ghostty swaytreesave;
+>>>>>>> origin
     };
 
     myOverlays = { ... }: {
       nixpkgs.overlays = [
         rust-overlay.overlays.default
+        aagl.overlays.default
         self.common.overlays
       ];
     };
@@ -72,7 +88,11 @@
     nixosConfigurations."cloud" = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       specialArgs = {
+<<<<<<< HEAD
         inherit userName userEmail;
+=======
+        inherit userName userEmail ghostty aagl vintage-story;
+>>>>>>> origin
         hostname = "cloud";
         role = "workstation";
       };