X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/fff9e5e98e178e319e236c1ca5e1851d45b8866d..91cae8271cf964df485bad3d15e74c240bcdddcb:/vim/vimrc?ds=sidebyside

diff --git a/vim/vimrc b/vim/vimrc
index 681d32a..cbcc9ac 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -25,7 +25,6 @@ Plugin 'majutsushi/tagbar'
 Plugin 'rking/ag.vim'
 Plugin 'scrooloose/nerdtree'
 Plugin 'scrooloose/syntastic'
-Plugin 'sirver/ultisnips'
 Plugin 'sjl/gundo.vim'
 Plugin 'tomtom/tcomment_vim'
 Plugin 'tpope/vim-fugitive'
@@ -34,6 +33,11 @@ Plugin 'tpope/vim-surround'
 Plugin 'tpope/vim-unimpaired'
 Plugin 'valloric/youcompleteme'
 
+" snippets
+Plugin 'sirver/ultisnips'
+Plugin 'honza/vim-snippets'
+
+" ros
 Plugin 'ompugao/ros.vim'
 Plugin 'ompugao/ctrlp-ros'
 
@@ -399,7 +403,7 @@ nnoremap <leader>ag yiw:Ag "<cr>
 vnoremap <leader>ag y:Ag "<cr>
 
 " airline {{{2
-let g:airline_detect_whitespace=2
+let g:airline#extensions#whitespace#enabled = 1
 let g:airline#extensions#tabline#enabled = 1
 let g:airline_powerline_fonts = 1