diff --git a/.bash_aliases b/.bash_aliases
index 5c2242b..8df0256 100644
--- a/.bash_aliases
+++ b/.bash_aliases
@@ -44,9 +44,8 @@ alias ll='ls -lF'
 alias la='ls -alF'
 #alias l='ls -CF'
 
-alias :e='vim'
+alias :e='vi'
 alias t='task'
-alias vi='vim'
 alias em='emacs'
 alias grep="grep --color=auto"
 #alias screen="screen -R"
diff --git a/bin/vi b/bin/vi
new file mode 100755
index 0000000..c6e38b6
--- /dev/null
+++ b/bin/vi
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+if [ -n "`which nvim`" ]; then
+  nvim "$@"
+else
+  vim "$@"
+fi