From 094b96474989789f97d4b9f648b522a255704044 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sat, 18 May 2024 20:37:51 +0300
Subject: [PATCH] makeSystem cleanup

---
 flake.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/flake.nix b/flake.nix
index daf5c95..1794251 100644
--- a/flake.nix
+++ b/flake.nix
@@ -44,10 +44,10 @@
         extraSpecialArgs = specialArgs;
       };
 
-      makeSystem = name: pkgsVersion: systemModules: nixpkgs.lib.nixosSystem {
+      makeSystem = name: pkgsVersion: nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
         specialArgs = specialArgs // { inherit pkgsVersion; };
-        modules = [ ./hosts/generic.nix ] ++ systemModules;
+        modules = [ ./hosts/generic.nix ./hosts/${name}/system.nix ];
       };
 
     in {
@@ -55,9 +55,9 @@
       devShells = { "x86_64-linux" = import ./shell.nix { inherit pkgs; }; };
 
       nixosConfigurations = {
-        dlaptop = makeSystem "dlaptop" unstable [ ./hosts/dlaptop/system.nix ];
-        intelnuc = makeSystem "intelnuc" stable [ ./hosts/intelnuc/system.nix ];
-        huanan = makeSystem "huanan" pkgs [ ./hosts/huanan/system.nix ];
+        dlaptop = makeSystem "dlaptop" unstable;
+        intelnuc = makeSystem "intelnuc" stable;
+        huanan = makeSystem "huanan" pkgs;
       };
     };
 }