Prefer nvim over vim for EDITOR, don't use which

zshenv

@@ -37,7 +37,7 @@ export CCACHE_CONFIGPATH=$HOME/.config/ccache
 export CCACHE_DIR=$HOME/.cache/ccache
 
 # Add default CMake generator
-which ninja &> /dev/null && \
+command -v ninja &> /dev/null && \
   export CMAKE_GENERATOR=Ninja
 
 # Remove duplicates from environment variables
@@ -47,8 +47,12 @@ typeset -U MANPATH;   export MANPATH
 typeset -U INFOPATH;  export INFOPATH
 
 # Set default editor.
-which vim &> /dev/null && \
-  export EDITOR=`which vim`
+if command -v nvim &> /dev/null; then
+  export EDITOR=`command -v nvim`
+elif command -v vim &> /dev/null; then
+  export EDITOR=`command -v vim`
+fi
+export GIT_EDITOR=$EDITOR
 
 # Use ~/.local for pip installs on macOS
 [ "`uname`" = "Darwin" ] && export PYTHONUSERBASE=$HOME/.local
@@ -77,24 +81,24 @@ export PYLINTHOME=~/.local/share/pylint
 export VIRTUAL_ENV_DISABLE_PROMPT=1
 
 # If pinentry-curses exists, use it for lastpass-cli
-which pinentry-curses &> /dev/null && \
+command -v pinentry-curses &> /dev/null && \
   export LPASS_PINENTRY=pinentry-curses
 
 # Teach these some XDG Base Directory Spec manners
 export IPYTHONDIR=$HOME/.config/ipython
-which cargo &> /dev/null && \
+command -v cargo &> /dev/null && \
   export CARGO_HOME=$HOME/.local/share/cargo
-if which ccache &> /dev/null; then
+if command -v ccache &> /dev/null; then
   export CCACHE_CONFIGPATH=$HOME/.config/ccache.conf
   export CCACHE_DIR=$HOME/.cache/ccache
 fi
-which conan &> /dev/null && \
+command -v conan &> /dev/null && \
   export CONAN_USER_HOME=$HOME/.local/share/conan
-which docker &> /dev/null && \
+command -v docker &> /dev/null && \
   export DOCKER_CONFIG=$HOME/.local/share/docker
 export GTK_RC_FILES=$HOME/.config/gtk/gtkrc
 export GTK2_RC_FILES=$HOME/.config/gtk-2.0/gtkrc
-which rustup &> /dev/null && \
+command -v rustup &> /dev/null && \
   export RUSTUP_HOME=$HOME/.local/share/rustup
 export PYLINTHOME=$HOME/.cache/pylint
 # TODO: terminfo