diff --git a/modules/cli/git.nix b/modules/cli/git.nix
index ffbebdd..d227042 100644
--- a/modules/cli/git.nix
+++ b/modules/cli/git.nix
@@ -18,9 +18,14 @@
       };
       init.defaultBranch = "master";
       push.autoSetupRemote = true;
-      core.editor = "nvim";
+
       gpg.ssh.allowedSignersFile = "~/.ssh/allowed_signers";
+
       pull.rebase = false;
+
+      merge.tool = "nvimdiff";
+      mergetool.prompt = false;
+      mergetool.keepBackup = false;
     };
 
     signing = {