From 893c1773580afdce99962e7f335b78429a5bf4db Mon Sep 17 00:00:00 2001
From: Marty Oehme <marty.oehme@gmail.com>
Date: Mon, 2 Oct 2023 20:16:04 +0200
Subject: [PATCH] git: Replace dsf with git-delta

Diff-so-fancy is pretty good but delta just looks soo buttery smooth.
---
 bootstrap/packages_stable.tsv  |  2 +-
 bootstrap/packages_testing.tsv |  1 -
 git/.config/git/config         | 12 ++++++++++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/bootstrap/packages_stable.tsv b/bootstrap/packages_stable.tsv
index a93823b..3748bba 100644
--- a/bootstrap/packages_stable.tsv
+++ b/bootstrap/packages_stable.tsv
@@ -52,7 +52,6 @@ dconf-editor	GSettings editor for GNOME	R
 dell-command-configure	Configure various BIOS features on Dell laptops	A	
 devour	Window Manager agnostic swallowing feature for terminal emulators	A	
 dhcpcd	RFC2131 compliant DHCP client daemon	R	
-diff-so-fancy	Good-looking diffs with diff-highlight and more	R	
 distrobox	Use any linux distribution inside your terminal.	A	
 dnsmasq	Lightweight, easy to configure DNS forwarder and DHCP server	R	
 docker	Pack, ship and run any application as a lightweight container	R	
@@ -80,6 +79,7 @@ fzf-tab-bin-git	Replace zsh's default completion selection menu with fzf (git ve
 gallery-dl	Command-line program to download image-galleries and collections from several image hosting sites	A	
 gamemode	A daemon/lib combo that allows games to request a set of optimisations be temporarily applied to the host OS	R	
 gimp	GNU Image Manipulation Program	R	
+git-delta	Syntax-highlighting pager for git and diff output	R	
 git-lfs	Git extension for versioning large files	R	
 gitlint	Git commit message linter	A	
 gitui	Blazing fast terminal-ui for git written in Rust	R	
diff --git a/bootstrap/packages_testing.tsv b/bootstrap/packages_testing.tsv
index c391f1a..e53c5da 100644
--- a/bootstrap/packages_testing.tsv
+++ b/bootstrap/packages_testing.tsv
@@ -5,7 +5,6 @@ blueberry	Bluetooth configuration tool	R
 dotter-rs-bin	A dotfile manager and templater written in Rust	A	
 eza	A modern replacement for ls (community fork of exa)	R	
 feishin-appimage	A modern self-hosted music player.	A	
-git-delta	Syntax-highlighting pager for git and diff output	R	
 khal	CLI calendar application built around CalDAV	R	
 m4b-tool-bin	A command line utility to merge, split and chapterize audiobook files such as mp3, ogg, flac, m4a or m4b	A	
 nodejs-markmap-cli	Create markmaps (mindmaps from markdown) from CLI	A	
diff --git a/git/.config/git/config b/git/.config/git/config
index 03f2abe..e8d9579 100644
--- a/git/.config/git/config
+++ b/git/.config/git/config
@@ -4,6 +4,16 @@
   signingkey    = 73BA40D5AFAF49C9
 [init]
   defaultBranch = main
+[core]
+  pager = delta
+[interactive]
+  diffFilter = delta --color-only
+[merge]
+  conflictstyle = diff3
+[delta]
+  navigate = true
+  line-numbers = true
+  syntax-theme = base16
 [sendemail]
   smtpserver    = "/usr/bin/msmtp"
   annotate      = yes
@@ -21,8 +31,6 @@
   rebase        = true                                                 # always rebase on pulling, obviates merge commits
 [diff]
   colorMoved    = zebra                                                # also color stuff that has simply been moved, in a classy zebra-color
-[pager]
-  diff          = dsf | less --tabs=4 -RFXS --pattern '(^(Date|added|deleted|modified): |^diff --git )'
 [color.diff]
   meta          = "9"
   frag          = "magenta bold"