Merge branch 'master' of git.clortox.com:tyler/neodot

This commit is contained in:
Tyler 2025-05-06 13:42:54 -04:00
commit 59c3ca7b39
2 changed files with 8 additions and 1 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"
@ -163,5 +165,9 @@ eval "$(atuin init bash)"
# The next line updates PATH for the Google Cloud SDK. # The next line updates PATH for the Google Cloud SDK.
if [ -f '/home/tyler/work/google-cloud-sdk/path.bash.inc' ]; then . '/home/tyler/work/google-cloud-sdk/path.bash.inc'; fi if [ -f '/home/tyler/work/google-cloud-sdk/path.bash.inc' ]; then . '/home/tyler/work/google-cloud-sdk/path.bash.inc'; fi
[ -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. # The next line enables shell command completion for gcloud.
if [ -f '/home/tyler/work/google-cloud-sdk/completion.bash.inc' ]; then . '/home/tyler/work/google-cloud-sdk/completion.bash.inc'; fi 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