diff --git a/homeConfig/modules/git/config/git.nix b/homeConfig/modules/git/config/git.nix
index a017dec..c874808 100644
--- a/homeConfig/modules/git/config/git.nix
+++ b/homeConfig/modules/git/config/git.nix
@@ -6,6 +6,15 @@
 
   extraConfig = {
     init = { defaultBranch = "main"; };
+    mergetool = {
+      lazygit = {
+        cmd = "lazygit";
+        trustExitCode = true;
+      };
+    };
+    merge = {
+      tool = "lazygit";
+    };
   };
 
   ignores = [