diff --git a/home-manager/git.nix b/home-manager/git.nix
index 267e4ec..f8ff0d0 100644
--- a/home-manager/git.nix
+++ b/home-manager/git.nix
@@ -28,6 +28,10 @@
         difftool.prompt = false;
         difftool.difftastic.cmd = "difft --background light \"$LOCAL\" \"$REMOTE\"";
         pager.difftool = true;
+
+        merge.tool = "nvim";
+        mergetool.prompt = false;
+        mergetool.nvim.cmd = "nvim -f -c \"Gdiffsplit!\" \"$MERGED\"";
       };
 
       aliases = {