dot

commit d0ce807af936c4ed652f22b7ea95d57825ba22f3
parent 3a7d293ada91c7a9b10c24aaab9eeaaecca90b09
Author: Chris <chris@echoz.io>
Date:   Mon, 17 Nov 2025 22:39:30 +0100

feat(git): set up nvimdiff

Diffstat:
M
modules/git/default.nix
 | 
6
++++++

1 file changed, 6 insertions(+), 0 deletions(-)
diff --git a/modules/git/default.nix b/modules/git/default.nix
@@ -15,6 +15,12 @@
       push.autoSetupRemote = true;
       pull.rebase = true;
       init.defaultBranch = "main";
+      merge.tool = "nvimdiff";
+      mergetool = {
+        prompt = false;
+        keepBackup = false;
+        nvimdiff.layout = "LOCAL,BASE,REMOTE / MERGED";
+      };
     };
   };
 }