Grant machine configs access to the pkgs attribute

flake.nix

@@ -44,32 +44,34 @@
     ) // {
       nixosConfigurations =
         let
-          default = {
+          default = { pkgs, ... }: {
             dualBoot = false;
             timeZone = null;
             keyMap = "us";
             keyboardLayout = "us";
             localeSettings = { };
           };
-          systems = [
+          systems = {
-            {
+            nixos.config = { ... }: {
-              name = "nixos";
+            };
-            }
+          };
-          ];
         in
-          builtins.listToAttrs (
+          builtins.mapAttrs (
-            builtins.map (
+            name: { system ? "x86_64-linux", config }: nixpkgs.lib.nixosSystem {
-              { name, system ? "x86_64-linux", ... }@config: {
-                inherit name;
-
-                value = nixpkgs.lib.nixosSystem {
               inherit system;
 
               modules = [
-                    ({ ... }: { config._module.args = { machineConfig = default // config; }; })
+                (
+                  { pkgs, ... }@args: {
+                    config._module.args = {
+                      machineConfig = (default args) //
+                        (config args) // {
+                          inherit name;
+                        };
+                    };
+                  })
                 sops-nix.nixosModules.sops
                 ./lib/configuration.nix
-
                 (
                   let
                     configCandidate = ./lib/machines/${name}.nix;
@@ -83,8 +85,7 @@
                   in
                     machineConfigPath)
               ];
-                };
             })
-              systems);
+            systems;
     });
 }