5 files changed, 23 insertions, 9 deletions
diff --git a/vim/bundle/fzf b/vim/bundle/fzf
-Subproject 7191ebb615f5d6ebbf51d598d8ec853a65e2274
+Subproject 9cb7a364a31bdb882d873807774bdcf6fad0c9e
diff --git a/vim/bundle/fzf.vim b/vim/bundle/fzf.vim
-Subproject e34f6c129d39b90db44df1107c8b7dfacfd1894
+Subproject 1f7bfa4007043c30027b2cd79625e8aac5cff1f
diff --git a/vim/bundle/nerdcommenter b/vim/bundle/nerdcommenter
-Subproject a5d1663185bee20bfb120c9ab21214444451498
+Subproject f9c5f0fbda3be77dce5bb4b06b49d9f11b3b6c2
diff --git a/vim/bundle/nord-vim b/vim/bundle/nord-vim
-Subproject 8d8b9bf86bbc715a055b54cb53f0643fd664caa
+Subproject b32592eb0842005d1d25de96e3964ccacd53703
diff --git a/vim/vimrc b/vim/vimrc
index ae9a09c..76405b1 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -1,9 +1,26 @@
-set viminfo+=n~/.config/vim/viminfo
-set undodir=$HOME/.config/vim/undo
-set directory=$HOME/.config/vim/swap
-set backupdir=$HOME/.config/vim/backup
-set viewdir=$HOME/.config/vim/view
-set runtimepath=$HOME/.config/vim,$VIMRUNTIME,$HOME/.config/vim/after
+set nocompatible              " be iMproved, required
+filetype off                  " required
+if &compatible | set nocompatible | endif " Avoid side effects if `nocp` already set
+
+if empty("$XDG_CACHE_HOME")
+    let $XDG_CACHE_HOME="$HOME/.cache"
+endif
+
+if empty("$XDG_CONFIG_HOME")
+    let $XDG_CONFIG_HOME="$HOME/.config"
+endif
+
+if empty("$XDG_DATA_HOME")
+    let $XDG_DATA_HOME="$HOME/.local/share"
+endif
+
+set directory=$XDG_CACHE_HOME/vim/swap,~/,/tmp
+set backupdir=$XDG_CACHE_HOME/vim/backup,~/,/tmp
+set undodir=$XDG_CACHE_HOME/vim/undo,~/,/tmp
+set viminfo+=n$XDG_CACHE_HOME/vim/viminfo
+set runtimepath+=$XDG_CONFIG_HOME/vim,$XDG_CONFIG_HOME/vim/after,$VIM,$VIMRUNTIME
+let $MYVIMRC="$XDG_CONFIG_HOME/vim/vimrc"
+
 set rtp+=$HOME/.config/vim/bundle/Vundle.vim
 set enc=utf-8
 
@@ -26,9 +43,6 @@ command! FZFLib call fzf#run({'source': 'find ~/.config/ ~/.local/bin -type f',
 "set background=dark
 colorscheme nord
 
-" Don't try to be vi compatible
-set nocompatible
-
 " Turn on syntax highlighting
 syntax on