zsh: add envoy and gpg

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 5e4a0b42f8051e78dbc507b2545d0a3916847d1f..c33c18c4cc8b1c2bd403605a6b167dc1f5e4a97b 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -3,11 +3,10 @@
 " Author:   Samir Benmendil <samir.benmendil[at]gmail[dot]com>
 "
 
-" use xdg
-set runtimepath=$XDG_CONFIG_HOME/vim,$VIMRUNTIME,$XDG_CONFIG_HOME/vim/after
-
 " bundles {{{1
 filetype off
+set runtimepath& " reset rtp
+
 set runtimepath+=$XDG_DATA_HOME/vim/vundle
 call vundle#rc('$XDG_DATA_HOME/vim')
 
@@ -35,6 +34,16 @@ Bundle 'ompugao/ctrlp-ros'
 Bundle 'derekwyatt/vim-fswitch'
 Bundle 'jalcine/cmake.vim'
 
+" rtp + xdg {{{1
+" remove entries first
+set runtimepath -=$HOME/.vim
+set runtimepath -=$HOME/.vim/after
+set runtimepath -=$XDG_CONFIG_HOME/vim
+set runtimepath -=$XDG_CONFIG_HOME/vim/after
+" then add prepend and append them
+set runtimepath ^=$XDG_CONFIG_HOME/vim
+set runtimepath +=$XDG_CONFIG_HOME/vim/after
+
 filetype plugin indent on
 
 " moving around, searching and patterns {{{1
@@ -94,10 +103,9 @@ endif
 
 
 " syntax, highlighting and spelling {{{1
-set background=dark             " Dark background, d'uh!
+colorscheme badwolf
 syntax on
 
-set spelllang=en_gb             " list of accepted languages
 set dictionary=spell            " list of dictionary files for keyword completion
 " Spell Check http://tex.stackexchange.com/a/52932
 let b:myLang=0
@@ -251,7 +259,7 @@ 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$XDG_CACHE_HOME/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 .cache
 
 set viewdir=$XDG_CACHE_HOME/vim