Remove mkHost helper

common.nix

@@ -1,6 +1,9 @@
-{ options, config, lib, ... }:
+{ hostName, ... }:
 {
-  networking.networkmanager.enable = true;
+  networking = {
+    inherit hostName;
+    networkmanager.enable = true;
+  };
   
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
   

flake.nix

@@ -6,23 +6,29 @@
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
   };
 
-  outputs = { nixpkgs, ... }@inputs: 
+  outputs = { nixpkgs, ... }@inputs: {
-  let
-    utils = import ./lib { inherit inputs; };
-    inherit (utils) mkHost;
-  in {
     nixosConfigurations = {
-      marauder = mkHost {
+      marauder = nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
+        modules = [
+          ./hosts/marauder
+          ./common.nix
+        ];
+        specialArgs = {
           hostName = "marauder";
-        system = "x86_64-linux";
+          inherit inputs;
-        timeZone = "America/Los_Angeles";
-        stateVersion = "24.05";
         };
-      monolith = mkHost {
+      };
-        hostName = "monolith";
+      monolith = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
-        timeZone = "America/Los_Angeles";
+        modules = [
-        stateVersion = "24.05";
+          ./hosts/monolith
+          ./common.nix
+        ];
+        specialArgs = {
+          hostName = "monolith";
+          inherit inputs;
+        };
       };
     };
   };

hosts/marauder/default.nix

@@ -19,4 +19,7 @@
     };
     displayManager.defaultSession = "cinnamon";
   };
+
+  time.timeZone = "America/Los_Angeles";
+  system.stateVersion = "24.05";
 }

hosts/monolith/default.nix

@@ -1 +1,4 @@
-{ ... }: {}
+{ ... }: {
+  time.timeZone = "America/Los_Angeles";
+  system.stateVersion = "24.05";
+}

lib/default.nix

@@ -1,17 +0,0 @@
-{ inputs }: {
-  mkHost = { hostName, system, timeZone, stateVersion }: inputs.nixpkgs.lib.nixosSystem {
-    inherit system;
-    modules = [
-      {
-        networking.hostName = hostName;
-        system.stateVersion = stateVersion;
-        time.timeZone = timeZone;
-      }
-      ../modules/nixos
-      ../hosts/${hostName}
-    ];
-    specialArgs = {
-      inherit inputs;
-    };
-  };
-}