From f175a72fcfca191bb2b07819f078b90cd36a5b98 Mon Sep 17 00:00:00 2001
From: Szymon P <szymon_jozef@proton.me>
Date: Tue, 24 Feb 2026 19:41:20 +0100
Subject: [PATCH] more git

---
 modules/cli/git.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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 = {