diff --git a/Brewfile b/Brewfile index 8f62ae3..54d5adc 100644 --- a/Brewfile +++ b/Brewfile @@ -196,3 +196,4 @@ brew "wtfutil" brew "tfenv" brew "tokei" brew "fd" +brew "git-delta" diff --git a/dot_gitconfig b/dot_gitconfig index 0099bdb..68d49dc 100644 --- a/dot_gitconfig +++ b/dot_gitconfig @@ -73,8 +73,7 @@ templateDir = /Users/morganwattiez/.git-template [core] - pager = diff-so-fancy | less --tabs=4 -RFX - + pager = delta --line-numbers --diff-highlight # Treat spaces before tabs and all kinds of trailing whitespace as an error. # [default] trailing-space: looks for spaces at the end of a line # [default] space-before-tab: looks for spaces before tabs at the beginning of a line @@ -99,4 +98,12 @@ insteadOf = https://github.com/ [difftool] - prompt = false + prompt = false + +[delta] + plus-color = "#012800" + minus-color = "#340001" + theme = Monokai Extended + +[interactive] + diffFilter = delta --color-only