X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/b51f3563d6cb0010825b2d2b9fe01e687f54345a..refs/heads/uh-backup:/vim/vimrc diff --git a/vim/vimrc b/vim/vimrc index 8d4ba47..e763b5d 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -3,97 +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 '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 'justinmk/vim-sneak' -Plugin 'klen/python-mode' -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' -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' "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' +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' -Plugin 'kana/vim-operator-user' - -" ros -Plugin 'ompugao/ros.vim' -Plugin 'ompugao/ctrlp-ros' +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 'vim-latex/vim-latex' -Plugin 'alx741/vinfo' -Plugin 'derekwyatt/vim-protodef' -Plugin 'sgeb/vim-diff-fold' +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' +" Plug 'jeaye/color_coded' " Check LucHermites plugins: https://github.com/LucHermitte/lh-cpp -Plugin 'wincent/loupe' +" Plug 'wincent/loupe' -call vundle#end() - -" 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 @@ -120,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:· @@ -337,6 +335,11 @@ 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 @@ -449,8 +452,10 @@ nnoremap zx zMzxzt map :ls:b " move between windows (skip previewwindow) -nnoremap w:if &previewwindow \| wincmd w \| endif -nnoremap W:if &previewwindow \| wincmd W \| endif +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 @@ -493,7 +498,7 @@ nnoremap za vnoremap zf " save with sudo -cabbrev w!! w !sudo tee % > /dev/null +cabbrev w!! SudoWrite " uppercase previous word inoremap gUiwgi @@ -537,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 @@ -557,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 @@ -593,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 @@ -606,7 +619,8 @@ let g:tagbar_width = 25 let g:tagbar_iconchars = ['+', '-'] " tcomments {{{2 -let g:tcommentTextObjectInlineComment = 'gic' +let g:tcomment_textobject_inlinecomment = 'gic' +let g:tcomment#filetype#guess = 0 " ultisnips {{{2 let g:UltiSnipsEditSplit = 'vertical' @@ -650,6 +664,8 @@ 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 @@ -661,6 +677,7 @@ if executable('ag') 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 @@ -718,6 +735,7 @@ nmap ga (EasyAlign) let g:gtest#highlight_failing_tests = 0 nnoremap tt :GTestRun +nnoremap ta :GTestCase *:GTestName *:GTestRun nnoremap tu :GTestRunUnderCursor " vim-json {{{2 @@ -843,8 +861,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: