diff --git a/dots/.gitconfig b/dots/.gitconfig
index 8d7b0e2..1c02057 100644
--- a/dots/.gitconfig
+++ b/dots/.gitconfig
@@ -80,6 +80,12 @@
   conflictstyle = diff3
 [diff]
   colorMoved = zebra
+  tool = nvimdiff
+[difftool]
+  prompt = false
+[mergetool]
+  prompt = false
+  keepBackup = false
 [commit]
   gpgsign = false
 
diff --git a/home/modules/git/default.nix b/home/modules/git/default.nix
index bfaac16..2743609 100644
--- a/home/modules/git/default.nix
+++ b/home/modules/git/default.nix
@@ -14,6 +14,12 @@
   };
 
   config = lib.mkIf config.git.enable {
+    assertions = [
+      {
+        assertion = config.nvim.enable;
+        message = "git module requires 'nvim' module (`nvimdiff`)";
+      }
+    ];
     programs.git.enable = true;
     home.file = {
       ".gitconfig".source = dotsPath + "/.gitconfig";