From c506ab8cecb02d926377930fde5341edeb951906 Mon Sep 17 00:00:00 2001
From: Tyler Starr <starrtyler88@gmail.com>
Date: Thu, 26 Sep 2024 19:19:09 -0700
Subject: [PATCH] refactor flakes per host

---
 provision/flake.nix                 | 111 +++++-----------------------
 provision/hosts/bulwark/default.nix |  24 ++++++
 provision/hosts/default.nix         |   4 -
 provision/hosts/kestrel/default.nix |  24 ++++++
 provision/hosts/shivan/default.nix  |  24 ++++++
 provision/hosts/torus/default.nix   |  24 ++++++
 6 files changed, 114 insertions(+), 97 deletions(-)
 create mode 100644 provision/hosts/bulwark/default.nix
 delete mode 100644 provision/hosts/default.nix
 create mode 100644 provision/hosts/kestrel/default.nix
 create mode 100644 provision/hosts/shivan/default.nix
 create mode 100644 provision/hosts/torus/default.nix

diff --git a/provision/flake.nix b/provision/flake.nix
index 9316fc21..1dae0115 100644
--- a/provision/flake.nix
+++ b/provision/flake.nix
@@ -23,99 +23,24 @@
   let
     system = "x86_64-linux";
     user = "tstarr";
-    lib = nixpkgs.lib;
-    pkgs = import nixpkgs {
-      inherit system;
-    };
   in {
-    nixosConfigurations = {
-      kestrel = lib.nixosSystem {
-        inherit system;
-        specialArgs = { inherit user; inherit inputs; };
-        modules = [
-          ./hosts/default.nix
-          ./hosts/kestrel/configuration.nix
-          ./hosts/kestrel/hardware.nix
-          ./modules
-          agenix.nixosModules.default
-          home-manager.nixosModules.home-manager {
-            home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages = true;
-            home-manager.extraSpecialArgs = { inherit user; };
-            home-manager.users.${user} = {
-              imports = [ 
-                ./home-modules
-              ];
-            };
-          }
-        ];
-      };
-
-      shivan = lib.nixosSystem {
-        inherit system;
-        specialArgs = { inherit user; inherit inputs; };
-        modules = [
-          ./hosts/default.nix
-          ./hosts/shivan/configuration.nix
-          ./hosts/shivan/hardware.nix
-          ./modules
-          agenix.nixosModules.default
-          home-manager.nixosModules.home-manager {
-            home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages = true;
-            home-manager.extraSpecialArgs = { inherit user; };
-            home-manager.users.${user} = {
-              imports = [ 
-                ./home-modules
-              ];
-            };
-          }
-        ];
-      };
-
-      torus = lib.nixosSystem {
-        inherit system;
-        specialArgs = { inherit user; inherit inputs; };
-        modules = [
-          ./hosts/default.nix
-          ./hosts/torus/configuration.nix
-          ./hosts/torus/hardware.nix
-          ./modules
-          agenix.nixosModules.default
-          home-manager.nixosModules.home-manager {
-            home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages = true;
-            home-manager.extraSpecialArgs = { inherit user; };
-            home-manager.users.${user} = {
-              imports = [ 
-                ./home-modules
-              ];
-            };
-          }
-        ];
-      };
-
-      bulwark = lib.nixosSystem {
-        inherit system;
-        specialArgs = { inherit user; inherit inputs; inherit jovian-nixos; inherit home-manager; };
-        modules = [
-          ./hosts/default.nix
-          ./hosts/bulwark/configuration.nix
-          ./hosts/bulwark/hardware.nix
-          ./modules
-          agenix.nixosModules.default
-          home-manager.nixosModules.home-manager {
-            home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages = true;
-            home-manager.extraSpecialArgs = { inherit user; };
-            home-manager.users.${user} = {
-              imports = [ 
-                ./home-modules
-              ];
-            };
-          }
-        ];
-      };
-    };
+    nixosConfigurations = ( 
+      import ./hosts/kestrel {
+        inherit (nixpkgs) lib;
+        inherit system user inputs agenix home-manager;
+      }
+      import ./hosts/shivan {
+        inherit (nixpkgs) lib;
+        inherit system user inputs agenix home-manager;
+      }
+      import ./hosts/torus {
+        inherit (nixpkgs) lib;
+        inherit system user inputs agenix home-manager;
+      }
+      import ./hosts/bulwark {
+        inherit (nixpkgs) lib;
+        inherit system user inputs agenix home-manager jovian-nixos;
+      }
+    ); 
   };
 }
