zsh: switch to nvim as default editor

diff --git a/aliases b/aliases
index 721a3da9d3864abcf78fbab25a4aff32e8257571..e7b0a12f861c309dd1736187e6b62df5bd99743b 100644 (file)
--- a/aliases
+++ b/aliases
@@ -32,7 +32,7 @@ if [[ -n "${VIM_TERMINAL}" ]]; then
         done
     }
 fi
-alias vi='vim'
+alias vi=nvim
 alias svi='sudo -e'
 #alias vp='vim PKGBUILD' # I have a script for that in ~/bin
 alias vs='vim SPLITBUILD'

diff --git a/zshenv b/zshenv
index 7a3b049e6a8030e1320d4c3e842ce304dc599bfa..c184a185bcf5d0ade1d025f9b36c07bda42ff4cb 100644 (file)
--- a/zshenv
+++ b/zshenv
@@ -28,9 +28,9 @@ fi
 
 # vim stuff
 [[ -d "$XDG_CACHE_HOME/vim/backup" ]] || mkdir -p "$XDG_CACHE_HOME"/vim/{backup,undo,view}
-export VIMINIT='let $MYVIMRC="$XDG_CONFIG_HOME/vim/vimrc" | source $MYVIMRC'
-export EDITOR=vim
-export VISUAL=vim
+export VIMINIT='let $MYVIMRC="$XDG_CONFIG_HOME/"..(has("nvim")?"nvim/init.lua":"vim/vimrc") | source $MYVIMRC'
+export EDITOR=nvim
+export VISUAL=nvim
 
 # default browser
 export BROWSER=qutebrowser