dwb: update forms

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index c0eb5286242ecc4676681d3968e89cae0c176525..2a7533d15082ae8f5d45846f8b81692c2d996cf1 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -37,8 +37,13 @@ Bundle 'ompugao/ctrlp-ros'
 Bundle 'firef0x/pkgbuild.vim'
 Bundle 'derekwyatt/vim-fswitch'
 " seems to have problems right now... may be add later?
 Bundle 'firef0x/pkgbuild.vim'
 Bundle 'derekwyatt/vim-fswitch'
 " seems to have problems right now... may be add later?

-"Bundle 'jalcine/cmake.vim' 
-Bundle 'powerman/vim-plugin-viewdoc'
+" Bundle 'jalcine/cmake.vim'
+" Bundle 'powerman/vim-plugin-viewdoc'
+
+Bundle 'airblade/vim-gitgutter'
+Bundle 'Raimondi/delimitMate'
+Bundle 'SirVer/ultisnips'
+Bundle 'Lokaltog/vim-easymotion'

 
 " remove entries first
 set runtimepath -=$HOME/.vim
 
 " remove entries first
 set runtimepath -=$HOME/.vim


@@ -197,18 +202,6 @@ set nrformats=hex               " number formats recognized for CTRL-A and CTRL-
 " whether to use a popup menu for Insert mode completion
 set completeopt=longest,menuone,preview
 
 " whether to use a popup menu for Insert mode completion
 set completeopt=longest,menuone,preview
 

-" Indent if we're at the beginning of a line. Else, do completion.
-function! InsertTabWrapper()
-  let col = col('.') - 1
-  if !col || getline('.')[col - 1] !~ '\k'
-    return "\<Tab>"
-  else
-    return "\<C-N>"
-endif
-endfunction
-inoremap <Tab> <C-R>=InsertTabWrapper()<CR>
-inoremap <S-Tab> <C-P>
-

 " fix legacy vi inconsistency
 map Y y$
 
 " fix legacy vi inconsistency
 map Y y$
 


@@ -344,6 +337,10 @@ let g:tagbar_autoshowtag = 1
 let g:tagbar_width = 25
 let g:tagbar_iconchars = ['+', '-']
 
 let g:tagbar_width = 25
 let g:tagbar_iconchars = ['+', '-']
 

+" UltiSnips {{{2
+let g:UltiSnipsEditSplit = 'vertical'
+let g:UltiSnipsSnippetsDir = "$XDG_CONFIG_HOME/vim/ultisnips"
+

 " YouCompleteMe {{{2
 let g:ycm_extra_conf_globlist = ['~/src/*','/mnt/data/src/*']
 let g:ycm_add_preview_to_completeopt = 1
 " YouCompleteMe {{{2
 let g:ycm_extra_conf_globlist = ['~/src/*','/mnt/data/src/*']
 let g:ycm_add_preview_to_completeopt = 1


@@ -359,9 +356,9 @@ let g:tex_flavor='latex'
 let g:Tex_DefaultTargetFormat='pdf'
 let g:Tex_MultipleCompileFormats='pdf'
 
 let g:Tex_DefaultTargetFormat='pdf'
 let g:Tex_MultipleCompileFormats='pdf'
 

-" vim-viewdoc {{{2
-let g:no_viewdoc_maps = 1
-nnoremap K :call ViewDoc('doc', '<cword>')<cr>
+" " vim-viewdoc {{{2
+" let g:no_viewdoc_maps = 1
+" nnoremap K :call ViewDoc('doc', '<cword>')<cr>

 
 " functions {{{1
 " auto source vimrc when saved
 
 " functions {{{1
 " auto source vimrc when saved