📦️ deps(diff): use delta instead of diff-so-fancy

.config/ansible/roles/arch/packages/tasks/modules/coding.yml

@@ -24,7 +24,7 @@
       # Tools
       - github-cli
       - dbeaver
-      - diff-so-fancy
+      - git-delta
       - lazygit
       - onefetch
 

.config/git/config

@@ -1,3 +1,9 @@
+[includeIf "gitdir:~/Repos/Work/"]
+  path = ~/.config/git/config-work
+
+[include]
+  path = ~/.config/git/themes/catppuccin.gitconfig
+
 [user]
   name = Sergio Laín
   email = sergiolain11@gmail.com
@@ -26,11 +32,16 @@
 
 [core]
   editor = nvim
-  pager = diff-so-fancy | less --tabs=4 -RFX
+  pager = delta
   excludesfile = ~/.config/git/ignore
 
 [interactive]
-  diffFilter = diff-so-fancy --patch
+  diffFilter = delta --color-only
+
+[delta]
+  features = catppuccin-macchiato
+  side-by-side = false
+  true-color = always
 
 [merge]
   tool = nvimdiff
@@ -51,9 +62,6 @@
 [gpg]
   program = /sbin/gpg
 
-[includeIf "gitdir:~/Repos/Work/"]
-  path = ~/.config/git/config-work
-
 [alias]
   aliases = config --get-regexp alias
 

.config/git/themes/catppuccin.gitconfig

