diff --git a/.gitconfig b/.gitconfig index e664c04..f3a46ad 100644 --- a/.gitconfig +++ b/.gitconfig @@ -22,6 +22,7 @@ [core] editor = nvim + pager = delta [color] ui = auto @@ -35,20 +36,14 @@ [pull] rebase = true -[color "diff"] - meta = yellow bold - commit = green bold - frag = magenta bold - old = red bold - new = green bold - whitespace = red reverse +[interactive] + diffFilter = delta --color-only -[color "diff-highlight"] - oldNormal = "red bold" - oldHighlight = "red bold 52" - newNormal = "green bold" - newHighlight = "green bold 22" - -[merge] - tool = kdiff3 +[delta] + features = side-by-side line-numbers decorations + whitespace-error-style = 22 reverse +[delta "decorations"] + commit-decoration-style = bold yellow box ul + file-style = bold yellow ul + file-decoration-style = none