From c8d55deb7aea760781c8ac548d2e51f2e68d8858 Mon Sep 17 00:00:00 2001
From: Steffen Rademacker <kontakt@webgefrickel.de>
Date: Fri, 18 Mar 2022 12:55:13 +0100
Subject: [PATCH] delta vs. diff-so-fancy

---
 gitconfig              | 20 ++++++++++++++++++--
 install/2_cli-tools.sh |  2 +-
 lazygit/config.yml     |  2 +-
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/gitconfig b/gitconfig
index f5e7a9c3..fbeff640 100644
--- a/gitconfig
+++ b/gitconfig
@@ -5,7 +5,7 @@
   excludesfile = ~/.gitignore
   autocrlf = input
   eol = lf
-  pager = diff-so-fancy | less -F -i -J -M -R -W -x2 -X -z-4
+  pager = delta
 
 [color]
   ui = auto
@@ -57,6 +57,10 @@
   tool = nvim -d
   guitool = nvim -d
   compactionHeuristic = true
+  colorMoved = default
+
+[merge]
+  conflictstyle = diff3
 
 [mergetool]
   prompt = false
@@ -69,7 +73,19 @@
   rebase = false
 
 [interactive]
-  diffFilter = diff-highlight
+  diffFilter = delta --color-only
 
 [credential]
   helper = store
+
+[delta]
+  blame-code-style = syntax
+  blame-format = "{commit:<8} • {author:<18} • {timestamp:<15}"
+  blame-palette = "#333333"
+  hunk-header-style = omit
+  hyperlinks = false
+  navigate = true
+  side-by-side = true
+  syntax-theme = gruvbox-dark
+  width = "-4"
+
diff --git a/install/2_cli-tools.sh b/install/2_cli-tools.sh
index 859115fb..485d72a1 100755
--- a/install/2_cli-tools.sh
+++ b/install/2_cli-tools.sh
@@ -32,8 +32,8 @@ ln -s ~/dotfiles/spotifyd.toml ~/.config/spotifyd/spotifyd.conf
 ln -s ~/dotfiles/lazygit ~/Library/Application\ Support/lazygit
 
 # other cli tools and helpers
-npm install -g diff-so-fancy
 npm install -g fkill-cli
+npm install -g trash-cli
 pip install tiptop
 cargo install bartib
 
diff --git a/lazygit/config.yml b/lazygit/config.yml
index 8849edcf..149714e4 100644
--- a/lazygit/config.yml
+++ b/lazygit/config.yml
@@ -13,4 +13,4 @@ git:
   branchLogCmd: "git log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(blue)<%an>%Creset' --abbrev-commit"
   paging:
     colorArg: always
-    pager: diff-so-fancy
+    pager: delta --dark --paging=never