diff --git a/.gitignore b/.gitignore
index 0dcd0bb..33b7cda 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,4 +10,4 @@ vim/rc/*.local.rc.vim
 vim/rc/plugins/*.local.rc.vim
 vim/tmp/*.swo
 vim/tmp/*.swp
-vim/tmp/viminfo
+vim/tmp/viminfo.*
diff --git a/vim/rc/init.rc.vim b/vim/rc/init.rc.vim
index d89d675..3c3c711 100644
--- a/vim/rc/init.rc.vim
+++ b/vim/rc/init.rc.vim
@@ -16,9 +16,15 @@ set mouse=a
 
 " Set backup dirs
 set backup
-set backupdir=~/.vim/backup
-set directory=~/.vim/tmp
-set viminfo='100,n~/.vim/tmp/viminfo
+if has('nvim')
+    set backupdir=~/.config/nvim/backup
+    set directory=~/.config/nvim/tmp
+    set viminfo='100,n~/.config/nvim/tmp/viminfo.nvim
+else
+    set backupdir=~/.vim/backup
+    set directory=~/.vim/tmp
+    set viminfo='100,n~/.vim/tmp/viminfo.vim
+endif
 
 " Filetype extension
 au BufRead,BufNewFile *.md set syntax=markdown