X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/0e732b69a54919f260a5ccb045db7cf65e6850cc..066d85f264de844d55df1a47dfcaff4b39d39e46:/vim/vimrc

diff --git a/vim/vimrc b/vim/vimrc
index f20a817..1e994bc 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -3,91 +3,87 @@
 " 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 '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 'scrooloose/syntastic'
-Plugin 'sgeb/vim-diff-fold'
-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' }
+Plug 'ram-z/vimwiki', { 'branch': 'no_override_map' }
+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'
+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 'flazz/vim-colorschemes'
 
 " 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'
+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'
+Plug 'vim-latex/vim-latex'
+Plug 'alx741/vinfo'
 " 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
 
 " options {{{1
 " moving around, searching and patterns {{{2
@@ -331,6 +327,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 <space> and \ to be <leader>
@@ -443,8 +444,10 @@ nnoremap zx zMzxzt
 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>
@@ -600,7 +603,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'
@@ -715,6 +719,7 @@ nmap ga <Plug>(EasyAlign)
 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