From b37187f79e46d6462f70e6c87f6d0c485c16360f Mon Sep 17 00:00:00 2001 From: coolneng Date: Sun, 4 Sep 2022 07:16:17 +0200 Subject: [PATCH] Use delta as git diff pager --- git/.config/git/config | 15 +++++++++++++++ kitty/.config/kitty/kitty.conf | 1 + scripts/.local/share/scripts/switch-theme | 9 +++++++++ tmux/.tmux.conf | 1 + 4 files changed, 26 insertions(+) diff --git a/git/.config/git/config b/git/.config/git/config index d2d356c..b4410a5 100644 --- a/git/.config/git/config +++ b/git/.config/git/config @@ -4,6 +4,7 @@ signingkey = 9893DA236405AF57 [core] excludesfile = /home/coolneng/.config/git/global_gitignore + pager = delta [credential] helper = !pass-git-helper $@ [commit] @@ -17,3 +18,17 @@ [filter "git-ignore-line.sh"] clean = git-ignore-line.sh smudge = cat +[interactive] + diffFilter = delta --color-only +[add.interactive] + useBuiltin = false # required for git 2.37.0 +[delta] + navigate = true # use n and N to move between diff sections +# GITIGNORE START + light = false # set to true if you're in a terminal w/ a light background color (e.g. the default macOS terminal) + syntax-theme = Nord +# GITIGNORE END +[merge] + conflictstyle = diff3 +[diff] + colorMoved = default diff --git a/kitty/.config/kitty/kitty.conf b/kitty/.config/kitty/kitty.conf index f366bf2..64034cd 100644 --- a/kitty/.config/kitty/kitty.conf +++ b/kitty/.config/kitty/kitty.conf @@ -992,3 +992,4 @@ map kitty_mod+delete clear_terminal reset active confirm_os_window_close 0 + diff --git a/scripts/.local/share/scripts/switch-theme b/scripts/.local/share/scripts/switch-theme index 87cb12d..d0d45e8 100755 --- a/scripts/.local/share/scripts/switch-theme +++ b/scripts/.local/share/scripts/switch-theme @@ -5,11 +5,20 @@ capitalize() { printf '%s' "$1" | tail -c '+2' } +modify_delta() { + if [ "$1" = "light" ]; then + sed -e "s/light = false/light = true/" -e "s/Nord/OneHalfLight/" -i ~/.config/git/config + else + sed -e "s/light = true/light = false/" -e "s/OneHalfLight/Nord/" -i ~/.config/git/config + fi +} + change_theme() { sed -i "s/iceberg_$1/iceberg_$2/" ~/.config/kitty/kitty.conf sed -i "s/bg=$1/bg=$2/" ~/.config/nvim/init.vim sed -i "s/iceberg_$1/iceberg_$2/" ~/.dotfiles/tmux/.tmux.conf sed -i "s/iceberg_$1/iceberg_$2/" ~/.config/zathura/zathurarc + modify_delta "$2" kitty +kitten themes --reload-in=all "Iceberg $(capitalize "$2")" tmux source-file ~/.tmux.conf nvr --remote-send ":source ~/.config/nvim/init.vim :set nonumber :set norelativenumber " diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf index 4720bb1..2643333 100644 --- a/tmux/.tmux.conf +++ b/tmux/.tmux.conf @@ -78,3 +78,4 @@ set -g mouse on bind -T root WheelUpPane if-shell -F -t = "#{alternate_on}" "send-keys -M" "select-pane -t =; copy-mode -e; send-keys -M" bind -T root WheelDownPane if-shell -F -t = "#{alternate_on}" "send-keys -M" "select-pane -t =; send-keys -M" +# Colorscheme file