Use nvimdiff as git mergetool

lukasl-dev · lukasl-dev · commit cf70ffe22bbe · 2025-03-27T15:06:54.000+01:00
diff --git a/home/shell.nix b/home/shell.nix
@@ -79,6 +79,11 @@ in
             insteadOf = "https://github.com/";
           };
         };
+        merge.tool = "nvimdiff";
+        mergetool = {
+          nvimdiff.cmd = "nvim -d \$LOCAL \$REMOTE \$BASE \$MERGED";
+          keepBackup = false;
+        };
       };
 
       aliases = {
