Update to use nvimdiff

This commit is contained in:
Tyler 2025-01-07 14:12:36 -05:00
parent 6c16fd104d
commit 052d7d9ccd
2 changed files with 10 additions and 0 deletions

View File

@ -96,6 +96,8 @@ alias gitea="tea"
alias set-motd="vim /home/tyler/.desktop/alarm/motd.txt" alias set-motd="vim /home/tyler/.desktop/alarm/motd.txt"
alias ":q!"="exit" alias ":q!"="exit"
alias vim="nvim" alias vim="nvim"
alias nvimdiff="nvim -d"
alias vimdiff="nvimdiff"
alias diff="diff --color=auto" alias diff="diff --color=auto"
alias grep="grep -i --color=auto" alias grep="grep -i --color=auto"
@ -161,3 +163,10 @@ export NVM_DIR="$HOME/.nvm"
eval "$(atuin init bash)" eval "$(atuin init bash)"
[ -f "/home/tyler/.ghcup/env" ] && . "/home/tyler/.ghcup/env" # ghcup-env
# The next line updates PATH for the Google Cloud SDK.
if [ -f '/home/tyler/google-cloud-sdk/path.bash.inc' ]; then . '/home/tyler/google-cloud-sdk/path.bash.inc'; fi
# The next line enables shell command completion for gcloud.
if [ -f '/home/tyler/google-cloud-sdk/completion.bash.inc' ]; then . '/home/tyler/google-cloud-sdk/completion.bash.inc'; fi

View File

@ -18,3 +18,4 @@
helper = store helper = store
[diff] [diff]
algorithm = histogram algorithm = histogram
tool = nvimdiff