From d2feaecae1a3051ca340c2a60721c22b9a262875 Mon Sep 17 00:00:00 2001
From: Christian Baer <chris@debilux.org>
Date: Sun, 11 Oct 2020 20:19:58 +0200
Subject: [PATCH] Move vom config to ~/.config

---
 .../vim/autoload}/.gitignore                   |  0
 {.vim/colors => .config/vim/backup}/.gitignore |  0
 .../plugged => .config/vim/colors}/.gitignore  |  0
 {.vim/undo => .config/vim/plugged}/.gitignore  |  0
 .config/vim/swap/.gitignore                    |  0
 .config/vim/undo/.gitignore                    |  0
 .vimrc => .config/vim/vimrc                    | 18 +++++++++++-------
 .config/zsh/lib/30-misc.zsh                    |  3 +++
 8 files changed, 14 insertions(+), 7 deletions(-)
 rename {.vim/backups => .config/vim/autoload}/.gitignore (100%)
 rename {.vim/colors => .config/vim/backup}/.gitignore (100%)
 rename {.vim/plugged => .config/vim/colors}/.gitignore (100%)
 rename {.vim/undo => .config/vim/plugged}/.gitignore (100%)
 create mode 100644 .config/vim/swap/.gitignore
 create mode 100644 .config/vim/undo/.gitignore
 rename .vimrc => .config/vim/vimrc (87%)

diff --git a/.vim/backups/.gitignore b/.config/vim/autoload/.gitignore
similarity index 100%
rename from .vim/backups/.gitignore
rename to .config/vim/autoload/.gitignore
diff --git a/.vim/colors/.gitignore b/.config/vim/backup/.gitignore
similarity index 100%
rename from .vim/colors/.gitignore
rename to .config/vim/backup/.gitignore
diff --git a/.vim/plugged/.gitignore b/.config/vim/colors/.gitignore
similarity index 100%
rename from .vim/plugged/.gitignore
rename to .config/vim/colors/.gitignore
diff --git a/.vim/undo/.gitignore b/.config/vim/plugged/.gitignore
similarity index 100%
rename from .vim/undo/.gitignore
rename to .config/vim/plugged/.gitignore
diff --git a/.config/vim/swap/.gitignore b/.config/vim/swap/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/.config/vim/undo/.gitignore b/.config/vim/undo/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/.vimrc b/.config/vim/vimrc
similarity index 87%
rename from .vimrc
rename to .config/vim/vimrc
index 4dc9503..cf1b50f 100644
--- a/.vimrc
+++ b/.config/vim/vimrc
@@ -1,13 +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 runtimepath=$XDG_CONFIG_HOME/vim,$VIMRUNTIME,$XDG_CONFIG_HOME/vim/after
+
+
 " Install vim-plug
-if empty(glob('~/.vim/autoload/plug.vim'))
-  silent !curl -fLo ~/.vim/autoload/plug.vim --create-dirs
+if empty(glob('$XDG_DATA_HOME/vim/autoload/plug.vim'))
+  silent !curl -fLo $XDG_DATA_HOME/vim/autoload/plug.vim --create-dirs
     \ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
   autocmd VimEnter * PlugInstall --sync | source $MYVIMRC
 endif
 
 " Specify a directory for plugins
 " Install plugins
-call plug#begin('~/.vim/plugged')
+call plug#begin('$XDG_DATA_HOME/vim/plugged')
 
 	Plug 'elzr/vim-json'
   Plug 'arcticicestudio/nord-vim'
@@ -65,10 +73,6 @@ command! TrimWhitespace call s:trim_whitespace()
 " Highlight characters behind the 80 chars margin
 " :au BufWinEnter * let w:m2=matchadd('ColumnMargin', '\%>80v.\+', -1)
 
-" Directories for swp files
-set backupdir=~/.vim/backups
-set directory=~/.vim/backups
-
 " Treat all .md files as markdown
 autocmd BufNewFile,BufRead *.md set filetype=markdown
 
diff --git a/.config/zsh/lib/30-misc.zsh b/.config/zsh/lib/30-misc.zsh
index 14b9014..6ddecb7 100644
--- a/.config/zsh/lib/30-misc.zsh
+++ b/.config/zsh/lib/30-misc.zsh
@@ -16,3 +16,6 @@ export IOCAGE_COLOR=TRUE
 ## npm config
 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