vim: add some xsd snippets

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 7c9166da51b4c654e507cc966702c335059fac25..8a84380f62d53128dad68f0cf32f7759ca051b35 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -16,6 +16,7 @@ Plugin 'gmarik/vundle'
 
 Plugin 'AndrewRadev/switch.vim'
 Plugin 'airblade/vim-gitgutter'
 
 Plugin 'AndrewRadev/switch.vim'
 Plugin 'airblade/vim-gitgutter'

+Plugin 'alepez/vim-gtest'

 Plugin 'bling/vim-airline'
 Plugin 'chrisbra/checkattach'
 Plugin 'derekwyatt/vim-fswitch'
 Plugin 'bling/vim-airline'
 Plugin 'chrisbra/checkattach'
 Plugin 'derekwyatt/vim-fswitch'


@@ -28,6 +29,8 @@ Plugin 'kshenoy/vim-signature'
 Plugin 'majutsushi/tagbar'
 Plugin 'octol/vim-cpp-enhanced-highlight'
 Plugin 'raimondi/delimitmate'
 Plugin 'majutsushi/tagbar'
 Plugin 'octol/vim-cpp-enhanced-highlight'
 Plugin 'raimondi/delimitmate'

+Plugin 'ram-z/vim-clang-format'
+Plugin 'ram-z/vimwiki'

 Plugin 'rdnetto/ycm-generator'
 Plugin 'scrooloose/syntastic'
 Plugin 'shougo/unite.vim'
 Plugin 'rdnetto/ycm-generator'
 Plugin 'scrooloose/syntastic'
 Plugin 'shougo/unite.vim'


@@ -60,23 +63,16 @@ Plugin 'julian/vim-textobj-variable-segment'
 Plugin 'sgur/vim-textobj-parameter'
 Plugin 'kana/vim-operator-user'
 
 Plugin 'sgur/vim-textobj-parameter'
 Plugin 'kana/vim-operator-user'
 

-" ros
-Plugin 'ompugao/ros.vim'
-Plugin 'ompugao/ctrlp-ros'
-

 " staging
 " find an alternative (latex-box? Automatic Latex Plugin?)
 Plugin 'vim-latex/vim-latex'
 Plugin 'alx741/vinfo'
 Plugin 'derekwyatt/vim-protodef'
 " staging
 " find an alternative (latex-box? Automatic Latex Plugin?)
 Plugin 'vim-latex/vim-latex'
 Plugin 'alx741/vinfo'
 Plugin 'derekwyatt/vim-protodef'

-Plugin 'ram-z/vim-clang-format'

 Plugin 'sgeb/vim-diff-fold'
 " needs editing colorscheme
 " Plugin 'jeaye/color_coded'
 " Check LucHermites plugins: https://github.com/LucHermitte/lh-cpp
 Plugin 'wincent/loupe'
 Plugin 'sgeb/vim-diff-fold'
 " needs editing colorscheme
 " Plugin 'jeaye/color_coded'
 " Check LucHermites plugins: https://github.com/LucHermitte/lh-cpp
 Plugin 'wincent/loupe'

-Plugin 'ram-z/vimwiki'
-Plugin 'alepez/vim-gtest'

 
 call vundle#end()
 
 
 call vundle#end()
 


@@ -493,7 +489,7 @@ nnoremap <leader><Space> za
 vnoremap <leader><Space> zf
 
 " save with sudo
 vnoremap <leader><Space> zf
 
 " save with sudo

-cabbrev w!! w !sudo tee % > /dev/null
+cabbrev w!! SudoWrite

 
 " uppercase previous word
 inoremap <C-C> <Esc>gUiwgi
 
 " uppercase previous word
 inoremap <C-C> <Esc>gUiwgi


@@ -708,7 +704,6 @@ let g:ycm_add_preview_to_completeopt = 1
 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_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
 
 " vim-easy-align {{{2
 " start interactive EasyAlign in visual mode


@@ -752,9 +747,9 @@ omap T <Plug>Sneak_T
 let g:vimwiki_list = [{'path': '$XDG_DATA_HOME/vimwiki'}]
 let g:vimwiki_auto_chdir = 1
 augroup myvimwiki
 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 -C "%:p:h" pull
-  au! BufRead,BufNewFile $XDG_DATA_HOME/vimwiki/diary/*.wiki !git -C "%:p:h" 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
 augroup END
 
 " functions {{{1