Backup UH

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 9a3a86e15e4f128156d3af661071fab24af2d8cc..e763b5d465624a795b4907092b1ff667d939af38 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -31,7 +31,9 @@ Plug 'majutsushi/tagbar'
 Plug 'octol/vim-cpp-enhanced-highlight'
 Plug 'raimondi/delimitmate'
 Plug 'ram-z/vim-clang-format', { 'branch': 'fix-undo' }
 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' }
+" 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 'scrooloose/syntastic'
 Plug 'sgeb/vim-diff-fold'
 Plug 'shougo/unite.vim'


@@ -47,6 +49,7 @@ Plug 'tpope/vim-repeat'
 Plug 'tpope/vim-surround'  "investigate vim-sandwich
 Plug 'tpope/vim-unimpaired'
 Plug 'tweekmonster/spellrotate.vim'
 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 'valloric/youcompleteme', { 'do': './install.py --clang-completer' }
 Plug 'vim-scripts/mediawiki.vim'
 Plug 'vim-scripts/replacewithregister'


@@ -69,10 +72,13 @@ Plug 'kana/vim-operator-user'
 " find an alternative (latex-box? Automatic Latex Plugin?)
 Plug 'vim-latex/vim-latex'
 Plug 'alx741/vinfo'
 " find an alternative (latex-box? Automatic Latex Plugin?)
 Plug 'vim-latex/vim-latex'
 Plug 'alx741/vinfo'

+Plug 'rbong/vim-flog'
+" Vim/Python is broken atm
+" Plug 'tbabej/taskwiki'

 " needs editing colorscheme
 " Plug 'jeaye/color_coded'
 " Check LucHermites plugins: https://github.com/LucHermitte/lh-cpp
 " needs editing colorscheme
 " Plug 'jeaye/color_coded'
 " Check LucHermites plugins: https://github.com/LucHermitte/lh-cpp

-Plug 'wincent/loupe'
+" Plug 'wincent/loupe'

 
 call plug#end()
 
 
 call plug#end()
 


@@ -112,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:·


@@ -561,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


@@ -597,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