yoshie
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

chore: replace delta with difftastic

main
sudo pacman -Syu 2023-01-22 21:06:31 +07:00
parent ff4eee280a
commit 22c005929e
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
data/zsh/extra-zshrc
View File

@ -31,7 +31,7 @@ export GOPATH=$HOME/go
export PATH=$PATH:$GOPATH/bin
# Depend on your company
# Please copy this manually to ~/.zshrc
export GOPRIVATE=github.com/haunt98,github.com/make-go-great
export GOPRIVATE=github.com/make-go-great,github.com/haunt98
# fzf
# https://github.com/junegunn/fzf#environment-variables
@ -48,9 +48,12 @@ export FZF_DEFAULT_OPTS=" \
# Alias
alias g="git"
alias moe="make"
alias jq="gojq"
# https://sw.kovidgoyal.net/kitty/faq/
alias kssh="kitty +kitten ssh"
# https://restic.readthedocs.io/en/latest/manual_rest.html
export RESTIC_PASSWORD_FILE=$HOME/.restic_password_file
# https://difftastic.wilfred.me.uk/git.html
export GIT_EXTERNAL_DIFF=difft

9
scripts/git.sh
View File

@ -27,12 +27,3 @@ git config --global pull.rebase true
git config --global pull.twohead ort
git config --global push.autoSetupRemote true
git config --global rebase.stat true
# Delta
# https://github.com/dandavison/delta
git config --global core.pager delta
git config --global interactive.diffFilter "delta --color-only"
git config --global delta.navigate true
git config --global delta.line-numbers true
git config --global include.path "~/.config/delta/themes.gitconfig"
git config --global delta.features "chameleon"