From b0c20072850b79c4362f8c888bf103b40ca6f9b1 Mon Sep 17 00:00:00 2001 From: Florian Pritz Date: Sun, 12 Apr 2015 14:37:26 +0200 Subject: vim: switch to vundle neobundle doesn't work nicely if the bundle dir is not writeable. Let's see if vundle behaves better Signed-off-by: Florian Pritz --- .vim/bundle/vundle | 2 +- .vimrc | 33 ++++++++++++++++----------------- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/.vim/bundle/vundle b/.vim/bundle/vundle index 3dcb0c3..cfd3b2d 160000 --- a/.vim/bundle/vundle +++ b/.vim/bundle/vundle @@ -1 +1 @@ -Subproject commit 3dcb0c32991026d0d226aaad57b622c6553cd0db +Subproject commit cfd3b2d388a8c2e9903d7a9d80a65539aabfe933 diff --git a/.vimrc b/.vimrc index f02d389..a9fb02f 100644 --- a/.vimrc +++ b/.vimrc @@ -62,11 +62,10 @@ let g:sudo_no_gui = 1 let g:ycm_extra_conf_globlist = ['~/.ycm_extra_conf.py'] filetype off -set runtimepath+=~/.vim/bundle/neobundle.vim/ -call neobundle#rc(expand('~/.vim/bundle/')) -NeoBundleFetch 'Shougo/neobundle.vim' +set rtp+=~/.vim/bundle/vundle +call vundle#begin() -NeoBundle 'scrooloose/syntastic' +Plugin 'scrooloose/syntastic' "NeoBundle 'Rip-Rip/clang_complete' "NeoBundle 'Shougo/neocomplete.vim' "NeoBundle 'Shougo/neosnippet.vim' @@ -83,20 +82,20 @@ NeoBundle 'scrooloose/syntastic' "NeoBundle 'osyo-manga/vim-reunions' "NeoBundle 'osyo-manga/vim-marching' " -NeoBundle 'Valloric/YouCompleteMe' -NeoBundle 'SirVer/ultisnips' +Plugin 'Valloric/YouCompleteMe' +Plugin 'SirVer/ultisnips' " -NeoBundle 'tpope/vim-unimpaired' -NeoBundle 'tpope/vim-fugitive' -NeoBundle 'tpope/vim-repeat' -NeoBundle 'SudoEdit' -NeoBundle 'rking/ag.vim' -NeoBundle 'scrooloose/nerdtree' -NeoBundle 'majutsushi/tagbar' -NeoBundle 'adoy/vim-php-refactoring-toolbox' -NeoBundle 'shawncplus/phpcomplete.vim' - -NeoBundleCheck +Plugin 'tpope/vim-unimpaired' +Plugin 'tpope/vim-fugitive' +Plugin 'tpope/vim-repeat' +Plugin 'SudoEdit' +Plugin 'rking/ag.vim' +Plugin 'scrooloose/nerdtree' +Plugin 'majutsushi/tagbar' +Plugin 'adoy/vim-php-refactoring-toolbox' +Plugin 'shawncplus/phpcomplete.vim' + +call vundle#end() "aliases cnorea w!! w !sudo tee "%" > /dev/null -- cgit v1.2.3-24-g4f1b