[WIP] Push all of the ultrahaptics changes!

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 522c20b7478aea2fa8aaa530a85d0ccf80d26c48..9b5c20291388b077f1f7d132c7e5704b83d73b9c 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -74,6 +74,7 @@ Plugin 'derekwyatt/vim-protodef'
 " Check LucHermites plugins: https://github.com/LucHermitte/lh-cpp
 Plugin 'wincent/loupe'
 Plugin 'Ram-Z/vimwiki'
+Plugin 'alepez/vim-gtest'
 
 call vundle#end()
 
@@ -607,6 +608,7 @@ let g:tagbar_iconchars = ['+', '-']
 
 " tcomments {{{2
 let g:tcommentTextObjectInlineComment = 'gic'
+" let g:tcommentOptions = { 'whitespace' : 'no'  }
 
 " ultisnips {{{2
 let g:UltiSnipsEditSplit = 'vertical'
@@ -701,7 +703,11 @@ function! YRRunAfterMaps()
 endfunction
 
 " youcompleteme {{{2
-let g:ycm_extra_conf_globlist = ['~/src/*','/mnt/data/src/*']
+let g:ycm_extra_conf_globlist = [
+      \   '~/src/*',
+      \   '/mnt/data/src/*',
+      \   '/mnt/common/src/*'
+      \ ]
 let g:ycm_global_ycm_extra_conf = expand('$XDG_CONFIG_HOME/vim/ycm_extra_conf.py')
 let g:ycm_extra_conf_vim_data = ['getcwd()']
 let g:ycm_add_preview_to_completeopt = 1
@@ -746,8 +752,9 @@ omap T <Plug>Sneak_T
 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 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 pull
+  au! BufRead      $XDG_DATA_HOME/vimwiki/diary/*.wiki !git pull
+  au! BufWritePost $XDG_DATA_HOME/vimwiki/*.wiki       exe  '!git add "<afile>";git commit -m"' . strftime("%FT%R") . '";git push'
 augroup END
 
 " functions {{{1