bump

1 files changed, 70 insertions, 10 deletions

diff --git a/system-profiles/core/default.nix b/system-profiles/core/default.nix
index 46049e26..67d50606 100644
--- a/system-profiles/core/default.nix
+++ b/system-profiles/core/default.nix
@@ -1,7 +1,10 @@
 { flake, flakeInputs, path, hostName, config, lib, pkgs, customUtils, ... }:
+
+with lib;
+
 let
   profileSet = customUtils.types.attrNameSet flake.nixosModules.systemProfiles;
-  userProfileSet = customUtils.types.attrNameSet (lib.zipAttrs (lib.attrValues flake.nixosModules.userProfiles));
+  userProfileSet = customUtils.types.attrNameSet (zipAttrs (attrValues flake.nixosModules.userProfiles));
   hasSops = config.sops.secrets != {};
 in {
   imports = with flakeInputs;
@@ -11,7 +14,7 @@ in {
 
   options = {
     # See mkSystemProfile in ../flake.nix
-    system.profiles = lib.mkOption {
+    system.profiles = mkOption {
       type = profileSet;
       default = [];
       description = ''
@@ -19,9 +22,9 @@ in {
       '';
     };
 
-    users.users = lib.mkOption {
-      type = lib.types.attrsOf (lib.types.submodule {
-        options.profiles = lib.mkOption {
+    users.users = mkOption {
+      type = types.attrsOf (types.submodule {
+        options.profiles = mkOption {
           type = userProfileSet;
           default = [];
           description = ''
@@ -30,14 +33,71 @@ in {
         };
       });
     };
+
+    nixpkgs.externalConfig = mkOption {
+      default = {};
+      example = literalExpression
+        ''
+          { allowBroken = true; allowUnfree = true; }
+        '';
+      type = mkOptionType {
+        name = "nixpkgs-config";
+        description = "nixpkgs config";
+        check = x:
+          let traceXIfNot = c:
+                if c x then true
+                else traceSeqN 1 x false;
+              isConfig = x:
+                builtins.isAttrs x || isFunction x;
+          in traceXIfNot isConfig;
+        merge = args:
+          let
+            optCall = f: x:
+              if isFunction f
+              then f x
+              else f;
+            mergeConfig = lhs_: rhs_:
+              let
+                lhs = optCall lhs_ { inherit pkgs; };
+                rhs = optCall rhs_ { inherit pkgs; };
+              in
+              recursiveUpdate lhs rhs //
+              optionalAttrs (lhs ? packageOverrides) {
+                packageOverrides = pkgs:
+                  optCall lhs.packageOverrides pkgs //
+                  optCall (attrByPath [ "packageOverrides" ] { } rhs) pkgs;
+              } //
+              optionalAttrs (lhs ? perlPackageOverrides) {
+                perlPackageOverrides = pkgs:
+                  optCall lhs.perlPackageOverrides pkgs //
+                  optCall (attrByPath [ "perlPackageOverrides" ] { } rhs) pkgs;
+              };
+          in foldr (def: mergeConfig def.value) {};
+      };
+      description = mdDoc ''
+        The configuration of the Nix Packages collection.  (For
+        details, see the Nixpkgs documentation.)  It allows you to set
+        package configuration options.
+
+        Used to construct `nixpkgs.pkgs`.
+      '';
+    };
+
+    nixpkgs.flakeInput = mkOption {
+      type = types.enum (attrNames flakeInputs);
+      default = if flakeInputs ? "nixpkgs-${hostName}" then "nixpkgs-${hostName}" else "nixpkgs";
+      defaultText = literalExpression ''if flakeInputs ? "nixpkgs-''${hostName}" then "nixpkgs-''${hostName}" else "nixpkgs"'';
+      internal = true;
+    };
   };
 
   config = {
     networking.hostName = hostName;
-    system.configurationRevision = lib.mkIf (flake ? rev) flake.rev;
+    system.configurationRevision = mkIf (flake ? rev) flake.rev;
 
-    nixpkgs.pkgs = flake.legacyPackages.${config.nixpkgs.system}.override {
-      inherit (config.nixpkgs) config;
+    nixpkgs.pkgs = import (flakeInputs.${config.nixpkgs.flakeInput}.outPath + "/pkgs/top-level") {
+      overlays = attrValues flake.overlays;
+      config = config.nixpkgs.externalConfig;
       localSystem = config.nixpkgs.system;
     };
 
@@ -64,7 +124,7 @@ in {
       ];
       registry =
         let override = { self = "nixos"; };
-        in lib.mapAttrs' (inpName: inpFlake: lib.nameValuePair
+        in mapAttrs' (inpName: inpFlake: nameValuePair
           (override.${inpName} or inpName)
           { flake = inpFlake; } ) flakeInputs;
     };
@@ -97,7 +157,7 @@ in {
       backupFileExtension = "bak";
     };
 
-    sops = lib.mkIf hasSops {
+    sops = mkIf hasSops {
       age = {
         keyFile = "/var/lib/sops-nix/key.txt";
         generateKey = false;