@@ -0,0 +1,124 @@
+[delta "catppuccin-latte"]
+	blame-palette = "#eff1f5 #e6e9ef #dce0e8 #ccd0da #bcc0cc"
+	commit-decoration-style = "box ul"
+	dark = false
+	file-decoration-style = "#4c4f69"
+	file-style = "#4c4f69"
+	hunk-header-decoration-style = "box ul"
+	hunk-header-file-style = "bold"
+	hunk-header-line-number-style = "bold #6c6f85"
+	hunk-header-style = "file line-number syntax"
+	line-numbers = true
+	line-numbers-left-style = "#9ca0b0"
+	line-numbers-minus-style = "bold #d20f39"
+	line-numbers-plus-style = "bold #40a02b"
+	line-numbers-right-style = "#9ca0b0"
+	line-numbers-zero-style = "#9ca0b0"
+	# 25% red 75% base
+	minus-emph-style = "bold syntax #e8bac8"
+	# 10% red 90% base
+	minus-style = "syntax #eddbe2"
+	# 25% green 75% base
+	plus-emph-style = "bold syntax #c3ddc3"
+	# 10% green 90% base
+	plus-style = "syntax #dee8e0"
+	map-styles = \
+		bold purple => syntax "#d6c4f4", \
+		bold blue => syntax "#bbcff5", \
+		bold cyan => syntax "#b4dff2", \
+		bold yellow => syntax "#ebd9bf"
+	# Should match the name of the bat theme
+	syntax-theme = "Catppuccin Latte"
+[delta "catppuccin-frappe"]
+	blame-palette = "#303446 #292c3c #232634 #414559 #51576d"
+	commit-decoration-style = "box ul"
+	dark = true
+	file-decoration-style = "#c6d0f5"
+	file-style = "#c6d0f5"
+	hunk-header-decoration-style = "box ul"
+	hunk-header-file-style = "bold"
+	hunk-header-line-number-style = "bold #a5adce"
+	hunk-header-style = "file line-number syntax"
+	line-numbers = true
+	line-numbers-left-style = "#737994"
+	line-numbers-minus-style = "bold #e78284"
+	line-numbers-plus-style = "bold #a6d189"
+	line-numbers-right-style = "#737994"
+	line-numbers-zero-style = "#737994"
+	# 25% red 75% base
+	minus-emph-style = "bold syntax #5e4855"
+	# 10% red 90% base
+	minus-style = "syntax #433c4c"
+	# 25% green 75% base
+	plus-emph-style = "bold syntax #4e5c57"
+	# 10% green 90% base
+	plus-style = "syntax #3c444e"
+	map-styles = \
+		bold purple => syntax "#574f6f", \
+		bold blue => syntax "#475271", \
+		bold cyan => syntax "#4b5c6b", \
+		bold yellow => syntax "#5d5a59"
+	# Should match the name of the bat theme
+	syntax-theme = "Catppuccin Frappe"
+[delta "catppuccin-macchiato"]
+	blame-palette = "#24273a #1e2030 #181926 #363a4f #494d64"
+	commit-decoration-style = "box ul"
+	dark = true
+	file-decoration-style = "#cad3f5"
+	file-style = "#cad3f5"
+	hunk-header-decoration-style = "box ul"
+	hunk-header-file-style = "bold"
+	hunk-header-line-number-style = "bold #a5adcb"
+	hunk-header-style = "file line-number syntax"
+	line-numbers = true
+	line-numbers-left-style = "#6e738d"
+	line-numbers-minus-style = "bold #ed8796"
+	line-numbers-plus-style = "bold #a6da95"
+	line-numbers-right-style = "#6e738d"
+	line-numbers-zero-style = "#6e738d"
+	# 25% red 75% base
+	minus-emph-style = "bold syntax #564052"
+	# 10% red 90% base
+	minus-style = "syntax #383143"
+	# 25% green 75% base
+	plus-emph-style = "bold syntax #455552"
+	# 10% green 90% base
+	plus-style = "syntax #313943"
+	map-styles = \
+		bold purple => syntax "#4d4569", \
+		bold blue => syntax "#3e4868", \
+		bold cyan => syntax "#3f5365", \
+		bold yellow => syntax "#585253"
+	# Should match the name of the bat theme
+	syntax-theme = "Catppuccin-macchiato"
+[delta "catppuccin-mocha"]
+	blame-palette = "#1e1e2e #181825 #11111b #313244 #45475a"
+	commit-decoration-style = "box ul"
+	dark = true
+	file-decoration-style = "#cdd6f4"
+	file-style = "#cdd6f4"
+	hunk-header-decoration-style = "box ul"
+	hunk-header-file-style = "bold"
+	hunk-header-line-number-style = "bold #a6adc8"
+	hunk-header-style = "file line-number syntax"
+	line-numbers = true
+	line-numbers-left-style = "#6c7086"
+	line-numbers-minus-style = "bold #f38ba8"
+	line-numbers-plus-style = "bold #a6e3a1"
+	line-numbers-right-style = "#6c7086"
+	line-numbers-zero-style = "#6c7086"
+	# 25% red 75% base
+	minus-emph-style = "bold syntax #53394c"
+	# 10% red 90% base
+	minus-style = "syntax #35293b"
+	# 25% green 75% base
+	plus-emph-style = "bold syntax #40504b"
+	# 10% green 90% base
+	plus-style = "syntax #2c333a"
+	map-styles = \
+		bold purple => syntax "#494060", \
+		bold blue => syntax "#394361", \
+		bold cyan => syntax "#384d5e", \
+		bold yellow => syntax "#544f4e"
+	# Should match the name of the bat theme
+	syntax-theme = "Catppuccin Mocha"

.config/lazygit/config.yml

@@ -45,7 +45,7 @@ gui:
 git:
   paging:
     colorArg: always
-    useConfig: false
+    pager: delta --paging=never
   commit:
     signOff: false
   merging:

.config/pacman/arch-packages.txt

@@ -25,7 +25,6 @@ cpupower 6.7-2
 dbeaver 24.0.2-1
 dialog 1:1.3_20240307-2
 dictd 1.13.1-5
-diff-so-fancy 1.4.4-2
 dnsmasq 2.90-1
 dnsperf 2.11.2-2
 docker 1:26.0.1-1
@@ -50,6 +49,7 @@ gamemode 1.8.1-2
 gcc 13.2.1-5
 geeqie 2.4-1
 git 2.44.0-1
+git-delta 0.17.0-2
 github-cli 2.47.0-1
 glow 1.5.1-1
 gnome-disk-utility 46.0-1