diff --git a/dotfiles/shell/aliases b/dotfiles/shell/aliases
index 73c12f4..e963930 100644
--- a/dotfiles/shell/aliases
+++ b/dotfiles/shell/aliases
@@ -41,6 +41,10 @@ alias l='ls -CF'
 alias envactivate='source .env/bin/activate'
 alias visudo='export EDITOR=$EDITOR && sudo -E visudo'
 
+if [ -x /usr/bin/nvim ]; then
+    alias vim='nvim'
+fi
+
 # For common errors
 alias :q=' exit'
 alias :x=' exit'
diff --git a/dotfiles/vim/init.vim b/dotfiles/vim/init.vim
new file mode 100644
index 0000000..f182e5b
--- /dev/null
+++ b/dotfiles/vim/init.vim
@@ -0,0 +1,3 @@
+set runtimepath^=~/.vim runtimepath+=~/.vim/after
+let &packpath = &runtimepath
+source ~/.vimrc