Use vim-plug.

.gitmodules

@@ -1,3 +0,0 @@
-[submodule ".vim/bundle/vundle"]
-	path = .vim/bundle/vundle
-	url = https://github.com/gmarik/vundle.git

.vim/vimrc

@@ -56,29 +56,27 @@ vnoremap <silent> p p`]
 vnoremap <silent> y y`]
 "
 filetype off
-set rtp+=~/.vim/bundle/vundle/
-call vundle#rc()
 "
-Bundle "gmarik/vundle"
+call plug#begin('~/.vim/plugged')
-"
+Bundle 'bonsaiben/bootstrap-snippets'
-Bundle "bonsaiben/bootstrap-snippets"
+Bundle 'ctrlpvim/ctrlp.vim'
-Bundle "ctrlpvim/ctrlp.vim"
+Bundle 'garbas/vim-snipmate'
-Bundle "garbas/vim-snipmate"
+Bundle 'godlygeek/csapprox'
-Bundle "godlygeek/csapprox"
+Bundle 'gregsexton/gitv'
-Bundle "gregsexton/gitv"
+Bundle 'honza/vim-snippets'
-Bundle "honza/vim-snippets"
+Bundle 'itchyny/lightline.vim'
-Bundle "itchyny/lightline.vim"
+Bundle 'majutsushi/tagbar'
-Bundle "majutsushi/tagbar"
+Bundle 'MarcWeber/vim-addon-mw-utils'
-Bundle "MarcWeber/vim-addon-mw-utils"
+Bundle 'motus/pig.vim'
-Bundle "motus/pig.vim"
+Bundle 'nathanaelkane/vim-indent-guides'
-Bundle "nathanaelkane/vim-indent-guides"
+Bundle 'scrooloose/nerdtree'
-Bundle "scrooloose/nerdtree"
+Bundle 'sheerun/vim-polyglot'
-Bundle "sheerun/vim-polyglot"
+Bundle 'spf13/PIV'
-Bundle "spf13/PIV"
+Bundle 'terryma/vim-expand-region'
-Bundle "terryma/vim-expand-region"
+Bundle 'tomtom/tlib_vim'
-Bundle "tomtom/tlib_vim"
+Bundle 'tpope/vim-fugitive'
-Bundle "tpope/vim-fugitive"
+Bundle 'tpope/vim-surround'
-Bundle "tpope/vim-surround"
+call plug#end()
 "
 filetype plugin indent on
 let g:ctrlp_use_caching = 0

install.sh

@@ -51,13 +51,7 @@ mkdir -p ~/.config || true
 ln -fs ../.vim ~/.config/nvim
 
 # vim
-if [ -e ~/.vim ]; then
+mkdir -p ~/.vim/ || true
-    rsync -a ${BASEDIR}/.vim/ ~/.vim/
+rsync -a ${BASEDIR}/.vim/ ~/.vim/
-    chmod 700 ~/.vim/
+chmod 700 ~/.vim/
-    vim +BundleClean\! +BundleUpdate +q +q
+vim +PlugUpdate +PlugClean\! +q +q
-else
-    mkdir -p ~/.vim/
-    rsync -a ${BASEDIR}/.vim/ ~/.vim/
-    chmod 700 ~/.vim/
-    vim +BundleClean\! +BundleInstall +q +q
-fi