vim: use XDG specification

inspired from: http://tlvince.com/vim-respect-xdg

diff --git a/Makefile b/Makefile
index b9ac20f84a857a3f310989104a9bf7b24a2ffe60..858dc0d774b201a15a36e833191f4ce8e0e15d17 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 APATH := $(realpath .)
 
 FILES := bin
-DOTFILES := aliases bash* conky* flexget git* goobookrc msmtp* mutt ncmpcpp offlineimap* profile vim* weechat xbindkeysrc Xresources xprofile zprofile zshrc
-CONFIGFILES := compton.conf git mimeo.conf mpd retroarch xkb zsh
+DOTFILES := aliases bash* conky* flexget git* goobookrc msmtp* mutt ncmpcpp offlineimap* profile weechat xbindkeysrc Xresources xprofile zprofile zshrc
+CONFIGFILES := compton.conf git mimeo.conf mpd retroarch vim xkb zsh
 
 .PHONY: install $(FILES) $(DOTFILES) $(CONFIGFILES)
 install: $(FILES) $(DOTFILES) $(CONFIGFILES)

diff --git a/vim/.gitignore b/vim/.gitignore
index 2e92be5c20850962e94cca3a9f2428c960b86246..a0e76af9bc588fa2d49b6e518db5e1fa1a1e6dfc 100644 (file)
--- a/vim/.gitignore
+++ b/vim/.gitignore
@@ -1,3 +1 @@
 .netrwhist
-view
-viminfo

diff --git a/vim/backupdir/.gitignore b/vim/backupdir/.gitignore
deleted file mode 100644 (file)
index d6b7ef3..0000000
--- a/vim/backupdir/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore

diff --git a/vim/bundle/.gitignore b/vim/bundle/.gitignore
deleted file mode 100644 (file)
index 72e8ffc..0000000
--- a/vim/bundle/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*

diff --git a/vimrc b/vim/vimrc
similarity index 95%
rename from vimrc
rename to vim/vimrc
index db95efec73ff7dbc17d9c6dc91e1ea23eafffe45..c52eb6bd6d768ac01e8ec8839e15b38e602badfb 100644 (file)
--- a/vimrc
+++ b/vim/vimrc
@@ -3,9 +3,12 @@
 " Author:   Samir Benmendil <samir.benmendil[at]gmail[dot]com>
 "
 
+" use xdg
+set runtimepath=$XDG_CONFIG_HOME/vim,$VIMRUNTIME,$XDG_CONFIG_HOME/vim/after
+
 filetype off
-set rtp+=~/.vim/bundle/vundle/
-call vundle#rc()
+set rtp+=$XDG_DATA_HOME/vim/vundle
+call vundle#rc('$XDG_DATA_HOME/vim')
 
 Bundle 'gmarik/vundle'
 Bundle 'wincent/Command-T'
@@ -195,16 +198,19 @@ autocmd BufWinEnter *.* silent loadview
 " reading and writing files {{{1
 set writebackup                 " write a backup file before overwriting a file
 set backup                      " keep a backup after owerwriting a file
-set backupdir=$HOME/.vim/backupdir
+set backupdir=$XDG_CACHE_HOME/vim
 
 set undofile                    " persistent undo history
-set undodir=$HOME/.vim/backupdir
+set undodir=$XDG_CACHE_HOME/vim
 
 set autowrite                   " automatically write a file when leaving a modified buffer
 
 " save with sudo
 cmap w!! w !sudo tee % > /dev/null
 
+" the swap file {{{1
+set directory=$XDG_CACHE_HOME/vim,.,/var/tmp
+
 " command line editing {{{1
 set history=500                 " how many command lines are remembered
 set wildmode=longest:full       " specifies how command line completion works
@@ -212,7 +218,9 @@ set wildmenu                    " command-line completion shows a list of matche
 
 " various {{{1
 set virtualedit=block           " let cursor move past last char in <C-V> mode
-set viminfo='100,<50,s10,h,n~/.vim/viminfo " viminfo defaults but save file in .vim
+set viminfo='100,<50,s10,h,n$XDG_CACHE_HOME/vim/viminfo " viminfo defaults but save file in .vim
+
+set viewdir=$XDG_CACHE_HOME/vim
 
 " plugins {{{1
 " airline {{{2

diff --git a/zshrc b/zshrc
index 7ad8443cfc8191eb977a4336e035d76e74709e6d..2e6048a159e5b72707943443366467eb524e8349 100644 (file)
--- a/zshrc
+++ b/zshrc
@@ -44,8 +44,12 @@ for alias_file ($ZSH/aliases/*.zsh); do
 done
 
 # vim stuff
+[[ -d "$XDG_CACHE_HOME/vim" ]] || mkdir -p "$XDG_CACHE_HOME/vim"
+export VIMINIT='let $MYVIMRC="$XDG_CONFIG_HOME/vim/vimrc" | source $MYVIMRC'
 export EDITOR=vim
 export VISUAL=vim
+
+# default browser
 export BROWSER=dwb
 
 # set up a few named directories