move generators to hosts directory

flake.nix

@@ -78,6 +78,14 @@
         };
       };
 
+      # Package servers into images with a generator
+      packages.x86_64-linux = with inputs; {
+        aws = import ./hosts/aws {
+          inherit nixpkgs nixos-generators home-manager globals;
+          system = "x86_64-linux";
+        };
+      };
+
       apps = forAllSystems (system:
         let pkgs = import nixpkgs { inherit system; };
         in rec {
@@ -132,14 +140,6 @@
 
         });
 
-      # Package servers into images with a generator
-      packages.x86_64-linux = with inputs; {
-        aws = import ./generators/aws {
-          inherit nixpkgs nixos-generators home-manager globals;
-          system = "x86_64-linux";
-        };
-      };
-
       # Templates for starting other projects quickly
       templates = rec {
         default = basic;

hosts/aws/default.nix

@@ -14,16 +14,15 @@ nixos-generators.nixosGenerate {
       networking.hostName = "sheep";
       gui.enable = false;
       colorscheme = (import ../modules/colorscheme/gruvbox);
-      passwordHash =
+      passwordHash = null;
-        "$6$PZYiMGmJIIHAepTM$Wx5EqTQ5GApzXx58nvi8azh16pdxrN6Qrv1wunDlzveOgawitWzcIxuj76X9V868fsPi/NOIEO8yVXqwzS9UF.";
       publicKey =
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB+AbmjGEwITk5CK9y7+Rg27Fokgj9QEjgc9wST6MA3s";
       # AWS settings require this
       permitRootLogin = "prohibit-password";
     }
-    ../hosts/common.nix
+    ../../hosts/common.nix
-    ../modules/nixos
+    ../../modules/nixos
-    ../modules/services/sshd.nix
+    ../../modules/services/sshd.nix
   ] ++ [
     # Required to fix diskSize errors during build
     ({ ... }: { amazonImage.sizeMB = 16 * 1024; })