From 126b0fa422d5708e0e9f982c2889ec1710e84428 Mon Sep 17 00:00:00 2001
From: Daniel Siepmann <coding@daniel-siepmann.de>
Date: Wed, 23 Mar 2022 17:28:36 +0100
Subject: [PATCH] Add new plugin to Neovim for easier merges

I'll give it a try and check how well it works.
---
 home/programs/git.nix    | 7 ++++++-
 home/programs/neovim.nix | 9 ++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/home/programs/git.nix b/home/programs/git.nix
index 8ab1cd6..03188bd 100644
--- a/home/programs/git.nix
+++ b/home/programs/git.nix
@@ -107,11 +107,16 @@
 
     merge = {
       ff = true;
-      tool = "nvimdiff4";
+      tool = "new";
+      conflictStyle = "diff3";
     };
 
     "mergetool \"nvimdiff4\"" = {
       cmd = "${pkgs.neovim}/bin/nvim -d $LOCAL $BASE $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J' -c 'diffoff'";
     };
+    "mergetool \"new\"" = {
+      cmd = "${pkgs.neovim}/bin/nvim -f $MERGED $BASE $LOCAL $REMOTE -c 'MergetoolStart'";
+      trustExitCode = true;
+    };
   };
 }
diff --git a/home/programs/neovim.nix b/home/programs/neovim.nix
index b40ea4a..ecca67a 100644
--- a/home/programs/neovim.nix
+++ b/home/programs/neovim.nix
@@ -267,7 +267,14 @@ in {
       '';
     }
 
-    vim-fugitive
+    fugitive
+    {
+      plugin = vim-mergetool;
+      config = ''
+        let g:mergetool_layout = 'b,lr,m'
+      '';
+    }
+
     vim-commentary
     vim-indent-object
     vim-textobj-comment