Merge branch 'main' of https://git.infernonode.com/HotaruBlaze/nixos-at-home

flake.nix

@@ -49,12 +49,8 @@
         inherit inputs stable-pkgs;
       };
 
-      mkHost = hostName: hostModules:
+      # Common modules applied to EVERY host
-        lib.nixosSystem {
+      baseModules = [
-          inherit system;
-          specialArgs = baseSpecialArgs;
-          modules =
-            [
         home-manager.nixosModules.home-manager
         {
           home-manager.useGlobalPkgs = true;
@@ -63,8 +59,13 @@
           home-manager.extraSpecialArgs = baseSpecialArgs;
         }
         ./modules/common
-            ]
+      ];
-            ++ hostModules;
+
+      mkHost = hostName: hostModules:
+        lib.nixosSystem {
+          inherit system;
+          specialArgs = baseSpecialArgs;
+          modules = baseModules ++ hostModules;
         };
 
       treefmtEval = treefmt-nix.lib.evalModule pkgs {
@@ -98,7 +99,7 @@
             keys.phoenix.keyFile = "/home/nixos/.ssh/id_ed25519.pub";
             tags = [ "homelab" ];
           };
-          imports = [ ./hosts/blade ];
+          imports = baseModules ++ [ ./hosts/blade ];
         };
       };