mutt: update gitlab emails to avoid signing MR replies

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index fd2e8f9d01096a31ddfb9e58c951e148e910cd4e..6bd7ead92d7325f060dc77b0fec6b81ae579d4ad 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -31,11 +31,13 @@ Plug 'majutsushi/tagbar'
 Plug 'octol/vim-cpp-enhanced-highlight'
 Plug 'raimondi/delimitmate'
 Plug 'ram-z/vim-clang-format', { 'branch': 'fix-undo' }
 Plug 'octol/vim-cpp-enhanced-highlight'
 Plug 'raimondi/delimitmate'
 Plug 'ram-z/vim-clang-format', { 'branch': 'fix-undo' }

-Plug 'ram-z/vimwiki', { 'branch': 'no_override_map' }
+" fix some issue with vim-clang-format not finding .clang-format
+let g:clang_format#detect_style_file = 1
+Plug 'vimwiki/vimwiki', { 'branch': 'dev' }

 Plug 'scrooloose/syntastic'
 Plug 'sgeb/vim-diff-fold'
 Plug 'shougo/unite.vim'
 Plug 'scrooloose/syntastic'
 Plug 'sgeb/vim-diff-fold'
 Plug 'shougo/unite.vim'

-Plug 'shougo/vimproc.vim'
+Plug 'shougo/vimproc.vim', {'do': 'make'}

 Plug 'sjl/gundo.vim'
 Plug 'thinca/vim-qfreplace'
 Plug 'tomtom/tcomment_vim'
 Plug 'sjl/gundo.vim'
 Plug 'thinca/vim-qfreplace'
 Plug 'tomtom/tcomment_vim'


@@ -53,7 +55,7 @@ Plug 'vim-scripts/replacewithregister'
 Plug 'vim-scripts/yankring.vim'
 
 " colorschemes
 Plug 'vim-scripts/yankring.vim'
 
 " colorschemes

-Plug 'flazz/vim-colorschemes'
+Plug 'morhetz/gruvbox'

 
 " snippets
 Plug 'sirver/ultisnips'
 
 " snippets
 Plug 'sirver/ultisnips'


@@ -112,7 +114,7 @@ set list                        " show chars defined in 'listchars'
 set listchars=tab:❭\            " list of strings used for list mode
 set listchars+=extends:❯,precedes:❮
 " Only shown when not in insert mode
 set listchars=tab:❭\            " list of strings used for list mode
 set listchars+=extends:❯,precedes:❮
 " Only shown when not in insert mode

-au InsertLeave * :set listchars+=trail:·
+set listchars+=trail:·

 augroup trailing
     au!
     au InsertEnter * :set listchars-=trail:·
 augroup trailing
     au!
     au InsertEnter * :set listchars-=trail:·


@@ -536,6 +538,11 @@ nnoremap <silent> <leader>gc :Gcommit -v<CR>
 nnoremap <silent> <leader>ga :Gwrite<cr>
 nnoremap <silent> <leader>gb :Gblame<cr>
 
 nnoremap <silent> <leader>ga :Gwrite<cr>
 nnoremap <silent> <leader>gb :Gblame<cr>
 

+augroup fugitive_gstatus
+    au!
+    autocmd BufWinEnter */.git/index resize 16
+augroup end
+

 " Gundo {{{2
 nnoremap <F7> :GundoToggle<CR>
 
 " Gundo {{{2
 nnoremap <F7> :GundoToggle<CR>
 


@@ -592,6 +599,8 @@ let g:syntastic_style_warning_symbol='S'
 let g:syntastic_always_populate_loc_list=1
 nmap <silent> <leader>y :SyntasticCheck<cr>
 
 let g:syntastic_always_populate_loc_list=1
 nmap <silent> <leader>y :SyntasticCheck<cr>
 

+let g:syntastic_cpp_clang_tidy_post_args = "-p build*"
+

 if ! &diff
   let g:syntastic_check_on_open=1
 endif
 if ! &diff
   let g:syntastic_check_on_open=1
 endif