diff --git a/symlinks/.gitconfig b/symlinks/.gitconfig index 2a36320..135e000 100755 --- a/symlinks/.gitconfig +++ b/symlinks/.gitconfig @@ -5,10 +5,23 @@ [core] excludesfile = ~/.gitignore + pager = delta [commit] template = ~/.gitmessage +[interactive] + diffFilter = delta --color-only + +[delta] + navigate = true # use n and N to move between diff sections + side-by-side = true + line-numbers = true + hyperlinks = true + +[merge] + conflictstyle = diff3 + [alias] st = status diff --git a/tools/macos/Brewfile b/tools/macos/Brewfile index d5c7f11..1a990b1 100644 --- a/tools/macos/Brewfile +++ b/tools/macos/Brewfile @@ -11,6 +11,7 @@ brew "asdf" brew "autojump" brew "bat" brew "curl" +brew "delta" brew "detox" brew "dust" brew "eza"