3 files changed, 4 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index e3e0ff7..51ccc6f 100644
--- a/Makefile
+++ b/Makefile
@@ -70,10 +70,11 @@ BUILD     = bin/local/timettyrec \
 
 EMPTYDIRS = $(patsubst services/%,.log/%,$(wildcard services/*)) \
 	    Maildir \
-	    .vim/data/undo \
 	    .cache/mutt/headers \
 	    .cache/mutt/bodies \
 	    .cache/mpd \
+	    .cache/vim/hist \
+	    .cache/vim/undo \
 	    .config/mpd/playlists
 
 ECHO      = @echo
diff --git a/vimrc b/vimrc
index 191bfdd..938dcff 100644
--- a/vimrc
+++ b/vimrc
@@ -194,7 +194,7 @@ let maplocalleader = ';'
 " enable persistent undo
 if has("persistent_undo")
     set undofile
-    set undodir=~/.vim/data/undo
+    set undodir=~/.cache/vim/undo
 endif
 
 " case insensitive searching, unless i type a capital letter
diff --git a/zshrc b/zshrc
index b4c6251..b36b67f 100644
--- a/zshrc
+++ b/zshrc
@@ -24,7 +24,7 @@ esac # }}}
 mkdir -p $HOME/.vim/data/hist
 function vim {
     local zsh_hist_fname
-    zsh_hist_fname=$HOME/.vim/data/hist/$$
+    zsh_hist_fname=$HOME/.cache/vim/hist/$$
     command vim --cmd "let g:_zsh_hist_fname = '$zsh_hist_fname'" "$@"
     if [[ -r $zsh_hist_fname ]]; then
         while read line; do