X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/58d46aa2146196e37a219175ae5710588d2bb6b2..a6ea1a1fa2e612852376b6deab07cb2388608fc8:/vim/vimrc diff --git a/vim/vimrc b/vim/vimrc index 1d92925..2fe6f59 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,8 +29,11 @@ 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 'sgeb/vim-diff-fold' Plugin 'shougo/unite.vim' Plugin 'shougo/vimproc.vim' Plugin 'sjl/gundo.vim' @@ -60,19 +64,15 @@ 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' -Plugin 'ram-z/vim-clang-format' " needs editing colorscheme " Plugin 'jeaye/color_coded' " Check LucHermites plugins: https://github.com/LucHermitte/lh-cpp +Plugin 'wincent/loupe' call vundle#end() @@ -157,10 +157,18 @@ set mouse=rnv " list of flags for using the mouse set ttymouse=xterm " type of mouse " messages and info {{{2 -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 +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= " reset option +set shortmess+=a " all abbreviations +set shortmess+=o " overwrite file-written message +set shortmess+=O " file-read message overrides previous +set shortmess+=t " truncate file message at start +set shortmess+=T " truncate other messages in the middle +set shortmess+=W " don't give 'written' or '[w]' when writing a file +set shortmess+=A " ignore swapfile warning +set shortmess+=I " no splash screen " editing text {{{2 set backspace=indent,eol,start " allow backspacing over everything in insert mode @@ -207,8 +215,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 @@ -436,9 +444,9 @@ nnoremap zx zMzxzt map :ls:b -" move between windows -nnoremap w -nnoremap W +" move between windows (skip previewwindow) +nnoremap w:if &previewwindow \| wincmd w \| endif +nnoremap W:if &previewwindow \| wincmd W \| endif "xterm mouse with middleclick paste nnoremap i @@ -467,7 +475,7 @@ nnoremap [oe :set expandtab nnoremap ]oe :set noexpandtab for idt in range(1,8) - exe 'nnoremap co'.idt.' :set tabstop='.idt.' shiftwidth='.idt.' softtabstop='.idt.'' + exe 'nnoremap co'.idt.' :setlocal tabstop='.idt.' shiftwidth='.idt.' softtabstop='.idt.'' endfor " toggle auto format of text @@ -480,11 +488,8 @@ nnoremap za " create folds around visual selection vnoremap 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 gUiwgi @@ -648,16 +653,17 @@ let g:unite_source_grep_max_candidates = 2000 if executable('ag') " Use ag in unite grep source. let g:unite_source_grep_command = 'ag' - let g:unite_source_grep_default_opts = '--smart-case --vimgrep --hidden --ignore ''.hg'' --ignore ''.svn'' --ignore ''.git'' --ignore ''.bzr''' + let g:unite_source_grep_default_opts = '--smart-case --vimgrep --ignore ''.hg'' --ignore ''.svn'' --ignore ''.git'' --ignore ''.bzr''' let g:unite_source_grep_recursive_opt = '' end nnoremap [unite]a :Unite grep:.:: +nnoremap [unite]A :Unite grep:.:-w: command! -nargs=1 Ag Unite grep:.:: " unite-file_rec {{{3 if executable('ag') " Use ag in unite rec source - let g:unite_source_rec_async_command = 'ag --follow --nocolor --nogroup --hidden -g ""' + let g:unite_source_rec_async_command = ['ag', '--follow', '--nocolor', '--nogroup', '-g', ''] end nnoremap [unite]f :Unite -start-insert file_rec/async call unite#custom#source('file_rec/async', 'sorters', 'sorter_selecta') @@ -699,13 +705,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 (EasyAlign) nmap ga (EasyAlign) +" vim-gtest {{{2 +let g:gtest#highlight_failing_tests = 0 + +nnoremap tt :GTestRun +nnoremap tu :GTestRunUnderCursor + " vim-json {{{2 let g:vim_json_syntax_conceal = 0 @@ -733,6 +744,15 @@ xmap T Sneak_T omap t Sneak_t omap T Sneak_T +" vimviki {{{2 +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 -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 "";git commit -qm"' . strftime("%FT%R") . '";git push -q' +augroup END + " functions {{{1 " Convenient command to see the difference between the current buffer and the @@ -820,8 +840,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: