Backup UH

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 3c456447404d8d836db05e9fc899e500d3dc95a6..e763b5d465624a795b4907092b1ff667d939af38 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -3,92 +3,95 @@
 " Author:   Samir Benmendil <samir.benmendil[at]gmail[dot]com>
 "
 
 " 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
 " plugins {{{1

-filetype off
-set runtimepath& " reset rtp

 " remove all autocommands
 autocmd!
 
 " 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 'thinca/vim-qfreplace'
-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
 
 " colorschemes

-Plugin 'flazz/vim-colorschemes'
+Plug 'morhetz/gruvbox'

 
 " snippets
 
 " snippets

-Plugin 'sirver/ultisnips'
-Plugin 'honza/vim-snippets'
+Plug 'sirver/ultisnips'
+Plug 'honza/vim-snippets'

 
 " text objects
 
 " 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?)
 
 " 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'
+Plug 'rbong/vim-flog'
+" Vim/Python is broken atm
+" Plug 'tbabej/taskwiki'

 " needs editing colorscheme
 " needs editing colorscheme

-" Plugin 'jeaye/color_coded'
+" Plug 'jeaye/color_coded'

 " Check LucHermites plugins: https://github.com/LucHermitte/lh-cpp
 " 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
 
 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
 
 " options {{{1
 " moving around, searching and patterns {{{2


@@ -115,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
 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:·
 augroup trailing
     au!
     au InsertEnter * :set listchars-=trail:·


@@ -539,6 +542,11 @@ nnoremap <silent> <leader>gc :Gcommit -v<CR>
 nnoremap <silent> <leader>ga :Gwrite<cr>
 nnoremap <silent> <leader>gb :Gblame<cr>
 
 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>
 
 " Gundo {{{2
 nnoremap <F7> :GundoToggle<CR>
 


@@ -559,6 +567,7 @@ nnoremap <silent> <C-W>ck :CloseAboveWindow<CR>
 
 " python-mode {{{2
 
 
 " 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:pymode_rope_completion = 0
 let g:pymode_rope = 0
 let g:pymode_run = 0


@@ -595,6 +604,8 @@ let g:syntastic_style_warning_symbol='S'
 let g:syntastic_always_populate_loc_list=1
 nmap <silent> <leader>y :SyntasticCheck<cr>
 
 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
 if ! &diff
   let g:syntastic_check_on_open=1
 endif