From 0bfbcbe82b48fda4ec5812c2bae984d51ad2b08e Mon Sep 17 00:00:00 2001 From: Harzo Date: Sun, 28 May 2023 16:13:48 +0200 Subject: [PATCH] git: Use delta as pager and diff tool --- .config/git/config | 44 ++++++++++++++++++++++++++++ .local/share/dotfiles/pkglistaur-add | 1 + 2 files changed, 45 insertions(+) create mode 100644 .config/git/config diff --git a/.config/git/config b/.config/git/config new file mode 100644 index 0000000..0e5d381 --- /dev/null +++ b/.config/git/config @@ -0,0 +1,44 @@ +[core] + pager = delta + +[interactive] + diffFilter = delta --color-only + +[delta] + navigate = true # use n and N to move between diff sections + light = false # set to true if you're in a terminal w/ a light background color (e.g. the default macOS terminal) + dark = true + line-numbers = true + hyperlinks = true + side-by-side = true + syntax-theme = Nord + keep-plus-minus-markers = false + file-style = "#8fbcbb" bold + file-decoration-style = "#8fbcbb" ul + file-added-label = [+] + file-copied-label = [==] + file-modified-label = [*] + file-removed-label = [-] + file-renamed-label = [->] + hunk-header-style = omit + line-numbers-left-format = " {nm:>3} │" + line-numbers-left-style = red + line-numbers-right-format = " {np:>3} │" + line-numbers-right-style = green + line-numbers-minus-style = red italic + line-numbers-plus-style = green italic + line-numbers-zero-style = "#434C5E" italic + minus-style = bold red darkred + minus-emph-style = bold black red + minus-non-emph-style = syntax black + plus-style = bold green darkgreen + plus-emph-style = bold black green + plus-non-emph-style = syntax black + zero-style = syntax + blame-code-style = syntax + +[merge] + conflictstyle = diff3 + +[diff] + colorMoved = default diff --git a/.local/share/dotfiles/pkglistaur-add b/.local/share/dotfiles/pkglistaur-add index 6e24cbf..e2638e0 100644 --- a/.local/share/dotfiles/pkglistaur-add +++ b/.local/share/dotfiles/pkglistaur-add @@ -1,6 +1,7 @@ archlinux-themes-sddm as-tree checkupdates-with-aur +delta downgrade grimblast-git hyprland-nvidia-git