X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/6abbb3046411b7801e28854c1cb5ad0652d514e1..refs/heads/uh-backup:/vim/vimrc diff --git a/vim/vimrc b/vim/vimrc index 22c9cd2..e763b5d 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -3,93 +3,95 @@ " Author: Samir Benmendil " +" runtimepath {{{1 +set runtimepath ^=$XDG_CONFIG_HOME/vim +set runtimepath +=$XDG_CONFIG_HOME/vim/after + " plugins {{{1 -filetype off -set runtimepath& " reset rtp " remove all autocommands autocmd! -set runtimepath+=$XDG_DATA_HOME/vim/vundle -call vundle#begin('$XDG_DATA_HOME/vim') - -Plugin 'gmarik/vundle' - -Plugin 'airblade/vim-gitgutter' -Plugin 'bling/vim-airline' -Plugin 'derekwyatt/vim-fswitch' -Plugin 'elzr/vim-json' -Plugin 'firef0x/pkgbuild.vim' -Plugin 'junegunn/vim-easy-align' -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 'scrooloose/syntastic' -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' +call plug#begin('$XDG_DATA_HOME/vim') +" This does not update vim-plug, use PlugUpgrade instead +Plug 'junegunn/vim-plug' + +Plug 'airblade/vim-gitgutter' +Plug 'alepez/vim-gtest' +Plug 'andrewradev/switch.vim' +Plug 'bling/vim-airline' +Plug 'chrisbra/checkattach' +Plug 'derekwyatt/vim-fswitch' +Plug 'elzr/vim-json' +Plug 'firef0x/pkgbuild.vim' +Plug 'junegunn/vim-easy-align' +Plug 'justinmk/vim-sneak' +Plug 'klen/python-mode' +Plug 'kshenoy/vim-signature' +Plug 'majutsushi/tagbar' +Plug 'octol/vim-cpp-enhanced-highlight' +Plug 'raimondi/delimitmate' +Plug 'ram-z/vim-clang-format', { 'branch': 'fix-undo' } +" fix some issue with vim-clang-format not finding .clang-format +let g:clang_format#detect_style_file = 1 +Plug 'vimwiki/vimwiki', { 'branch': 'dev' } +Plug 'scrooloose/syntastic' +Plug 'sgeb/vim-diff-fold' +Plug 'shougo/unite.vim' +Plug 'shougo/vimproc.vim' +Plug 'sjl/gundo.vim' +Plug 'thinca/vim-qfreplace' +Plug 'tomtom/tcomment_vim' +Plug 'tpope/vim-abolish' +Plug 'tpope/vim-endwise' +Plug 'tpope/vim-eunuch' +Plug 'tpope/vim-fugitive' +Plug 'tpope/vim-repeat' +Plug 'tpope/vim-surround' "investigate vim-sandwich +Plug 'tpope/vim-unimpaired' +Plug 'tweekmonster/spellrotate.vim' +" consider enabling clangd support --clangd-completer, it's possible to use both +Plug 'valloric/youcompleteme', { 'do': './install.py --clang-completer' } +Plug 'vim-scripts/mediawiki.vim' +Plug 'vim-scripts/replacewithregister' +Plug 'vim-scripts/yankring.vim' " colorschemes -Plugin 'flazz/vim-colorschemes' +Plug 'morhetz/gruvbox' " snippets -Plugin 'sirver/ultisnips' -Plugin 'honza/vim-snippets' +Plug 'sirver/ultisnips' +Plug 'honza/vim-snippets' " text objects -Plugin 'kana/vim-textobj-user' -Plugin 'julian/vim-textobj-variable-segment' -Plugin 'sgur/vim-textobj-parameter' - -" 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' +Plug 'kana/vim-textobj-user' +Plug 'julian/vim-textobj-variable-segment' +Plug 'sgur/vim-textobj-parameter' +Plug 'kana/vim-operator-user' " 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 'chrisbra/checkattach' -Plugin 'nathanaelkane/vim-indent-guides' -Plugin 'alx741/vinfo' -Plugin 'vim-scripts/mediawiki.vim' -Plugin 'derekwyatt/vim-protodef' -Plugin 'rdnetto/ycm-generator' +Plug 'vim-latex/vim-latex' +Plug 'alx741/vinfo' +Plug 'rbong/vim-flog' +" Vim/Python is broken atm +" Plug 'tbabej/taskwiki' " needs editing colorscheme -" Plugin 'jeaye/color_coded' - -call vundle#end() +" Plug 'jeaye/color_coded' +" Check LucHermites plugins: https://github.com/LucHermitte/lh-cpp +" Plug 'wincent/loupe' -" remove entries first -set runtimepath -=$HOME/.vim -set runtimepath -=$HOME/.vim/after -set runtimepath -=$XDG_CONFIG_HOME/vim -set runtimepath -=$XDG_CONFIG_HOME/vim/after -" then prepend and append them -set runtimepath ^=$XDG_CONFIG_HOME/vim -set runtimepath +=$XDG_CONFIG_HOME/vim/after +call plug#end() filetype plugin indent on " colorscheme {{{1 syntax on -colorscheme badfox +set background=dark +let g:gruvbox_contrast_dark = 'hard' +let g:gruvbox_contrast_light = 'soft' +colorscheme gruvbox +" override the background to be black +highligh Normal ctermbg=None " options {{{1 " moving around, searching and patterns {{{2 @@ -116,7 +118,7 @@ set list " show chars defined in 'listchars' set listchars=tab:❭\ " list of strings used for list mode set listchars+=extends:❯,precedes:❮ " Only shown when not in insert mode -au InsertLeave * :set listchars+=trail:· +set listchars+=trail:· augroup trailing au! au InsertEnter * :set listchars-=trail:· @@ -157,10 +159,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 +217,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 @@ -325,9 +335,14 @@ augroup END command! NoAutoChecktime let b:autochecktime=0 command! ToggleAutoChecktime let b:autochecktime=!get(b:, 'autochecktime', 0) | echom "b:autochecktime:" b:autochecktime +augroup terminal + au! + au TerminalOpen * if &buftype == 'terminal' | setlocal bufhidden=hide | endif +augroup END + " bindings {{{1 -" allow both and / to be +" allow both and \ to be map " make @@ -436,9 +451,11 @@ 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 +tnoremap w:if &previewwindow \| wincmd w \| endif +tnoremap W:if &previewwindow \| wincmd W \| endif "xterm mouse with middleclick paste nnoremap i @@ -467,7 +484,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 +497,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 @@ -492,12 +506,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 cd %:h -command! Cr execute('cd ' . FindGitDirOrHome()) -command! LCd lcd %:h -command! LCr execute('lcd ' . FindGitDirOrHome()) - " plugins options {{{1 " airline {{{2 let g:airline#extensions#whitespace#enabled = 1 @@ -534,6 +542,11 @@ nnoremap gc :Gcommit -v nnoremap ga :Gwrite nnoremap gb :Gblame +augroup fugitive_gstatus + au! + autocmd BufWinEnter */.git/index resize 16 +augroup end + " Gundo {{{2 nnoremap :GundoToggle @@ -554,6 +567,7 @@ nnoremap ck :CloseAboveWindow " python-mode {{{2 +let g:pymode = 0 let g:pymode_rope_completion = 0 let g:pymode_rope = 0 let g:pymode_run = 0 @@ -572,6 +586,15 @@ let g:SignatureMap = { \ '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' @@ -581,6 +604,8 @@ let g:syntastic_style_warning_symbol='S' let g:syntastic_always_populate_loc_list=1 nmap y :SyntasticCheck +let g:syntastic_cpp_clang_tidy_post_args = "-p build*" + if ! &diff let g:syntastic_check_on_open=1 endif @@ -593,6 +618,10 @@ let g:tagbar_autoshowtag = 1 let g:tagbar_width = 25 let g:tagbar_iconchars = ['+', '-'] +" tcomments {{{2 +let g:tcomment_textobject_inlinecomment = 'gic' +let g:tcomment#filetype#guess = 0 + " ultisnips {{{2 let g:UltiSnipsEditSplit = 'vertical' let g:UltiSnipsSnippetsDir = expand("$XDG_CONFIG_HOME/vim/ultisnips") @@ -634,6 +663,9 @@ call unite#custom#profile('default', 'context', { nnoremap [unite] nmap u [unite] +nnoremap [unite]u :UniteResume +nnoremap [u :UnitePrevious +nnoremap ]u :UniteNext " unite-grep {{{3 " seems not respected @@ -641,18 +673,20 @@ 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:.:: -command! -nargs=1 Ag Unite grep -input= +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') " unite-buffer {{{3 call unite#custom#default_action('buffer', 'open') @@ -691,13 +725,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 (EasyAlign) nmap ga (EasyAlign) +" vim-gtest {{{2 +let g:gtest#highlight_failing_tests = 0 + +nnoremap tt :GTestRun +nnoremap ta :GTestCase *:GTestName *:GTestRun +nnoremap tu :GTestRunUnderCursor + " vim-json {{{2 let g:vim_json_syntax_conceal = 0 @@ -725,6 +765,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 @@ -735,6 +784,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] @@ -804,5 +860,9 @@ function! FindGitDirOrHome() return '~' endif endfunction +command! Cd cd %:h +command! Cdr execute('cd ' . FindGitDirOrHome()) +command! LCd lcd %:h +command! LCdr execute('lcd ' . FindGitDirOrHome()) " vim:set et sw=2 ts=2 tw=78: