X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/b59e03e7dfdb3f217e08585a87a1eae35fc74208..b51f3563d6cb0010825b2d2b9fe01e687f54345a:/vim/vimrc diff --git a/vim/vimrc b/vim/vimrc index 0651305..8d4ba47 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -10,36 +10,49 @@ set runtimepath& " reset rtp autocmd! set runtimepath+=$XDG_DATA_HOME/vim/vundle -call vundle#rc('$XDG_DATA_HOME/vim') +call vundle#begin('$XDG_DATA_HOME/vim') 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' Plugin 'elzr/vim-json' Plugin 'firef0x/pkgbuild.vim' Plugin 'junegunn/vim-easy-align' -" Plugin 'kien/ctrlp.vim' -" Plugin 'klen/python-mode' -Plugin 'wilywampa/python-mode' +Plugin 'justinmk/vim-sneak' +Plugin 'klen/python-mode' Plugin 'kshenoy/vim-signature' Plugin 'majutsushi/tagbar' +Plugin 'octol/vim-cpp-enhanced-highlight' Plugin 'raimondi/delimitmate' -" Plugin 'rking/ag.vim' +Plugin 'ram-z/vim-clang-format' +Plugin 'ram-z/vimwiki' +Plugin 'rdnetto/ycm-generator' Plugin 'scrooloose/syntastic' -Plugin 'shougo/vimproc.vim' Plugin 'shougo/unite.vim' +Plugin 'shougo/vimproc.vim' Plugin 'sjl/gundo.vim' Plugin 'tomtom/tcomment_vim' +Plugin 'tpope/vim-abolish' Plugin 'tpope/vim-endwise' +Plugin 'tpope/vim-eunuch' Plugin 'tpope/vim-fugitive' Plugin 'tpope/vim-repeat' -Plugin 'tpope/vim-surround' +Plugin 'tpope/vim-surround' "investigate vim-sandwich Plugin 'tpope/vim-unimpaired' +Plugin 'tweekmonster/spellrotate.vim' Plugin 'valloric/youcompleteme' +Plugin 'vim-scripts/mediawiki.vim' +Plugin 'vim-scripts/replacewithregister' Plugin 'vim-scripts/yankring.vim' +" colorschemes +Plugin 'flazz/vim-colorschemes' + " snippets Plugin 'sirver/ultisnips' Plugin 'honza/vim-snippets' @@ -48,28 +61,24 @@ Plugin 'honza/vim-snippets' Plugin 'kana/vim-textobj-user' 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' -" seems to have problems right now... may be add later? -" Plugin 'jalcine/cmake.vim' -" Plugin 'powerman/vim-plugin-viewdoc' - " staging " find an alternative (latex-box? Automatic Latex Plugin?) -Plugin 'http://git.code.sf.net/p/vim-latex/vim-latex' -" Plugin 'lokaltog/vim-easymotion' -Plugin 'justinmk/vim-sneak' -Plugin 'chrisbra/checkattach' -Plugin 'nathanaelkane/vim-indent-guides' +Plugin 'vim-latex/vim-latex' Plugin 'alx741/vinfo' -Plugin 'octol/vim-cpp-enhanced-highlight' -Plugin 'vim-scripts/mediawiki.vim' -Plugin 'vim-scripts/replacewithregister' -Plugin 'tpope/vim-abolish' 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' + +call vundle#end() " remove entries first set runtimepath -=$HOME/.vim @@ -84,12 +93,9 @@ filetype plugin indent on " colorscheme {{{1 syntax on -colorscheme badwolf +colorscheme badfox " options {{{1 -" put $ and the end of text to be replaced with 'cw' and the likes -set cpoptions+=$ - " moving around, searching and patterns {{{2 set incsearch " show match for partly typed search command set ignorecase " ignore case when using a search pattern @@ -155,10 +161,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 @@ -205,13 +219,12 @@ 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 set diffopt+=vertical " always vertical split -set diffopt+=iwhite " ignore white space set diffopt+=context:10 " 10 lines context between changes " reading and writing files {{{2 @@ -246,6 +259,7 @@ set directory=$XDG_CACHE_HOME/vim/swap// set history=5000 " how many command lines are remembered set wildmenu " command-line completion shows a list of matches set wildmode=longest:full,full " specifies how command line completion works +set wildignorecase " ignore case when completing file names set wildignore+=.hg,.git,.svn " Version control set wildignore+=*.aux,*.out,*.toc " LaTeX intermediate files @@ -257,11 +271,17 @@ set wildignore+=*.luac " Lua byte code set wildignore+=*.pyc " Python byte code set wildignore+=*.orig " Merge resolution files +" running make and jumping to errors {{{2 +set makeprg=make\ -w " print changing directories + +set grepprg=ag\ --vimgrep\ $* + " language specific {{{2 set isfname-== " don't treat `=` as being part of filenames " various {{{2 -set virtualedit=all " let cursor move past last char in mode +set virtualedit+=block " let cursor move past last char in mode +set virtualedit+=onemore " allow the cursor to move just past the end of the line 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/view// @@ -299,14 +319,32 @@ augroup cursor_pos \ endif augroup END +" Check for file modifications automatically {{{2 +" (current buffer only) +" Use :NoAutoChecktime to disable it (uses b:autochecktime) +fun! MyAutoCheckTime() + " only check timestamp for normal files + if &buftype != '' | return | endif + if ! exists('b:autochecktime') || b:autochecktime + checktime % + let b:autochecktime = 1 + endif +endfun +augroup MyAutoChecktime + au! + au FocusGained,BufEnter,CursorHold,InsertEnter * call MyAutoCheckTime() +augroup END +command! NoAutoChecktime let b:autochecktime=0 +command! ToggleAutoChecktime let b:autochecktime=!get(b:, 'autochecktime', 0) | echom "b:autochecktime:" b:autochecktime + " bindings {{{1 -" allow both and / to be +" allow both and \ to be map " make -nnoremap r :make -nnoremap :make +nnoremap r :make! +nnoremap :make! " unhighlight search nnoremap / :silent nohl @@ -320,8 +358,21 @@ nnoremap p* :silent! set paste"*p:set nopaste " paste from clipboard nnoremap p+ :silent! set paste"+p:set nopaste -" Clean trailing whitespace -nnoremap ww m':%s/\s\+$//:let @/=''``zz +" strip trailing whitespace +function! StripWhitespace(line1, line2, ...) " {{{2 + let s_report = &report + let &report=0 + let pattern = a:0 ? a:1 : '\s\+$' + let oldview = winsaveview() + exe 'keepjumps keeppatterns '.a:line1.','.a:line2.'substitute/'.pattern.'//e' + if oldview != winsaveview() + redraw + endif + call winrestview(oldview) + let &report = s_report +endfunction " }}}2 +command! -range=% -nargs=0 -bar Untrail keepjumps call StripWhitespace(,) +nnoremap ww :Untrail " Source vnoremap S y:execute @@:echo 'Sourced selection.' @@ -397,15 +448,18 @@ nnoremap zx zMzxzt map :ls:b -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 vnoremap s " fix legacy vi inconsistency -map Y y$ +nnoremap Y y$ +" copy to clipboard +xnoremap Y "+y " allow repeat operator on visual vnoremap . :normal . @@ -425,17 +479,19 @@ 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 +nnoremap coa :set =&formatoptions =~ "a" ? 'formatoptions-=a' : 'formatoptions+=a' +nnoremap [oa :set formatoptions+=a +nnoremap ]oa :set formatoptions-=a + " space will toggle current fold in normal mode 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 @@ -445,10 +501,6 @@ inoremap gUiwgi " http://git.io/v3ZeU nmap qq :echo "hi<" . synIDattr(synID(line("."),col("."),1),"name") . '> trans<' . synIDattr(synID(line("."),col("."),0),"name") . "> lo<" . synIDattr(synIDtrans(synID(line("."),col("."),1)),"name") . ">" -" commands {{{1 -command! Cd lcd %:h -command! Cr execute('lcd ' . FindGitDirOrHome()) - " plugins options {{{1 " airline {{{2 let g:airline#extensions#whitespace#enabled = 1 @@ -495,14 +547,43 @@ nmap cog IndentGuidesToggle nmap [og IndentGuidesEnable nmap ]og IndentGuidesDisable +" close-another-window {{{2 +nnoremap c +nnoremap cc c +nnoremap ch :CloseLeftWindow +nnoremap cl :CloseRightWindow +nnoremap cj :CloseBelowWindow +nnoremap ck :CloseAboveWindow + " python-mode {{{2 let g:pymode_rope_completion = 0 let g:pymode_rope = 0 +let g:pymode_run = 0 let g:pymode_folding = 1 let g:pymode_lint_ignore = "E221,E266,E501" +let g:pymode_lint_cwindow = 0 " don't open cwindow when linting let g:pymode_syntax_space_errors = 0 " don't bother me when I'm typing +" signature {{{2 +" disable '[ mappings + +let g:SignatureMap = { + \ 'GotoNextLineAlpha' : "", + \ 'GotoPrevLineAlpha' : "", + \ 'GotoNextSpotAlpha' : "", + \ 'GotoPrevSpotAlpha' : "", + \ } + +" switch +let g:switch_mapping = "s" + +" spellrotate +nmap z] (SpellRotateForward) +nmap z[ (SpellRotateBackward) +vmap z] (SpellRotateForwardV) +vmap z[ (SpellRotateBackwardV) + " synastic {{{2 let g:syntastic_enable_highlighting = 0 let g:syntastic_error_symbol='E' @@ -524,10 +605,15 @@ let g:tagbar_autoshowtag = 1 let g:tagbar_width = 25 let g:tagbar_iconchars = ['+', '-'] +" tcomments {{{2 +let g:tcommentTextObjectInlineComment = 'gic' + " ultisnips {{{2 let g:UltiSnipsEditSplit = 'vertical' let g:UltiSnipsSnippetsDir = expand("$XDG_CONFIG_HOME/vim/ultisnips") -let g:UltiSnipsSnippetDirectories = ["UltiSnips", "ultisnips"] +if has('fname_case') + let g:UltiSnipsSnippetDirectories = ["UltiSnips", "ultisnips"] +endif let g:UltiSnipsExpandTrigger = "" let g:UltiSnipsJumpForwardTrigger = "" let g:UltiSnipsJumpBackwardTrigger = "" @@ -563,6 +649,7 @@ call unite#custom#profile('default', 'context', { nnoremap [unite] nmap u [unite] +nnoremap [unite]u :UniteResume " unite-grep {{{3 " seems not respected @@ -570,22 +657,23 @@ 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 -w --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 -input= -command! -nargs=1 Ag Unite grep -input= +nnoremap [unite]a :Unite grep:.:: +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') " unite-buffer {{{3 -call unite#custom#default_action('buffer', 'goto') -nnoremap [unite]b :Unite buffer +call unite#custom#default_action('buffer', 'open') +nnoremap [unite]b :Unite buffer:- " unite-menu {{{3 let g:unite_source_menu_menus = {} @@ -617,15 +705,21 @@ let g:ycm_extra_conf_globlist = ['~/src/*','/mnt/data/src/*'] let g:ycm_global_ycm_extra_conf = expand('$XDG_CONFIG_HOME/vim/ycm_extra_conf.py') let g:ycm_extra_conf_vim_data = ['getcwd()'] 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'] -nnoremap jd :YcmCompleter GoTo " 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 @@ -653,6 +747,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 @@ -663,6 +766,13 @@ if !exists(":DiffOrig") \ | wincmd p | diffthis endif +" sort operator {{{2 +function! SortLinesOpFunc(...) + '[,']sort +endfunction +nnoremap gs :set operatorfunc=SortLinesOpFuncg@ +vnoremap gs :sort + " edit configs {{{2 function! EditConfig(what) let l:dir = split(&runtimepath,',')[0] @@ -732,5 +842,9 @@ function! FindGitDirOrHome() return '~' endif endfunction +command! Cd cd %:h +command! Cr execute('cd ' . FindGitDirOrHome()) +command! LCd lcd %:h +command! LCr execute('lcd ' . FindGitDirOrHome()) " vim:set et sw=2 ts=2 tw=78: