parent
1a508bd19e
commit
4c6be29281
|
@ -4,7 +4,6 @@
|
|||
signingkey = 9893DA236405AF57
|
||||
[core]
|
||||
excludesfile = /home/coolneng/.config/git/global_gitignore
|
||||
pager = delta
|
||||
[credential]
|
||||
helper = !pass-git-helper $@
|
||||
[commit]
|
||||
|
@ -18,13 +17,11 @@
|
|||
[filter "git-ignore-line.sh"]
|
||||
clean = /home/coolneng/.dotfiles/scripts/.local/share/scripts/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
|
||||
[merge]
|
||||
conflictstyle = diff3
|
||||
[diff]
|
||||
colorMoved = default
|
||||
[add.interactive]
|
||||
useBuiltin = false # required for git 2.37.0
|
||||
|
|
|
@ -992,6 +992,11 @@ map kitty_mod+delete clear_terminal reset active
|
|||
|
||||
confirm_os_window_close 0
|
||||
|
||||
<<<<<<< HEAD
|
||||
|
||||
|
||||
|
||||
||||||| b37187f (Use delta as git diff pager)
|
||||
|
||||
=======
|
||||
>>>>>>> parent of b37187f (Use delta as git diff pager)
|
||||
|
|
|
@ -5,20 +5,11 @@ capitalize() {
|
|||
printf '%s' "$1" | tail -c '+2'
|
||||
}
|
||||
|
||||
modify_delta() {
|
||||
if [ "$1" = "light" ]; then
|
||||
sed -e "s/light = false/light = true/" -e "s/OneHalfDark/OneHalfLight/" -i ~/.config/git/config
|
||||
else
|
||||
sed -e "s/light = true/light = false/" -e "s/OneHalfLight/OneHalfDark/" -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 <CR> :set nonumber <CR> :set norelativenumber <CR>"
|
||||
|
|
Loading…
Reference in New Issue