From f3c3add058a66e24f35e4aa8ffba104491fc797e Mon Sep 17 00:00:00 2001
From: electria <elec3137+git@proton.me>
Date: Sun, 26 Apr 2026 08:25:26 -0700
Subject: [PATCH] style(defaults/git): avoid using lib.mkMerge

This makes the code easier to understand,
and might fix a problem I noticed a while ago.
---
 defaults/git.nix | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/defaults/git.nix b/defaults/git.nix
index 7c5e533..215e5ed 100644
--- a/defaults/git.nix
+++ b/defaults/git.nix
@@ -25,24 +25,22 @@ in
     programs.git = {
       enable = lib.mkIf config.nixowos.allowAddingPackages (lib.mkDefault true);
 
-      config = lib.mkMerge [
-        {
-          init.defaultBranch = "main";
-          core.compression = 9; # max
-          credential.helper = "cache";
+      config = {
+        init.defaultBranch = "main";
+        core.compression = 9; # max
+        credential.helper = "cache";
 
-          push.autoSetupRemote = true;
-          pull.ff = "only";
-          merge.conflictStyle = "zdiff3";
-          commit.verbose = true; # show diffs in commit editor
-        }
-        (lib.mkIf (superCfg.delta.enable && config.nixowos.allowAddingPackages) {
-          core.pager = "${lib.getExe pkgs.delta}";
-          interactive.diffFilter = "${lib.getExe pkgs.delta} --color-only";
-          delta.navigate = true; # use n and N to move between diff sections
-          delta.diff-highlight = true; # simpler mode, highlights inter-line changes
-        })
-      ];
+        push.autoSetupRemote = true;
+        pull.ff = "only";
+        merge.conflictStyle = "zdiff3";
+        commit.verbose = true; # show diffs in commit editor
+      }
+      // (lib.optionalAttrs (superCfg.delta.enable && config.nixowos.allowAddingPackages) {
+        core.pager = "${lib.getExe pkgs.delta}";
+        interactive.diffFilter = "${lib.getExe pkgs.delta} --color-only";
+        delta.navigate = true; # use n and N to move between diff sections
+        delta.diff-highlight = true; # simpler mode, highlights inter-line changes
+      });
     };
 
   };