switch to vim-plug

2 files changed, 21 insertions, 30 deletions

diff --git a/deploy.sh b/deploy.sh
index f8b2f32..92c0767 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -49,15 +49,10 @@ do
 done
 cd ..
 
-# install vundle for vim
-if [ ! -d ~/.vim/bundle/vundle ]; then
-    git clone https://github.com/gmarik/vundle.git ~/.vim/bundle/vundle
-    cd ~/.vim/bundle/vundle
-    git pull
-    cd -
-fi
-vim +BundleInstall +qall
-vim +BundleClean +qall
+# install vim-plug
+curl -fLo ~/.vim/autoload/plug.vim --create-dirs \
+    https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
+vim +PlugInstall +qall
 
 # create local files
 if [ ! -e ~/.config/zsh/00-local.zsh ]; then
diff --git a/home/vimrc b/home/vimrc
index 101caf0..3e3b22c 100644
--- a/home/vimrc
+++ b/home/vimrc
@@ -1,27 +1,23 @@
 "
-" vundle
+" vim-plug
 "
 
-set nocompatible
-filetype off
-
-set rtp+=~/.vim/bundle/vundle/
-call vundle#rc()
-
-Bundle 'gmarik/vundle'
-
-Bundle 'scrooloose/nerdtree'
-Bundle 'altercation/vim-colors-solarized'
-Bundle 'vim-scripts/bufexplorer.zip'
-Bundle 'ctrlpvim/ctrlp.vim'
-Bundle 'pangloss/vim-javascript'
-Bundle 'jnwhiteh/vim-golang'
-Bundle 'chase/vim-ansible-yaml'
-Bundle 'airblade/vim-gitgutter'
-Plugin 'vim-airline/vim-airline'
-Plugin 'vim-airline/vim-airline-themes'
-Plugin 'tpope/vim-eunuch'
-Plugin 'dense-analysis/ale'
+call plug#begin('~/.vim/plugged')
+
+Plug 'scrooloose/nerdtree'
+Plug 'altercation/vim-colors-solarized'
+Plug 'vim-scripts/bufexplorer.zip'
+Plug 'ctrlpvim/ctrlp.vim'
+Plug 'pangloss/vim-javascript'
+Plug 'jnwhiteh/vim-golang'
+Plug 'chase/vim-ansible-yaml'
+Plug 'airblade/vim-gitgutter'
+Plug 'vim-airline/vim-airline'
+Plug 'vim-airline/vim-airline-themes'
+Plug 'tpope/vim-eunuch'
+Plug 'dense-analysis/ale'
+
+call plug#end()
 
 "
 " behavior