" Author: Samir Benmendil <samir.benmendil[at]gmail[dot]com>
"
+" 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 '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 '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'
+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'
-Plugin 'Ram-Z/vimwiki'
+" 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
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:·
" 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
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 <space> and \ to be <leader>
map <F1> :ls<CR>:b<space>
" move between windows (skip previewwindow)
-nnoremap <silent> <C-L> <C-W>w:if &previewwindow \| wincmd w \| endif<CR>
-nnoremap <silent> <C-H> <C-W>W:if &previewwindow \| wincmd W \| endif<CR>
+nnoremap <silent> <C-L> <C-W>w<C-W>:if &previewwindow \| wincmd w \| endif<CR>
+nnoremap <silent> <C-H> <C-W>W<C-W>:if &previewwindow \| wincmd W \| endif<CR>
+tnoremap <silent> <C-L> <C-W>w<C-W>:if &previewwindow \| wincmd w \| endif<CR>
+tnoremap <silent> <C-H> <C-W>W<C-W>:if &previewwindow \| wincmd W \| endif<CR>
"xterm mouse with middleclick paste
nnoremap <MiddleMouse> i<MiddleMouse>
nnoremap ]oe :set noexpandtab<CR>
for idt in range(1,8)
- exe 'nnoremap co'.idt.' :set tabstop='.idt.' shiftwidth='.idt.' softtabstop='.idt.'<CR>'
+ exe 'nnoremap co'.idt.' :setlocal tabstop='.idt.' shiftwidth='.idt.' softtabstop='.idt.'<CR>'
endfor
" toggle auto format of text
" create folds around visual selection
vnoremap <leader><Space> 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 <C-C> <Esc>gUiwgi
nnoremap <silent> <leader>ga :Gwrite<cr>
nnoremap <silent> <leader>gb :Gblame<cr>
+augroup fugitive_gstatus
+ au!
+ autocmd BufWinEnter */.git/index resize 16
+augroup end
+
" Gundo {{{2
nnoremap <F7> :GundoToggle<CR>
" python-mode {{{2
+let g:pymode = 0
let g:pymode_rope_completion = 0
let g:pymode_rope = 0
let g:pymode_run = 0
let g:syntastic_always_populate_loc_list=1
nmap <silent> <leader>y :SyntasticCheck<cr>
+let g:syntastic_cpp_clang_tidy_post_args = "-p build*"
+
if ! &diff
let g:syntastic_check_on_open=1
endif
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'
nnoremap [unite] <Nop>
nmap <leader>u [unite]
nnoremap [unite]u :UniteResume<CR>
+nnoremap <silent> [u :UnitePrevious<CR>
+nnoremap <silent> ]u :UniteNext<CR>
" unite-grep {{{3
" seems not respected
let g:unite_source_grep_recursive_opt = ''
end
nnoremap <silent> [unite]a :<C-u>Unite grep:.::\12\17<CR>
+nnoremap <silent> [unite]A :<C-u>Unite grep:.:-w:\12\17<CR>
command! -nargs=1 Ag Unite grep:.::<args>
" unite-file_rec {{{3
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 <Enter> <Plug>(EasyAlign)
nmap ga <Plug>(EasyAlign)
+" vim-gtest {{{2
+let g:gtest#highlight_failing_tests = 0
+
+nnoremap <Leader>tt :GTestRun<CR>
+nnoremap <Leader>ta :GTestCase *<CR>:GTestName *<CR>:GTestRun<CR>
+nnoremap <Leader>tu :GTestRunUnderCursor<CR>
+
" vim-json {{{2
let g:vim_json_syntax_conceal = 0
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 pull
- au! BufWritePost $XDG_DATA_HOME/vimwiki/*.wiki exe '!git add "<afile>";git commit -m"' . strftime("%FT%R") . '";git push'
+ 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 "<afile>";git commit -qm"' . strftime("%FT%R") . '";git push -q'
augroup END
" functions {{{1
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:
repos / dotfiles.git / blobdiff