One more try to getting back to vim.

zsh/.zshrc

@@ -8,7 +8,9 @@ setopt HIST_REDUCE_BLANKS
 setopt SHARE_HISTORY
 
 export PATH=~/.local/bin:$PATH
-export MANPAGER="nvim +Man!"
+export EDITOR=vim
+export VIMINIT='let $MYVIMRC="$XDG_CONFIG_HOME/vim/vimrc" | source $MYVIMRC'
+export MANPAGER="vim -M +MANPAGER"
 export LESSHISTFILE='/dev/null'
 
 [ ! -L ~/.cache ] && { rm -rf ~/.cache; ln -sf $XDG_CACHE_HOME ~/.cache ; }

zsh/aliases.zsh

@@ -16,13 +16,6 @@ fi
 if [ $(command -v fd) ]; then
   alias fd='fd -H -L --ignore-file ~/.local/settings/fd'
 fi
-if [ $(command -v nvim) ]; then
-  export EDITOR='nvim'
-  alias vim='nvim'
-  alias vimdiff='nvim -d'
-else
-  export EDITOR='vim'
-fi
 
 function ud() {
   wd dots