From 3f1e56299d0d571057c047631caae7c34a0ff1e0 Mon Sep 17 00:00:00 2001
From: Ben Sima <bsima@groq.com>
Date: Wed, 9 Mar 2022 09:28:28 -0800
Subject: add vim-fugitive and disable color theme for vimdiff usage

---
 lib/common.nix | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'lib/common.nix')

diff --git a/lib/common.nix b/lib/common.nix
index a87ebb5..aafb1dc 100644
--- a/lib/common.nix
+++ b/lib/common.nix
@@ -115,6 +115,8 @@ in
         pull.rebase = "true";
         commit.template = "${./git-commit-template}";
         commit.verbose = "true";
+        mergetool.fugitive.cmd = ''vim -f -c "Gvdiffsplit!" "$MERGED"'';
+        merge.tool = "fugitive";
         sendemail = {
           #smtpuser = "ben@bsima.me";
           #smtpserverport = 587;
@@ -229,6 +231,7 @@ in
       plugins = with pkgs.vimPlugins; [
         editorconfig-vim
         vim-sensible
+        vim-fugitive
         vim-colorschemes
         vim-sexp-mappings-for-regular-people
         # vim-ripgrep # not in nixpkgs :(
-- 
cgit v1.2.3