programs/git/default.nix

@@ -20,12 +20,11 @@ let
     };
     fetch.prune = true;
     init.defaultBranch = "main";
-    merge.tool = "intellij";
+    merge.conflictstyle = "zdiff3";
-    mergetool = {
+    merge.tool = "nvim";
-      intellij = {
+    mergetool.nvim = {
-        cmd = "'/Applications/IntelliJ IDEA.app/Contents/macOS/idea' merge \“$LOCAL\” \“$REMOTE\” \“$BASE\” \“$MERGED\”";
+      cmd = "nvim -d -c \"wincmd l\" -c \"norm ]c\" \"$LOCAL\" \"$MERGED\" \"$REMOTE\"";
-        trustExitCode = true;
+      prompt = false;
-      };
       keepBackup = false;
     };
     pager = {