Index: create_symlinks.sh
==================================================================
--- create_symlinks.sh
+++ create_symlinks.sh
@@ -16,14 +16,11 @@
 if which gpg >/dev/null 2>&1 || which gpg2 >/dev/null 2>&1; then
 	mkdir -p $HOME/.gnupg
 	link_file gpg.conf .gnupg/gpg.conf ../
 fi
 which tmux >/dev/null 2>&1 && link_file tmux.conf .tmux.conf
-if which vim >/dev/null 2>&1; then
-	link_file vim .vim
-	link_file vimrc .vimrc
-fi
+which vim >/dev/null 2>&1 && link_file vim .config/vim ../
 which fish >/dev/null 2>&1 && link_file fish .config/fish ../
 which youtube-dl >/dev/null 2>&1 && link_file youtube-dl .config/youtube-dl ../
 which zsh >/dev/null 2>&1 && link_file zshrc .zshrc
 
 if test x"$(uname -s)" = x"Darwin"; then

Index: fish/config.fish
==================================================================
--- fish/config.fish
+++ fish/config.fish
@@ -22,7 +22,15 @@
 set -g fish_color_vcs_braces 29bc7d
 
 set -g _fish_abbr_gpg gpg2
 set -g _fish_abbr_vi vim
 
+test -n "$XDG_CONFIG_HOME"
+or set -x XDG_CONFIG_HOME $HOME/.config
+test -n "$XDG_CACHE_HOME"
+or set -x XDG_CACHE_HOME $HOME/.cache
+test -n "$XDG_DATA_HOME"
+or set -x XDG_DATA_HOME $HOME/.local/share
+
 set -x EDITOR vim
+set -x VIMINIT "source $XDG_CONFIG_HOME/vim/vimrc"
 set -x LS_COLORS 'di=34:ow=44;37:tw=44;37:st=44;37:ex=31:su=7;31:sg=7;31:ln=33:or=7;33:pi=32:do=32:bd=35:cd=35:so=32:*.bz2=36:*.dmg=36:*.gz=36:*.gpg=36:*.rar=36:*.tar=36:*.tbz2=36:*.tgz=36:*.xz=36:*.zip=36:*.orig=90:*~=90'

ADDED   vim/vimrc
Index: vim/vimrc
==================================================================
--- vim/vimrc
+++ vim/vimrc
@@ -0,0 +1,36 @@
+set runtimepath+=$XDG_CONFIG_HOME/vim,$XDG_CONFIG_HOME/vim/after
+set viminfofile=$XDG_CACHE_HOME/vim/viminfo
+
+source $VIMRUNTIME/vimrc_example.vim
+
+set t_Co=256
+set background=dark
+let g:inkpot_black_background=1
+colorscheme inkpot
+
+set cinoptions=+4,(4,u4,w4
+set colorcolumn=81
+highlight ColorColumn ctermbg=235
+let c_space_errors=1
+set ignorecase
+set smartcase
+set modeline
+set modelines=1000
+set nrformats=hex
+set mouse=
+
+au BufNewFile,BufRead *.c :se ft=c.doxygen
+au BufNewFile,BufRead *.cs :se ts=4 sw=4
+au BufNewFile,BufRead *.fish :se ts=4 sw=4 et
+au BufNewFile,BufRead *.h :se ft=objc.doxygen
+au BufNewFile,BufRead *.m :se ft=objc.doxygen
+au BufNewFile,BufRead *.mm :se ft=objcpp
+au BufNewFile,BufRead *.pas :se ts=2 sw=2 et
+au BufNewFile,BufRead *.py :se ts=4 sw=4 et
+au BufNewFile,BufRead *.rb :se ts=2 sw=2 et
+au BufNewFile,BufRead *.swift :se ts=4 sw=4 et
+au BufNewFile,BufRead *.v :se ts=4 sw=4 et
+au BufNewFile,BufRead *.vhd :se ts=4 sw=4 et
+au BufNewFile,BufRead *.xml :se ts=2 sw=2 et
+au BufNewFile,BufRead */LLVM/* :se ts=2 sw=2 et
+au BufNewFile,BufRead */haiku/* :se ts=4 sw=4

DELETED vimrc
Index: vimrc
==================================================================
--- vimrc
+++ vimrc
@@ -1,33 +0,0 @@
-source $VIMRUNTIME/vimrc_example.vim
-
-set t_Co=256
-set background=dark
-let g:inkpot_black_background=1
-colorscheme inkpot
-
-set cinoptions=+4,(4,u4,w4
-set colorcolumn=81
-highlight ColorColumn ctermbg=235
-let c_space_errors=1
-set ignorecase
-set smartcase
-set modeline
-set modelines=1000
-set nrformats=hex
-set mouse=
-
-au BufNewFile,BufRead *.c :se ft=c.doxygen
-au BufNewFile,BufRead *.cs :se ts=4 sw=4
-au BufNewFile,BufRead *.fish :se ts=4 sw=4 et
-au BufNewFile,BufRead *.h :se ft=objc.doxygen
-au BufNewFile,BufRead *.m :se ft=objc.doxygen
-au BufNewFile,BufRead *.mm :se ft=objcpp
-au BufNewFile,BufRead *.pas :se ts=2 sw=2 et
-au BufNewFile,BufRead *.py :se ts=4 sw=4 et
-au BufNewFile,BufRead *.rb :se ts=2 sw=2 et
-au BufNewFile,BufRead *.swift :se ts=4 sw=4 et
-au BufNewFile,BufRead *.v :se ts=4 sw=4 et
-au BufNewFile,BufRead *.vhd :se ts=4 sw=4 et
-au BufNewFile,BufRead *.xml :se ts=2 sw=2 et
-au BufNewFile,BufRead */LLVM/* :se ts=2 sw=2 et
-au BufNewFile,BufRead */haiku/* :se ts=4 sw=4

Index: zshrc
==================================================================
--- zshrc
+++ zshrc
@@ -1,6 +1,10 @@
+export XDG_CONFIG_HOME="$HOME/.config"
+export XDG_CACHE_HOME="$HOME/.cache"
+export XDG_DATA_HOME="$HOME/.local/share"
 export EDITOR="vim"
+export VIMINIT="source $XDG_CONFIG_HOME/vim/vimrc"
 export PAGER="less"
 export LS_COLORS='di=34:ow=44;37:tw=44;37:st=44;37:ex=31:su=7;31:sg=7;31:ln=33:or=7;33:pi=32:do=32:bd=35:cd=35:so=32:*.bz2=36:*.dmg=36:*.gz=36:*.gpg=36:*.rar=36:*.tar=36:*.tbz2=36:*.tgz=36:*.xz=36:*.zip=36:*.orig=90:*~=90'
 LISTMAX=32768
 WORDCHARS="*?[];!#~"
 local grep=""