X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/7b722cd95717089ae9b86fea4825e181cdf0514d..002334e82dd966e686dd0c6a36f7bc447ab80d86:/vim/vimrc?ds=sidebyside

diff --git a/vim/vimrc b/vim/vimrc
index 788e3df..c33c18c 100644
--- 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')
 
@@ -27,7 +26,7 @@ Bundle 'tpope/vim-fugitive'
 Bundle 'tpope/vim-surround'
 Bundle 'tpope/vim-unimpaired'
 Bundle 'valloric/youcompleteme'
-Bundle 'zhaocai/goldenview.vim'
+"Bundle 'zhaocai/goldenview.vim'
 
 Bundle 'ompugao/ros.vim'
 Bundle 'ompugao/ctrlp-ros'
@@ -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
@@ -60,7 +69,7 @@ noremap <Left> <NOP>
 noremap <Right> <NOP>
 
 set nostartofline       " don't  move the cursor to the first non-blank char of a line
-set path=.,**           " current + subdirectory search for :find, :grep:, ...
+set path=.,include/,../include/,/usr/include/c++/*,/opt/ros/hydro/include
 
 " displaying text {{{1
 set scrolloff=5                 " number of screen lines to show around the cursor
@@ -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
@@ -138,6 +146,9 @@ set splitright                  " a new window is put right of the current one
 
 map <F1> :ls<CR>:b<space>
 
+nmap <C-L> <C-W>w
+nmap <C-H> <C-W>W
+
 " using the mouse {{{1
 set mouse=rnv                   " list of flags for using the mouse
 set ttymouse=xterm              " type of mouse
@@ -248,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
 
@@ -262,12 +273,12 @@ let g:airline_right_sep = '◀'
 let g:airline#extensions#tabline#enabled = 1
 
 " GoldenView {{{2
-let g:goldenview__enable_default_mapping = 0
-nmap <silent> <C-N>   <Plug>GoldenViewSplit
-nmap <silent> <C-L>   <Plug>GoldenViewNext
-nmap <silent> <C-H>   <Plug>GoldenViewPrevious
-nmap <silent> <C-M>   <Plug>GoldenViewSwitchMain
-nmap <silent> <C-S-M> <Plug>GoldenViewPrevious
+"let g:goldenview__enable_default_mapping = 0
+"nmap <silent> <C-N>   <Plug>GoldenViewSplit
+"nmap <silent> <C-L>   <Plug>GoldenViewNext
+"nmap <silent> <C-H>   <Plug>GoldenViewPrevious
+"nmap <silent> <C-M>   <Plug>GoldenViewSwitchMain
+"nmap <silent> <C-S-M> <Plug>GoldenViewPrevious
 
 " Gundo {{{2
 nnoremap <F7> :GundoToggle<CR>