vim: s/Bundle/Plugin/

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 3422030b76feeff0c9619332735fb63518a48a52..8de988ac6be5a1d62341cc5f34418baf8aa0c394 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -11,34 +11,39 @@ autocmd!
 set runtimepath+=$XDG_DATA_HOME/vim/vundle
 call vundle#rc('$XDG_DATA_HOME/vim')
 
-Bundle 'gmarik/vundle'
-
-Bundle 'bling/vim-airline'
-Bundle 'elzr/vim-json'
-Bundle 'rking/ag.vim'
-Bundle 'http://git.code.sf.net/p/vim-latex/vim-latex'
-Bundle 'kien/ctrlp.vim'
-Bundle 'kshenoy/vim-signature'
-Bundle 'majutsushi/tagbar'
-Bundle 'scrooloose/nerdtree'
-Bundle 'scrooloose/syntastic'
-Bundle 'sjl/gundo.vim'
-Bundle 'tomtom/tcomment_vim'
-Bundle 'tpope/vim-endwise'
-Bundle 'tpope/vim-fugitive'
-Bundle 'tpope/vim-repeat'
-Bundle 'tpope/vim-surround'
-Bundle 'tpope/vim-unimpaired'
-Bundle 'valloric/youcompleteme'
-
-Bundle 'ompugao/ros.vim'
-Bundle 'ompugao/ctrlp-ros'
-
-Bundle 'firef0x/pkgbuild.vim'
-Bundle 'derekwyatt/vim-fswitch'
+Plugin 'gmarik/vundle'
+
+Plugin 'bling/vim-airline'
+Plugin 'elzr/vim-json'
+Plugin 'rking/ag.vim'
+Plugin 'http://git.code.sf.net/p/vim-latex/vim-latex'
+Plugin 'kien/ctrlp.vim'
+Plugin 'kshenoy/vim-signature'
+Plugin 'majutsushi/tagbar'
+Plugin 'scrooloose/nerdtree'
+Plugin 'scrooloose/syntastic'
+Plugin 'sjl/gundo.vim'
+Plugin 'tomtom/tcomment_vim'
+Plugin 'tpope/vim-endwise'
+Plugin 'tpope/vim-fugitive'
+Plugin 'tpope/vim-repeat'
+Plugin 'tpope/vim-surround'
+Plugin 'tpope/vim-unimpaired'
+Plugin 'valloric/youcompleteme'
+
+Plugin 'ompugao/ros.vim'
+Plugin 'ompugao/ctrlp-ros'
+
+Plugin 'firef0x/pkgbuild.vim'
+Plugin 'derekwyatt/vim-fswitch'
 " seems to have problems right now... may be add later?
-" Bundle 'jalcine/cmake.vim'
-" Bundle 'powerman/vim-plugin-viewdoc'
+" Plugin 'jalcine/cmake.vim'
+" Plugin 'powerman/vim-plugin-viewdoc'
+
+Plugin 'airblade/vim-gitgutter'
+Plugin 'Raimondi/delimitMate'
+Plugin 'SirVer/ultisnips'
+Plugin 'Lokaltog/vim-easymotion'
 
 " 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
 
-" 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