X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/5f7a37092d2d250c176c4779106fc88c0e3e38a4..f41aaa07a6e70d42890bc2d02958b148fb1bacfe:/vim/vimrc diff --git a/vim/vimrc b/vim/vimrc index 10e5770..833e962 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -19,25 +19,27 @@ Plugin 'bling/vim-airline' Plugin 'derekwyatt/vim-fswitch' Plugin 'elzr/vim-json' Plugin 'firef0x/pkgbuild.vim' +Plugin 'flazz/vim-colorschemes' 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 '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-fugitive' Plugin 'tpope/vim-repeat' Plugin 'tpope/vim-surround' Plugin 'tpope/vim-unimpaired' Plugin 'valloric/youcompleteme' +Plugin 'vim-scripts/replacewithregister' Plugin 'vim-scripts/yankring.vim' " snippets @@ -61,14 +63,10 @@ Plugin 'ompugao/ctrlp-ros' " 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 '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' " remove entries first @@ -87,9 +85,6 @@ syntax on colorscheme badwolf " 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 @@ -97,7 +92,10 @@ set smartcase " override 'ignorecase' when pattern has upper case char set hlsearch " highlight all matches for the last used search pattern set nostartofline " don't move the cursor to the first non-blank char of a line -set path=.,include/,../include/,/usr/include/c++/*,/opt/ros/hydro/include +set path+=. +set path+=include/ +set path+=../include/ +set path+=/usr/include/c++/* " displaying text {{{2 set nowrap " long lines wrap @@ -163,11 +161,25 @@ set backspace=indent,eol,start " allow backspacing over everything in insert mo set showmatch " Show matching brackets. set nojoinspaces " don't use two spaces after '.' when joining a line -set formatoptions=jcrnql +set formatoptions+=j " Delete comment leader when joining lines +set formatoptions+=c " Autowrap comments using textwidth +set formatoptions+=r " Insert comment leader after hitting +set formatoptions+=n " Recognize numbered lists +set formatoptions+=q " Allow formatting of comments with "gq". +set formatoptions+=l " do not wrap lines that have been longer when starting insert mode already +set formatoptions+=t " Auto-wrap text using textwidth +set formatoptions-=o " Do not insert comment leader after hitting o or O in normal mode set nrformats=hex " number formats recognized for CTRL-A and CTRL-X commands -set complete=.,w,b,u,t +set complete=. " scan the current buffer ( 'wrapscan' is ignored) +set complete+=w " scan buffers from other windows +set complete+=b " scan other loaded buffers that are in the buffer list +set complete+=u " scan the unloaded buffers that are in the buffer list +set complete+=t " scan tags +set complete+=i " scan current and included files +set complete+=kspell " use the currently active spell checking |spell| + " whether to use a popup menu for Insert mode completion set completeopt=longest,menuone,preview @@ -192,8 +204,10 @@ set foldopen+=jump set viewoptions=cursor " only save cursor position " diff mode {{{2 -" vertical splits and ignore white space in diffs -set diffopt=filler,vertical,iwhite +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 set modeline " read modelines @@ -238,12 +252,20 @@ set wildignore+=*.luac " Lua byte code set wildignore+=*.pyc " Python byte code set wildignore+=*.orig " Merge resolution files +" running make and jumping to errors +set makeprg=make\ -w " print changing directories + +" 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 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// +set sessionoptions+=unix,slash " damn windows and it's silly ways + " autocmds {{{1 " Resize splits when the window is resized {{{2 augroup resize @@ -275,6 +297,24 @@ 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 @@ -296,8 +336,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 : '[\\]\@,) +nnoremap ww :Untrail " Source vnoremap S y:execute @@:echo 'Sourced selection.' @@ -381,7 +434,9 @@ 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 . @@ -404,6 +459,11 @@ for idt in range(1,8) exe 'nnoremap co'.idt.' :set 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 @@ -503,7 +563,9 @@ let g:tagbar_iconchars = ['+', '-'] " 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 = "" @@ -593,9 +655,11 @@ 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 +nnoremap gd :YcmCompleter GoTo " vim-easy-align {{{2 " start interactive EasyAlign in visual mode