dotfiles.git

@@ -114,13 +114,6 @@ alias grep='grep --color=auto'

 alias fgrep='fgrep --color=auto'

 alias egrep='egrep --color=auto'

 alias tmux='tmux -2u'

-if command -v nvim &> /dev/null; then

-    alias vim='nvim'

-    alias vim-='nvim +"setl buftype=nofile" -'

-    alias vimdiff='nvim -d'

-else

-    alias vim-='vim +"setl buftype=nofile" -'

-fi

 # colored GCC warnings and errors

 export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'

@@ -133,6 +126,14 @@ append_to_path $HOME/bin

 # .cargo/bin for rustc

 append_to_path $HOME/.cargo/bin

+if command -v nvim &> /dev/null; then

+    alias vim='nvim'

+    alias vim-='nvim +"setl buftype=nofile" -'

+    alias vimdiff='nvim -d'

+else

+    alias vim-='vim +"setl buftype=nofile" -'

+fi

+

 # For interactive shells ('i' in $-), disable stty flow control (ctrl+s,ctrl+q)

 case "$-" in

  *i*)