zsh: add virtualenv prompt

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 99952966f56f8552ccd02a7897e15c01a182e79e..78b44f4581695018d99381db22360a692e406a38 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -31,6 +31,8 @@ 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' }

+" 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 'vimwiki/vimwiki', { 'branch': 'dev' }
 Plug 'scrooloose/syntastic'
 Plug 'sgeb/vim-diff-fold'


@@ -333,9 +335,6 @@ augroup terminal
   au!
   au TerminalOpen * if &buftype == 'terminal' | setlocal bufhidden=hide | endif
 augroup END
   au!
   au TerminalOpen * if &buftype == 'terminal' | setlocal bufhidden=hide | endif
 augroup END

-" vertical split TermDebug
-let g:termdebug_wide = 1
-command! -nargs=* -bang -complete=file Debug tabedit % | Termdebug<bang> <args>

 
 " bindings {{{1
 
 
 " bindings {{{1