From 5edfff621acf5330550d34c518865fe4974a1ac9 Mon Sep 17 00:00:00 2001
From: Tyler Starr <starrtyler88@gmail.com>
Date: Thu, 26 Sep 2024 20:02:03 -0700
Subject: [PATCH] fix multiple flake imports

---
 provision/flake.nix                 | 41 +++++++++++++----------------
 provision/hosts/bulwark/default.nix | 40 +++++++++++++---------------
 provision/hosts/kestrel/default.nix | 40 +++++++++++++---------------
 provision/hosts/shivan/default.nix  | 40 +++++++++++++---------------
 provision/hosts/torus/default.nix   | 40 +++++++++++++---------------
 5 files changed, 95 insertions(+), 106 deletions(-)

diff --git a/provision/flake.nix b/provision/flake.nix
index 10ab7bd1..d67579b3 100644
--- a/provision/flake.nix
+++ b/provision/flake.nix
@@ -4,38 +4,35 @@
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     agenix.url = "github:ryantm/agenix";
-    home-manager = {
-      url = github:nix-community/home-manager;
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    jovian-nixos = {
-      url = "git+https://github.com/Jovian-Experiments/Jovian-NixOS?ref=development";
-      flake = false;
-    };
+    home-manager.url = github:nix-community/home-manager;
+    home-manager.inputs.nixpkgs.follows = "nixpkgs";
+    jovian-nixos.url = "git+https://github.com/Jovian-Experiments/Jovian-NixOS?ref=development";
+    jovian-nixos.flake = false;
   };
 
   outputs = inputs @ { self, nixpkgs, home-manager, jovian-nixos, agenix, ... }:
   let
     system = "x86_64-linux";
     user = "tstarr";
+    lib = nixpkgs.lib;
   in {
-    nixosConfigurations = ( 
-      import ./hosts/kestrel {
-        inherit (nixpkgs) lib;
+    nixosConfigurations = {
+      kestrel = lib.nixosSystem (import ./hosts/kestrel {
+        inherit lib;
         inherit system user inputs agenix home-manager;
-      }
-      import ./hosts/shivan {
-        inherit (nixpkgs) lib;
+      });
+      shivan = lib.nixosSystem (import ./hosts/shivan {
+        inherit lib;
         inherit system user inputs agenix home-manager;
-      }
-      import ./hosts/torus {
-        inherit (nixpkgs) lib;
+      });
+      torus = lib.nixosSystem (import ./hosts/torus {
+        inherit lib;
         inherit system user inputs agenix home-manager;
-      }
-      import ./hosts/bulwark {
-        inherit (nixpkgs) lib;
+      });
+      bulwark = lib.nixosSystem (import ./hosts/bulwark {
+        inherit lib;
         inherit system user inputs agenix home-manager jovian-nixos;
-      }
-    ); 
+      });
+    }; 
   };
 }
diff --git a/provision/hosts/bulwark/default.nix b/provision/hosts/bulwark/default.nix
index d4c8c5f2..385a44da 100644
--- a/provision/hosts/bulwark/default.nix
+++ b/provision/hosts/bulwark/default.nix
@@ -1,24 +1,22 @@
 { 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
-          ];
-        };
-      }
-    ];
-  };
+  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/kestrel/default.nix b/provision/hosts/kestrel/default.nix
index 3bb15a78..8af9ba68 100644
--- a/provision/hosts/kestrel/default.nix
+++ b/provision/hosts/kestrel/default.nix
@@ -1,24 +1,22 @@
 { 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
-          ];
-        };
-      }
-    ];
-  };
+  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
index 3bb15a78..8af9ba68 100644
--- a/provision/hosts/shivan/default.nix
+++ b/provision/hosts/shivan/default.nix
@@ -1,24 +1,22 @@
 { 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
-          ];
-        };
-      }
-    ];
-  };
+  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
index 3bb15a78..8af9ba68 100644
--- a/provision/hosts/torus/default.nix
+++ b/provision/hosts/torus/default.nix
@@ -1,24 +1,22 @@
 { 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
-          ];
-        };
-      }
-    ];
-  };
+  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
+        ];
+      };
+    }
+  ];
 }