From efb8dff677d823d7403c3df300ce976376e86ddc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kmein@posteo.de>
Date: Tue, 18 Jan 2022 21:52:46 +0100
Subject: [PATCH] feat(git): bye diff-so-fancy, hello delta

---
 configs/git.nix | 26 +++++++-------------------
 1 file changed, 7 insertions(+), 19 deletions(-)

diff --git a/configs/git.nix b/configs/git.nix
index fe75cd8..035c7e0 100644
--- a/configs/git.nix
+++ b/configs/git.nix
@@ -78,25 +78,13 @@ in
         pull.ff = "only";
         rebase.autoStash = true;
         merge.autoStash = true;
-        core.pager =
-          "${pkgs.gitAndTools.diff-so-fancy}/bin/diff-so-fancy | ${pkgs.less}/bin/less --tabs=4 -RFX";
-        color = {
-          ui = true;
-          diff = {
-            meta = "11";
-            frag = "magenta bold";
-            commit = "yellow bold";
-            old = "red bold";
-            new = "green bold";
-            whitespace = "red reverse";
-          };
-          diff-highlight = {
-            oldNormal = "red bold";
-            oldHighlight = "red bold 52";
-            newNormal = "green bold";
-            newHighlight = "green bold 22";
-          };
-        };
+
+        # ref https://github.com/dandavison/delta
+        core.pager = "${pkgs.delta}/bin/delta";
+        interactive.diffFilter = "${pkgs.delta}/bin/delta --color-only";
+        delta.navigate = true;
+        merge.conflictStyle = "diff3";
+        diff.colorMoved = "default";
       };
     };
   };