From ff4bdcd8811fa25942d88d4ec95213032f994b50 Mon Sep 17 00:00:00 2001
From: reidlab <reidlab325@gmail.com>
Date: Thu, 14 May 2026 19:26:16 -0700
Subject: [PATCH] slight refactor

---
 flake.nix     | 22 +++++++++-------------
 lib/nixos.nix |  5 ++---
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/flake.nix b/flake.nix
index a4cafda..28b7432 100755
--- a/flake.nix
+++ b/flake.nix
@@ -28,19 +28,15 @@
         };
       });
 
-      mkPkgs = system: pkgs: extraOverlays:
-        import pkgs {
-          inherit system;
-          config.allowUnfree = true;
-          config.allowAliases = true;
-          overlays = extraOverlays ++ (lib.attrValues self.overlays);
-        };
-
-      pkgsFor = eachSystem (system:
-        mkPkgs system nixpkgs [
+      commonNixpkgsConfig = {
+        config.allowUnfree = true;
+        config.allowAliases = true;
+        overlays = [
           self.overlays.default
-        ]
-      );
+        ] ++ (lib.attrValues self.overlays);
+      };
+
+      pkgsFor = eachSystem (system: import nixpkgs ({ inherit system; } // commonNixpkgsConfig));
     in {
       lib = lib.my;
 
@@ -58,6 +54,6 @@
 
       nixosModules = mapModulesRec ./modules import;
 
-      nixosConfigurations = mapHosts ./hosts { inherit pkgsFor; };
+      nixosConfigurations = mapHosts ./hosts { inherit commonNixpkgsConfig; };
     };
 }
diff --git a/lib/nixos.nix b/lib/nixos.nix
index af1c8c1..ff456da 100755
--- a/lib/nixos.nix
+++ b/lib/nixos.nix
@@ -11,7 +11,7 @@
 in rec {
   mkHost = path: {
     system,
-    pkgsFor,
+    commonNixpkgsConfig,
     ...
   }:
     nixosSystem {
@@ -21,8 +21,7 @@ in rec {
 
       modules = [
         {
-          nixpkgs.pkgs = pkgsFor.${system};
-          nixpkgs.hostPlatform = lib.mkDefault system;
+          nixpkgs = commonNixpkgsConfig // { hostPlatform = lib.mkDefault system; };
           networking.hostName =
             mkDefault (removeSuffix ".nix" (baseNameOf path));
         }