diff --git a/.bashrc b/.bashrc
index 216993e..1623b03 100644
--- a/.bashrc
+++ b/.bashrc
@@ -152,7 +152,13 @@ fi
 
 #export PS1 PATH LD_LIBRARY_PATH
 
-EDITOR=vim
+if [[ -n $(which nvim) ]]; then
+    EDITOR=nvim
+    alias vim=nvim
+else
+    EDITOR=vim
+fi
+
 LANG=en_US.UTF-8
 
 export PS1 PATH HISTSIZE HISTFILESIZE EDITOR LANG