start rewriterefactor

1 files changed, 15 insertions, 25 deletions

diff --git a/flake.nix b/flake.nix
index 0303b9d..cf8c894 100644
--- a/flake.nix
+++ b/flake.nix
@@ -23,25 +23,24 @@
       nixpkgs,
     }:
     let
-      pkgs = nixpkgs.legacyPackages.x86_64-linux;
       mkSystem =
+        host:
         {
-          additionalModules ? [ ],
-          hostName,
+          extraModules ? [ ],
           system ? "x86_64-linux",
         }:
         nixpkgs.lib.nixosSystem {
+          inherit system;
           modules = [
-            ./hosts/${hostName}
-            ./hosts/${hostName}/hardware-configuration.nix
-            ./modules # include custom system modules
-            ./modules/core.nix # always include core settings
-            { networking.hostName = hostName; }
+            home-manager.nixosModules.home-manager
+            ./hosts/${host}
+            ./hosts/${host}/hardware-configuration.nix
+            ./modules
+            { networking.hostName = host; }
           ]
-          ++ additionalModules;
-
-          inherit system;
+          ++ extraModules;
         };
+      pkgs = nixpkgs.legacyPackages.x86_64-linux;
     in
     {
       devShells.x86_64-linux.default = pkgs.mkShellNoCC {
@@ -49,23 +48,14 @@
       };
 
       formatter.x86_64-linux = pkgs.nixfmt;
-      nixosConfigurations = {
-        the-meowchine = mkSystem {
-          additionalModules = [
-            home-manager.nixosModules.home-manager
-          ];
-
-          hostName = "the-meowchine";
-        };
-
-        meowbook = mkSystem {
-          additionalModules = [
+      nixosConfigurations = builtins.mapAttrs mkSystem {
+        meowbook = {
+          extraModules = [
             disko.nixosModules.disko
-            home-manager.nixosModules.home-manager
           ];
-
-          hostName = "meowbook";
         };
+
+        the-meowchine = { };
       };
     };
 }