Use delta for git diffs

This commit is contained in:
Tim Huizinga 2025-06-03 03:32:31 +02:00
parent 8dd7fe61fc
commit 14cee7d351
2 changed files with 55 additions and 0 deletions

View File

@ -0,0 +1,54 @@
[delta "gruvmax-fang"]
# author: https://github.com/maxfangx
# Modified by: Dreaded_X
# General appearance
dark = true
syntax-theme = gruvbox-dark
# File
file-style = "#FFFFFF" bold
file-added-label = [+]
file-copied-label = [==]
file-modified-label = [*]
file-removed-label = [-]
file-renamed-label = [->]
file-decoration-style = "#434C5E" ul
file-decoration-style = "#84786A" ul
# No hunk headers
hunk-header-style = omit
# Line numbers
line-numbers = true
line-numbers-left-style = "#84786A"
line-numbers-right-style = "#84786A"
line-numbers-minus-style = "#A02A11"
line-numbers-plus-style = "#479B36"
line-numbers-zero-style = "#84786A"
line-numbers-left-format = " {nm:>3} │"
line-numbers-right-format = " {np:>3} │"
# Diff contents
inline-hint-style = syntax
minus-non-emph-style = syntax auto
plus-non-emph-style = syntax auto
whitespace-error-style = "#FB4934" reverse
# Blame
blame-code-style = syntax
# Merge conflicts
merge-conflict-begin-symbol = ⌃
merge-conflict-end-symbol = ⌄
merge-conflict-ours-diff-header-style = "#FABD2F" bold
merge-conflict-theirs-diff-header-style = "#FABD2F" bold overline
merge-conflict-ours-diff-header-decoration-style = ''
merge-conflict-theirs-diff-header-decoration-style = ''
[core]
pager = delta
[interactive]
diffFilter = delta --color-only
[delta]
features = gruvmax-fang
navigate = true
side-by-side = true
[merge]
conflictstyle = zdiff3

View File

@ -1,6 +1,7 @@
[include]
path = ~/.dotfiles/git/configs/common.gitconfig
path = ~/.dotfiles/git/configs/lfs.gitconfig
path = ~/.dotfiles/git/configs/delta.gitconfig
path = ~/.dotfiles/git/profiles/ALTEN.gitconfig