Skip to content

Commit

Permalink
Delta instead of diff-so-fancy
Browse files Browse the repository at this point in the history
  • Loading branch information
fortes committed Nov 12, 2024
1 parent 0f4d094 commit 242b524
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 14 deletions.
9 changes: 9 additions & 0 deletions scripts/install_github_packages
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
# - browsh
# - bun
# - ctop
# - delta
# - deno
# - difftastic
# - docker-compose
Expand Down Expand Up @@ -36,6 +37,7 @@ AVAILABLE_PACKAGES=(
browsh
bun
ctop
delta
deno
difftastic
docker-compose
Expand Down Expand Up @@ -196,6 +198,10 @@ install_ctop() {
install_bin 'bcicen/ctop' 'ctop-.*-linux-amd64'
}

install_delta() {
install_deb 'dandavison/delta' 'git-delta_.*_amd64.deb'
}

install_deno() {
install_zip 'denoland/deno' 'deno-x86_64-unknown-linux-gnu.zip'
}
Expand Down Expand Up @@ -347,6 +353,9 @@ install_github_packages() {
ctop)
install_ctop
;;
delta)
install_delta
;;
deno)
install_deno
;;
Expand Down
1 change: 0 additions & 1 deletion scripts/node-packages
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
bash-language-server
cssmodules-language-server
diff-so-fancy
dockerfile-language-server-nodejs
eslint
fkill-cli
Expand Down
14 changes: 8 additions & 6 deletions stowed-files/git/.config/git/config
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
verbose = true
[core]
excludesfile = ~/.config/git/ignore.global
pager = "diff-so-fancy-with-fallback | less --tabs=2 -RFX"
pager = delta
whitespace = space-before-tab,tab-in-indent,blank-at-eof,trailing-space,tabwidth=2
[diff]
algorithm = minimal
Expand All @@ -55,10 +55,10 @@
[init]
defaultBranch = main
[interactive]
diffFilter = "diff-so-fancy-with-fallback --patch"
diffFilter = "delta --color-only"
[merge]
autostash = true
conflictStyle = diff3
conflictStyle = zdiff3
prompt = false
tool = nvim
[mergetool "nvim"]
Expand All @@ -77,11 +77,13 @@
[status]
# Show files within an untracked directory
showUntrackedFiles = all
[include]
# Local modifications / auth
path = ~/.gitconfig.local
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
[delta]
navigate = true # use n and N to move between diff sections
[include]
# Local modifications / auth
path = ~/.gitconfig.local
7 changes: 0 additions & 7 deletions stowed-files/git/.local/bin/diff-so-fancy-with-fallback

This file was deleted.

0 comments on commit 242b524

Please sign in to comment.