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

diff --git a/vim/vimrc b/vim/vimrc
index 6648b7d..8d4ba47 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,6 +29,8 @@ Plugin 'kshenoy/vim-signature'
 Plugin 'majutsushi/tagbar'
 Plugin 'octol/vim-cpp-enhanced-highlight'
 Plugin 'raimondi/delimitmate'
+Plugin 'ram-z/vim-clang-format'
+Plugin 'ram-z/vimwiki'
 Plugin 'rdnetto/ycm-generator'
 Plugin 'scrooloose/syntastic'
 Plugin 'shougo/unite.vim'
@@ -69,11 +72,11 @@ Plugin 'ompugao/ctrlp-ros'
 Plugin 'vim-latex/vim-latex'
 Plugin 'alx741/vinfo'
 Plugin 'derekwyatt/vim-protodef'
+Plugin 'sgeb/vim-diff-fold'
 " 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 +219,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 +479,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,9 +492,6 @@ 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
 
@@ -708,13 +708,18 @@ 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>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