summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
m---------.vim/bundle/vundle0
-rw-r--r--.vimrc33
2 files changed, 16 insertions, 17 deletions
diff --git a/.vim/bundle/vundle b/.vim/bundle/vundle
-Subproject 3dcb0c32991026d0d226aaad57b622c6553cd0d
+Subproject cfd3b2d388a8c2e9903d7a9d80a65539aabfe93
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