works on cloud

flake.nix

@@ -11,7 +11,6 @@
       url = "github:lnl7/nix-darwin/nix-darwin-25.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    ghostty.url = "github:ghostty-org/ghostty";
     rust-overlay.url = "github:oxalica/rust-overlay";
     aagl = {
       url = "github:ezKEa/aagl-gtk-on-nix";
@@ -38,11 +37,7 @@
     userName = "wyatt";
     userEmail = "wyatt@wyattjmiller.com";
     extraSpecialArgs = {
-<<<<<<< HEAD
-      inherit userName userEmail;
-=======
-      inherit userName userEmail ghostty swaytreesave;
->>>>>>> origin
+      inherit userName userEmail swaytreesave;
     };
 
     myOverlays = { ... }: {
@@ -88,11 +83,7 @@
     nixosConfigurations."cloud" = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       specialArgs = {
-<<<<<<< HEAD
-        inherit userName userEmail;
-=======
-        inherit userName userEmail ghostty aagl vintage-story;
->>>>>>> origin
+        inherit userName userEmail aagl vintage-story;
         hostname = "cloud";
         role = "workstation";
       };