Merge pull request #1338 from Enzime/push-nxtlkvowmzpy

[24.11] nix: place `extra`-prefixed settings after their non-prefixed variants
LnL7 · Feb 14, 2025 · e904ef0 · e904ef0
2 parents f81c161 + c363e6c
commit e904ef0
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/modules/nix/default.nix b/modules/nix/default.nix
@@ -49,13 +49,16 @@ let
 
       mkKeyValuePairs = attrs: concatStringsSep "\n" (mapAttrsToList mkKeyValue attrs);
 
+      isExtra = key: hasPrefix "extra-" key;
+
     in
     pkgs.writeTextFile {
       name = "nix.conf";
       text = ''
         # WARNING: this file is generated from the nix.* options in
         # your nix-darwin configuration. Do not edit it!
-        ${mkKeyValuePairs cfg.settings}
+        ${mkKeyValuePairs (filterAttrs (key: value: !(isExtra key)) cfg.settings)}
+        ${mkKeyValuePairs (filterAttrs (key: value: isExtra key) cfg.settings)}
         ${cfg.extraOptions}
       '';
       checkPhase =