diff --git a/.gitignore b/.gitignore
index dd5048e..28ec684 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,8 @@ vim/.vim/autoload/plug.vim*
 vim/.vim/plugged/
 vim/.vim/spell/
 vim/.vim/view/
+vim/.vim/viminfo
+nvim/.config/nvim/shada
 # Miscellaneous desktop files
 desktop/
 tmux/.config/tmux/plugins
diff --git a/vim/.vim/plugin/viminfo.vim b/vim/.vim/plugin/viminfo.vim
new file mode 100644
index 0000000..7b7ab76
--- /dev/null
+++ b/vim/.vim/plugin/viminfo.vim
@@ -0,0 +1,6 @@
+" Do not store viminfo/shada files in my HOME
+if has('nvim')
+    "set shadafile=$HOME/.config/nvim/shada
+else
+    set viminfofile=$HOME/.vim/viminfo
+endif