From 7deffb5cd2395e6b43be310417531ec019f6229e Mon Sep 17 00:00:00 2001 From: James Patrick Date: Tue, 27 Apr 2021 14:39:49 -0400 Subject: [PATCH] Replacing diff-so-fancy with delta. They are largely comparable, but I'm interested in the syntax highlighting that ships with delta, and more regular upkeep and security checks --- git/gitconfig | 18 ++++++++++++++++-- zsh/zplug | 2 +- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/git/gitconfig b/git/gitconfig index ab3db91..c98de40 100644 --- a/git/gitconfig +++ b/git/gitconfig @@ -3,8 +3,22 @@ name = James Patrick [core] - pager = diff-so-fancy | less -FXRi - editor = vim + pager = delta + editor = vim + +[interactive] + diffFilter = delta --color-only + +[delta] + features = line-numbers decorations + whitespace-error-style = 22 reverse + navigate = true +[delta "decorations"] + commit-decoration-style = bold yellow box ul + file-style = bold cyan ul + file-decoration-style = none + hunk-header-decoration-style = none + [github] user = jamesepatrick [alias] diff --git a/zsh/zplug b/zsh/zplug index 6d6daec..c5d5628 100755 --- a/zsh/zplug +++ b/zsh/zplug @@ -4,7 +4,7 @@ source ${ZPLUG_HOME}/init.zsh zplug "${ZDIR}/modules/bin/", from:local, as:command, use:"*" zplug "junegunn/fzf-bin", from:gh-r, as:command, rename-to:fzf -zplug "zdharma/zsh-diff-so-fancy", as:command, use:"bin/{git-dsf,diff-so-fancy}" +zplug "dandavison/delta", from:gh-r, as:command, rename-to:delta zplug "${ZDIR}/modules/alias/", from:local, as:plugin zplug "${ZDIR}/modules/complete/", from:local, as:plugin, defer:2