From 2694e3288cb16aef55428b1898700b814003fc15 Mon Sep 17 00:00:00 2001
From: Noah Masur <7386960+nmasur@users.noreply.github.com>
Date: Tue, 18 Oct 2022 12:21:22 +0000
Subject: [PATCH] move generators to hosts directory

---
 flake.nix                              | 16 ++++++++--------
 {generators => hosts}/aws/default.nix  |  3 +--
 {generators => hosts}/aws/main.tf      |  0
 {generators => hosts}/aws/workflow.yml |  0
 4 files changed, 9 insertions(+), 10 deletions(-)
 rename {generators => hosts}/aws/default.nix (86%)
 rename {generators => hosts}/aws/main.tf (100%)
 rename {generators => hosts}/aws/workflow.yml (100%)

diff --git a/flake.nix b/flake.nix
index 1a9709c..258bc58 100644
--- a/flake.nix
+++ b/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;
diff --git a/generators/aws/default.nix b/hosts/aws/default.nix
similarity index 86%
rename from generators/aws/default.nix
rename to hosts/aws/default.nix
index 6077930..69bf62c 100644
--- a/generators/aws/default.nix
+++ b/hosts/aws/default.nix
@@ -14,8 +14,7 @@ nixos-generators.nixosGenerate {
       networking.hostName = "sheep";
       gui.enable = false;
       colorscheme = (import ../modules/colorscheme/gruvbox);
-      passwordHash =
-        "$6$PZYiMGmJIIHAepTM$Wx5EqTQ5GApzXx58nvi8azh16pdxrN6Qrv1wunDlzveOgawitWzcIxuj76X9V868fsPi/NOIEO8yVXqwzS9UF.";
+      passwordHash = null;
       publicKey =
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB+AbmjGEwITk5CK9y7+Rg27Fokgj9QEjgc9wST6MA3s";
       # AWS settings require this
diff --git a/generators/aws/main.tf b/hosts/aws/main.tf
similarity index 100%
rename from generators/aws/main.tf
rename to hosts/aws/main.tf
diff --git a/generators/aws/workflow.yml b/hosts/aws/workflow.yml
similarity index 100%
rename from generators/aws/workflow.yml
rename to hosts/aws/workflow.yml