From 061d2e206085ed1092784d5e8827addf392adfb1 Mon Sep 17 00:00:00 2001
From: Minijackson <minijackson@riseup.net>
Date: Mon, 8 Nov 2021 13:56:42 +0100
Subject: git: set diff --color-moved + refactor delta config

---
 common/commandline/git.nix | 50 +++++++++++++++++++++++++---------------------
 1 file changed, 27 insertions(+), 23 deletions(-)

(limited to 'common/commandline/git.nix')

diff --git a/common/commandline/git.nix b/common/commandline/git.nix
index 165214f..8ccb528 100644
--- a/common/commandline/git.nix
+++ b/common/commandline/git.nix
@@ -29,35 +29,39 @@ inputs:
             interactive.diffFilter = "${deltaCommand} --color-only";
           };
 
+          diff = {
+            colormoved = "default";
+            colorMovedWS = "allow-indentation-change";
+          };
+
           pull.ff = "only";
 
           merge = { tool = "nvimdiff"; };
           "mergetool \"nvimdiff\"" = { cmd = "nvim -d \"$LOCAL\" \"$MERGED\" \"$REMOTE\""; };
 
           delta = with config.theme.colors; {
-            features = "line-numbers decorations";
-            whitespace-error-style = "22 reverse";
-            decorations = {
-              minus-style = "normal red";
-              minus-non-emph-style = "normal red";
-              minus-emph-style = "normal brightred";
-              minus-empty-line-marker-style = "normal red";
-
-              plus-style = "reverse green";
-              plus-non-emph-style = "reverse green";
-              plus-emph-style = "reverse brightgreen";
-              plus-empty-line-marker-style = "reverse green";
-
-              whitespace-error-style = "reverse green";
-
-              line-numbers-minus-style = "brightred";
-              line-numbers-zero-style = "brightblack";
-              line-numbers-plus-style = "brightgreen";
-
-              file-style = "bright${dominantName}";
-              line-numbers-left-style = dominantName;
-              line-numbers-right-style = dominantName;
-            };
+            line-numbers = true;
+            navigate = true;
+
+            whitespace-error-style = "reverse green";
+
+            minus-style = "normal red";
+            minus-non-emph-style = "normal red";
+            minus-emph-style = "normal brightred";
+            minus-empty-line-marker-style = "normal red";
+
+            plus-style = "reverse green";
+            plus-non-emph-style = "reverse green";
+            plus-emph-style = "reverse brightgreen";
+            plus-empty-line-marker-style = "reverse green";
+
+            line-numbers-minus-style = "brightred";
+            line-numbers-zero-style = "brightblack";
+            line-numbers-plus-style = "brightgreen";
+
+            file-style = "bright${dominantName}";
+            line-numbers-left-style = dominantName;
+            line-numbers-right-style = dominantName;
           };
 
         };
-- 
cgit v1.2.3