Merge pull request #1337 from sandydoo/fix-extra-nix-conf

nix: place `extra-`prefixed settings after their non-prefixed variants
LnL7 · Feb 14, 2025 · 7206892 · 7206892
2 parents a674621 + 5926058
commit 7206892
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/modules/nix/default.nix b/modules/nix/default.nix
@@ -51,13 +51,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 =