Merge pull request #325 from izumin5210/izumin5210/difftastic-and-delta

chore(git): use delta as pager and use difftastic as diftool

bin/setup-codespace

@@ -6,12 +6,23 @@ cd $(dirname $0)/..
 
 apt update
 apt install -y \
-	bat \
-	fzf \
-	ripgrep \
-	tig
+  bat \
+  fzf \
+  ripgrep \
+  tig
 
 curl -sS https://starship.rs/install.sh | sh -s -- -y
 
 curl --proto '=https' -fLsS https://rossmacarthur.github.io/install/crate.sh |
 	bash -s -- --repo rossmacarthur/sheldon --to ~/.local/bin
+
+# difft
+curl -sfL https://github.com/Wilfred/difftastic/releases/download/0.57.0/difft-x86_64-unknown-linux-gnu.tar.gz | tar xz
+chmod +x difft
+chown root:root difft
+mv difft /usr/local/bin/difft
+
+# delta
+curl -sfL https://github.com/dandavison/delta/releases/download/0.17.0/delta-0.17.0-x86_64-unknown-linux-gnu.tar.gz | tar xz
+mv delta-0.17.0-x86_64-unknown-linux-gnu/delta /usr/local/bin/delta
+rm -rf delta-0.17.0-x86_64-unknown-linux-gnu

config/.config/git/config

@@ -1,9 +1,12 @@
+[include]
+    path = ~/.config/git/delta/themes/catppuccin.gitconfig
 [user]
     name = izumin5210
     email = [email protected]
 [core]
     autocrlf = input
     editor = $EDITOR
+    pager = delta
 [color]
     ui = true
 [github]
@@ -21,6 +24,7 @@
     refresh-default-branch= "!f() { git set-branch-cache default $(git fetch-default-branch); }; f"
     default-branch = "!f() { git get-branch-cache default || (git refresh-default-branch; git get-branch-cache default); }; f"
     pr = "gh pr create --web"
+    dft = difftool
 [push]
     default = current
 [filter "lfs"]
@@ -39,17 +43,22 @@
 [diff]
     algorithm = "histogram"
     indentHeuristic = true
+    colorMoved = default
     tool = difftastic
 [pager]
-    log = diff-highlight | less
-    show = diff-highlight | less
-    diff = diff-highlight | less
+    difftool = true
 [interactive]
-    diffFilter = diff-highlight
+    diffFilter = delta --color-only
 [difftool]
     prompt = false
 [difftool "difftastic"]
     cmd = difft "$LOCAL" "$REMOTE"
+[delta]
+    navigate = true
+    side-by-side = true
+    dark = true
+    true-color = always
+    features = catppuccin-frappe
 [init]
     defaultBranch = main
 [url "https://github.com/"]

config/.config/git/delta/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"

home.nix

@@ -47,6 +47,7 @@
     pkgs.git
     pkgs.git-secrets
     pkgs.gh
+    pkgs.delta
     pkgs.difftastic
 
     # vim