diff --git a/provision/hosts/bulwark/default.nix b/provision/hosts/bulwark/default.nix
new file mode 100644
index 00000000..d4c8c5f2
--- /dev/null
+++ b/provision/hosts/bulwark/default.nix
@@ -0,0 +1,24 @@
+{ lib, system, user, inputs, agenix, home-manager, jovian-nixos, ... }:
+{
+  kestrel = lib.nixosSystem {
+    inherit system;
+    specialArgs = { inherit user inputs; };
+    modules = [
+      ../default
+      ../../modules
+      ./configuration.nix
+      ./hardware.nix
+      agenix.nixosModules.default
+      home-manager.nixosModules.home-manager {
+        home-manager.useGlobalPkgs = true;
+        home-manager.useUserPackages = true;
+        home-manager.extraSpecialArgs = { inherit user; };
+        home-manager.users.${user} = {
+          imports = [ 
+            ../../home-modules
+          ];
+        };
+      }
+    ];
+  };
+}
diff --git a/provision/hosts/default.nix b/provision/hosts/default.nix
deleted file mode 100644
index 33c8c12a..00000000
--- a/provision/hosts/default.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ ... }:
-{
-  imports = [ ./default ];
-}
diff --git a/provision/hosts/kestrel/default.nix b/provision/hosts/kestrel/default.nix
new file mode 100644
index 00000000..3bb15a78
--- /dev/null
+++ b/provision/hosts/kestrel/default.nix
@@ -0,0 +1,24 @@
+{ lib, system, user, inputs, agenix, home-manager, ... }:
+{
+  kestrel = lib.nixosSystem {
+    inherit system;
+    specialArgs = { inherit user inputs; };
+    modules = [
+      ../default
+      ../../modules
+      ./configuration.nix
+      ./hardware.nix
+      agenix.nixosModules.default
+      home-manager.nixosModules.home-manager {
+        home-manager.useGlobalPkgs = true;
+        home-manager.useUserPackages = true;
+        home-manager.extraSpecialArgs = { inherit user; };
+        home-manager.users.${user} = {
+          imports = [ 
+            ../../home-modules
+          ];
+        };
+      }
+    ];
+  };
+}
diff --git a/provision/hosts/shivan/default.nix b/provision/hosts/shivan/default.nix
new file mode 100644
index 00000000..3bb15a78
--- /dev/null
+++ b/provision/hosts/shivan/default.nix
@@ -0,0 +1,24 @@
+{ lib, system, user, inputs, agenix, home-manager, ... }:
+{
+  kestrel = lib.nixosSystem {
+    inherit system;
+    specialArgs = { inherit user inputs; };
+    modules = [
+      ../default
+      ../../modules
+      ./configuration.nix
+      ./hardware.nix
+      agenix.nixosModules.default
+      home-manager.nixosModules.home-manager {
+        home-manager.useGlobalPkgs = true;
+        home-manager.useUserPackages = true;
+        home-manager.extraSpecialArgs = { inherit user; };
+        home-manager.users.${user} = {
+          imports = [ 
+            ../../home-modules
+          ];
+        };
+      }
+    ];
+  };
+}
diff --git a/provision/hosts/torus/default.nix b/provision/hosts/torus/default.nix
new file mode 100644
index 00000000..3bb15a78
--- /dev/null
+++ b/provision/hosts/torus/default.nix
@@ -0,0 +1,24 @@
+{ lib, system, user, inputs, agenix, home-manager, ... }:
+{
+  kestrel = lib.nixosSystem {
+    inherit system;
+    specialArgs = { inherit user inputs; };
+    modules = [
+      ../default
+      ../../modules
+      ./configuration.nix
+      ./hardware.nix
+      agenix.nixosModules.default
+      home-manager.nixosModules.home-manager {
+        home-manager.useGlobalPkgs = true;
+        home-manager.useUserPackages = true;
+        home-manager.extraSpecialArgs = { inherit user; };
+        home-manager.users.${user} = {
+          imports = [ 
+            ../../home-modules
+          ];
+        };
+      }
+    ];
+  };
+}