X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/56e8d50701196b6c3134707c5a5a5b4af9c7caf0..c41957e5bcaaecfacc36e95eabfd6fb40ffdb6f5:/vim/vimrc?ds=sidebyside

diff --git a/vim/vimrc b/vim/vimrc
index 3422030..2a7533d 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -40,6 +40,11 @@ Bundle 'derekwyatt/vim-fswitch'
 " 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
 set runtimepath -=$HOME/.vim/after
@@ -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
 
-" 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$
 
@@ -344,6 +337,10 @@ let g:tagbar_autoshowtag = 1
 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