diff --git a/.bashrc b/.bashrc
index 6a45046..0007ff8 100644
--- a/.bashrc
+++ b/.bashrc
@@ -35,8 +35,14 @@ function db.warmup() {
     pt-find --charset=utf8 --print -h $1 | xargs -t -P8 -I% -n1 sh -c "echo 'SELECT COUNT(*) FROM %;' | mysql -h $1 > /dev/null"
 }
 #
+if [ -x /usr/bin/nvim ]; then
+    alias vim="nvim"
+    export EDITOR="nvim"
+else
+    export EDITOR="vim"
+fi
+#
 export BLOCKSIZE="k"
-export EDITOR="vim"
 export GIT_PAGER="less"
 export HISTTIMEFORMAT="%y/%m/%d %T "
 export HOMEBREW_NO_ANALYTICS=1
diff --git a/.zshrc b/.zshrc
index 1ef16c7..0abb3da 100644
--- a/.zshrc
+++ b/.zshrc
@@ -118,8 +118,14 @@ else
     alias "ls=/bin/ls -aF"
 fi
 #
+if [[ -x /usr/bin/nvim ]]; then
+    alias "vim=nvim"
+    export EDITOR="nvim"
+else
+    export EDITOR="vim"
+fi
+#
 export BLOCKSIZE="k"
-export EDITOR="vim"
 export GIT_PAGER="less"
 export HISTFILE="$HOME/.history"
 export HISTSIZE=2000