From 5e6359fc23eeaca01f58dd9648de9f855eeefc8c Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Tue, 13 Sep 2022 08:19:59 +0200
Subject: [PATCH] feat(git): configure nvim as mergetool

---
 home-manager/git.nix | 4 ++++
 1 file changed, 4 insertions(+)

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