From 1330f08cbb008a9b5cb23f28bd145a24a1a8a719 Mon Sep 17 00:00:00 2001
From: Christian Baer <chris@debilux.org>
Date: Sun, 11 Oct 2020 20:56:08 +0200
Subject: [PATCH] Fixed an error in vim setup.

---
 .config/vim/vimrc           | 18 +++++++++---------
 .config/zsh/lib/30-misc.zsh |  3 ++-
 .zshenv                     |  2 ++
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/.config/vim/vimrc b/.config/vim/vimrc
index cf1b50f..244ae1d 100644
--- a/.config/vim/vimrc
+++ b/.config/vim/vimrc
@@ -1,21 +1,21 @@
-set undodir=$XDG_DATA_HOME/vim/undo
-set directory=$XDG_DATA_HOME/vim/swap
-set backupdir=$XDG_DATA_HOME/vim/backup
-set viewdir=$XDG_DATA_HOME/vim/view
-set viminfo+='1000,n$XDG_DATA_HOME/vim/viminfo
+set undodir=${VIMDOTDIR}/undo
+set directory=${VIMDOTDIR}/swap
+set backupdir=${VIMDOTDIR}/backup
+set viewdir=${VIMDOTDIR}/view
+set viminfo+='1000,n${VIMDOTDIR}/viminfo
 set runtimepath=$XDG_CONFIG_HOME/vim,$VIMRUNTIME,$XDG_CONFIG_HOME/vim/after
 
 
 " Install vim-plug
-if empty(glob('$XDG_DATA_HOME/vim/autoload/plug.vim'))
-  silent !curl -fLo $XDG_DATA_HOME/vim/autoload/plug.vim --create-dirs
+if empty(glob('${VIMDOTDIR}/autoload/plug.vim'))
+  silent !curl -fLo ${VIMDOTDIR}/autoload/plug.vim --create-dirs
     \ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
-  autocmd VimEnter * PlugInstall --sync | source $MYVIMRC
+  autocmd VimEnter * PlugInstall --sync | source $VIMRC
 endif
 
 " Specify a directory for plugins
 " Install plugins
-call plug#begin('$XDG_DATA_HOME/vim/plugged')
+call plug#begin('$VIMDOTDIR/plugged')
 
 	Plug 'elzr/vim-json'
   Plug 'arcticicestudio/nord-vim'
diff --git a/.config/zsh/lib/30-misc.zsh b/.config/zsh/lib/30-misc.zsh
index 6ddecb7..6657176 100644
--- a/.config/zsh/lib/30-misc.zsh
+++ b/.config/zsh/lib/30-misc.zsh
@@ -18,4 +18,5 @@ NPM_PACKAGES="${HOME}/.npm-packages"
 export MANPATH="${MANPATH-$(manpath)}:$NPM_PACKAGES/share/man"
 
 ## Use vimrc fom XDG config home
-export VIMINIT='source "$XDG_CONFIG_HOME/vim/vimrc"'
\ No newline at end of file
+export VIMDOTDIR="$XDG_CONFIG_HOME/vim"
+export VIMINIT='let $VIMRC="$VIMDOTDIR/vimrc" | source $VIMRC'
\ No newline at end of file
diff --git a/.zshenv b/.zshenv
index b882983..8f58324 100644
--- a/.zshenv
+++ b/.zshenv
@@ -2,6 +2,8 @@
 
 # Set up XDG environment
 export XDG_CONFIG_HOME=${XDG_CONFIG_HOME:=${HOME}/.config}
+export XDG_CACHE_HOME=${XDG_CACHE_HOME:=${HOME}/.cache}
+export XDG_DATA_HOME=${XDG_DATA_HOME:=${HOME}/.local/share}
 
 # Where to look for zsh config
 export ZDOTDIR=${ZDOTDIR:=${XDG_CONFIG_HOME}/zsh}