slight refactor

flake.nix

@@ -28,19 +28,15 @@
         };
       });
 
-      mkPkgs = system: pkgs: extraOverlays:
+      commonNixpkgsConfig = {
-        import pkgs {
+        config.allowUnfree = true;
-          inherit system;
+        config.allowAliases = true;
-          config.allowUnfree = true;
+        overlays = [
-          config.allowAliases = true;
-          overlays = extraOverlays ++ (lib.attrValues self.overlays);
-        };
-
-      pkgsFor = eachSystem (system:
-        mkPkgs system nixpkgs [
           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; };
     };
 }

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 = commonNixpkgsConfig // { hostPlatform = lib.mkDefault system; };
-          nixpkgs.hostPlatform = lib.mkDefault system;
           networking.hostName =
             mkDefault (removeSuffix ".nix" (baseNameOf path));
         }