X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/01019dc20b7a06008c88bdbc05ad24cdb8ea7699..3418483496608f0eb40ecd49842aa5f020429ef0:/vim/vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 6648b7d..1a4f288 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -16,6 +16,7 @@ Plugin 'gmarik/vundle'
 
 Plugin 'AndrewRadev/switch.vim'
 Plugin 'airblade/vim-gitgutter'
+Plugin 'alepez/vim-gtest'
 Plugin 'bling/vim-airline'
 Plugin 'chrisbra/checkattach'
 Plugin 'derekwyatt/vim-fswitch'
@@ -28,11 +29,14 @@ Plugin 'kshenoy/vim-signature'
 Plugin 'majutsushi/tagbar'
 Plugin 'octol/vim-cpp-enhanced-highlight'
 Plugin 'raimondi/delimitmate'
-Plugin 'rdnetto/ycm-generator'
+Plugin 'ram-z/vim-clang-format'
+Plugin 'ram-z/vimwiki'
 Plugin 'scrooloose/syntastic'
+Plugin 'sgeb/vim-diff-fold'
 Plugin 'shougo/unite.vim'
 Plugin 'shougo/vimproc.vim'
 Plugin 'sjl/gundo.vim'
+Plugin 'thinca/vim-qfreplace'
 Plugin 'tomtom/tcomment_vim'
 Plugin 'tpope/vim-abolish'
 Plugin 'tpope/vim-endwise'
@@ -60,20 +64,14 @@ Plugin 'julian/vim-textobj-variable-segment'
 Plugin 'sgur/vim-textobj-parameter'
 Plugin 'kana/vim-operator-user'
 
-" ros
-Plugin 'ompugao/ros.vim'
-Plugin 'ompugao/ctrlp-ros'
-
 " staging
 " find an alternative (latex-box? Automatic Latex Plugin?)
 Plugin 'vim-latex/vim-latex'
 Plugin 'alx741/vinfo'
-Plugin 'derekwyatt/vim-protodef'
 " needs editing colorscheme
 " Plugin 'jeaye/color_coded'
 " Check LucHermites plugins: https://github.com/LucHermitte/lh-cpp
 Plugin 'wincent/loupe'
-Plugin 'Ram-Z/vimwiki'
 
 call vundle#end()
 
@@ -216,8 +214,8 @@ set foldlevelstart=0            " value for 'foldlevel' when starting to edit a
 " open folds when jumping to line
 set foldopen+=jump
 
-" save and restore folds
-set viewoptions=cursor          " only save cursor position
+set viewoptions=cursor          " save cursor position
+set viewoptions+=folds          " save folds
 
 " diff mode {{{2
 set diffopt+=filler         " show filler lines
@@ -476,7 +474,7 @@ nnoremap [oe :set expandtab<CR>
 nnoremap ]oe :set noexpandtab<CR>
 
 for idt in range(1,8)
-  exe 'nnoremap co'.idt.' :set tabstop='.idt.' shiftwidth='.idt.' softtabstop='.idt.'<CR>'
+  exe 'nnoremap co'.idt.' :setlocal tabstop='.idt.' shiftwidth='.idt.' softtabstop='.idt.'<CR>'
 endfor
 
 " toggle auto format of text
@@ -489,11 +487,8 @@ nnoremap <leader><Space> za
 " create folds around visual selection
 vnoremap <leader><Space> zf
 
-autocmd BufWinLeave *.* mkview
-autocmd BufWinEnter *.* silent loadview
-
 " save with sudo
-cabbrev w!! w !sudo tee % > /dev/null
+cabbrev w!! SudoWrite
 
 " uppercase previous word
 inoremap <C-C> <Esc>gUiwgi
@@ -606,7 +601,8 @@ let g:tagbar_width = 25
 let g:tagbar_iconchars = ['+', '-']
 
 " tcomments {{{2
-let g:tcommentTextObjectInlineComment = 'gic'
+let g:tcomment_textobject_inlinecomment = 'gic'
+let g:tcomment#filetype#guess = 0
 
 " ultisnips {{{2
 let g:UltiSnipsEditSplit = 'vertical'
@@ -650,6 +646,8 @@ call unite#custom#profile('default', 'context', {
 nnoremap [unite] <Nop>
 nmap <leader>u [unite]
 nnoremap [unite]u :UniteResume<CR>
+nnoremap <silent> [u :UnitePrevious<CR>
+nnoremap <silent> ]u :UniteNext<CR>
 
 " unite-grep {{{3
 " seems not respected
@@ -661,6 +659,7 @@ if executable('ag')
     let g:unite_source_grep_recursive_opt = ''
 end
 nnoremap <silent> [unite]a :<C-u>Unite grep:.::<CR>
+nnoremap <silent> [unite]A :<C-u>Unite grep:.:-w:<CR>
 command! -nargs=1 Ag Unite grep:.::<args>
 
 " unite-file_rec {{{3
@@ -708,13 +707,19 @@ let g:ycm_add_preview_to_completeopt = 1
 let g:ycm_complete_in_comments = 1
 let g:ycm_complete_in_strings  = 1
 let g:ycm_autoclose_preview_window_after_insertion = 0
-"let g:ycm_extra_conf_vim_data = ['%:p']
 
 " vim-easy-align {{{2
 " start interactive EasyAlign in visual mode
 vmap <Enter> <Plug>(EasyAlign)
 nmap ga <Plug>(EasyAlign)
 
+" vim-gtest {{{2
+let g:gtest#highlight_failing_tests = 0
+
+nnoremap <Leader>tt :GTestRun<CR>
+nnoremap <Leader>ta :GTestCase *<CR>:GTestName *<CR>:GTestRun<CR>
+nnoremap <Leader>tu :GTestRunUnderCursor<CR>
+
 " vim-json {{{2
 let g:vim_json_syntax_conceal = 0
 
@@ -746,9 +751,9 @@ omap T <Plug>Sneak_T
 let g:vimwiki_list = [{'path': '$XDG_DATA_HOME/vimwiki'}]
 let g:vimwiki_auto_chdir = 1
 augroup myvimwiki
-  au! BufRead            $XDG_DATA_HOME/vimwiki/index.wiki   !git pull
-  au! BufRead,BufNewFile $XDG_DATA_HOME/vimwiki/diary/*.wiki !git pull
-  au! BufWritePost       $XDG_DATA_HOME/vimwiki/*.wiki       exe  '!git add "<afile>";git commit -m"' . strftime("%FT%R") . '";git push'
+  au! BufRead            $XDG_DATA_HOME/vimwiki/index.wiki   !git -C "%:p:h" pull -q
+  au! BufRead,BufNewFile $XDG_DATA_HOME/vimwiki/diary/*.wiki !git -C "%:p:h" pull -q
+  au! BufWritePost       $XDG_DATA_HOME/vimwiki/*.wiki       exe '!git add "<afile>";git commit -qm"' . strftime("%FT%R") . '";git push -q'
 augroup END
 
 " functions {{{1
@@ -838,8 +843,8 @@ function! FindGitDirOrHome()
   endif
 endfunction
 command! Cd cd %:h
-command! Cr execute('cd ' . FindGitDirOrHome())
+command! Cdr execute('cd ' . FindGitDirOrHome())
 command! LCd lcd %:h
-command! LCr execute('lcd ' . FindGitDirOrHome())
+command! LCdr execute('lcd ' . FindGitDirOrHome())
 
 " vim:set et sw=2 ts=2 tw=78: