zsh: add envoy and gpg

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 74889e23fd98b7cf5c503f62aec4a7ab304f3ced..c33c18c4cc8b1c2bd403605a6b167dc1f5e4a97b 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -3,11 +3,10 @@
 " Author:   Samir Benmendil <samir.benmendil[at]gmail[dot]com>
 "
 
 " 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
 " bundles {{{1
 filetype off

+set runtimepath& " reset rtp
+

 set runtimepath+=$XDG_DATA_HOME/vim/vundle
 call vundle#rc('$XDG_DATA_HOME/vim')
 
 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 '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'
 
 Bundle 'ompugao/ros.vim'
 Bundle 'ompugao/ctrlp-ros'


@@ -35,6 +34,16 @@ Bundle 'ompugao/ctrlp-ros'
 Bundle 'derekwyatt/vim-fswitch'
 Bundle 'jalcine/cmake.vim'
 
 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
 filetype plugin indent on
 
 " moving around, searching and patterns {{{1


@@ -60,11 +69,11 @@ noremap <Left> <NOP>
 noremap <Right> <NOP>
 
 set nostartofline       " don't  move the cursor to the first non-blank char of a line
 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
 
 " displaying text {{{1
 set scrolloff=5                 " number of screen lines to show around the cursor

-set wrap                        " long lines wrap
+set nowrap                      " long lines wrap

 set linebreak                   " wrap long lines at a character in 'breakat'
 set showbreak=▒▒                " show these chars for wrapped lines
 
 set linebreak                   " wrap long lines at a character in 'breakat'
 set showbreak=▒▒                " show these chars for wrapped lines
 


@@ -94,10 +103,9 @@ endif
 
 
 " syntax, highlighting and spelling {{{1
 
 
 " syntax, highlighting and spelling {{{1

-set background=dark             " Dark background, d'uh!
+colorscheme badwolf

 syntax on
 
 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
 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>
 
 
 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
 " using the mouse {{{1
 set mouse=rnv                   " list of flags for using the mouse
 set ttymouse=xterm              " type of mouse


@@ -150,6 +161,7 @@ vnoremap <MiddleMouse> s<MiddleMouse>
 set showcmd                     " Show (partial) command in status line.
 set ruler                       " show the cursor position all the time
 set confirm                     " Ask what to do when closing unsaved documents
 set showcmd                     " Show (partial) command in status line.
 set ruler                       " show the cursor position all the time
 set confirm                     " Ask what to do when closing unsaved documents

+set shortmess=filnxtoOI         " don't show intro message

 
 " editing text {{{1
 set backspace=indent,eol,start  " allow backspacing over everything in insert mode
 
 " editing text {{{1
 set backspace=indent,eol,start  " allow backspacing over everything in insert mode


@@ -247,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
 
 " 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
 
 
 set viewdir=$XDG_CACHE_HOME/vim
 


@@ -261,17 +273,19 @@ let g:airline_right_sep = '◀'
 let g:airline#extensions#tabline#enabled = 1
 
 " GoldenView {{{2
 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>
 " fugitive {{{2
 nmap <silent> <leader>dd :tab split \| Gdiff \| wincmd h<CR>
 
 " Gundo {{{2
 nnoremap <F7> :GundoToggle<CR>
 " fugitive {{{2
 nmap <silent> <leader>dd :tab split \| Gdiff \| wincmd h<CR>

+" delete fugitive buffers when closed
+autocmd BufReadPost fugitive://* set bufhidden=delete

 
 " NERDTree {{{2
 " open/close NERDTree with \e
 
 " NERDTree {{{2
 " open/close NERDTree with \e


@@ -304,7 +318,7 @@ let g:tagbar_width = 25
 let g:tagbar_iconchars = ['+', '-']
 
 " YouCompleteMe {{{2
 let g:tagbar_iconchars = ['+', '-']
 
 " YouCompleteMe {{{2

-let g:ycm_extra_conf_globlist = ['/mnt/data/src/*']
+let g:ycm_extra_conf_globlist = ['~/src/*']

 
 " vim-json {{{2
 let g:vim_json_syntax_conceal = 0
 
 " vim-json {{{2
 let g:vim_json_syntax_conceal = 0


@@ -314,6 +328,10 @@ let g:tex_flavor='latex'
 let g:Tex_DefaultTargetFormat='pdf'
 
 " functions {{{1
 let g:Tex_DefaultTargetFormat='pdf'
 
 " functions {{{1

+" auto source vimrc when saved
+autocmd bufwritepost vimrc source $MYVIMRC
+nmap <leader>v :tabedit $MYVIMRC<CR>
+

 " Convenient command to see the difference between the current buffer and the
 " file it was loaded from, thus the changes you made.
 " Only define it when not defined already.
 " Convenient command to see the difference between the current buffer and the
 " file it was loaded from, thus the changes you made.
 " Only define it when not defined already.