feat(git): use 'nvimdiff' as difftool

2026-09-23 22:31:57 +02:00
parent 5549853670
commit 37e45c2aae
2 changed files with 12 additions and 0 deletions
@@ -80,6 +80,12 @@
  conflictstyle = diff3
 [diff]
  colorMoved = zebra
+  tool = nvimdiff
+[difftool]
+  prompt = false
+[mergetool]
+  prompt = false
+  keepBackup = false
 [commit]
  gpgsign = false

@@ -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";