diff --git a/dotfiles/config/nvim/init.vim b/dotfiles/config/nvim/init.vim
new file mode 100644
index 0000000..d948864
--- /dev/null
+++ b/dotfiles/config/nvim/init.vim
@@ -0,0 +1,4 @@
+" nvim config
+set runtimepath^=~/.vim runtimepath+=~/.vim/after
+let &packpath = &runtimepath
+source ~/.vimrc
diff --git a/dotfiles/vimrc b/dotfiles/vimrc
index bfb52a0..25804e3 100644
--- a/dotfiles/vimrc
+++ b/dotfiles/vimrc
@@ -31,7 +31,9 @@ set number
 set ruler
 
 " Setup viminfo for recording positions, etc.
-set viminfo='10,\"100,:20,%,n~/.viminfo
+if !has('nvim')
+  set viminfo='10,\"100,:20,%,n~/.viminfo
+endif
 " Jump back when editing a file
 function! ResCur()
   " Don't jump in git commits since they're generated.