migrate to vim-plug

.gitmodules

@@ -1,9 +1,6 @@
 [submodule "tools/icdiff.git"]
 	path = tools/icdiff.git
 	url = https://github.com/jeffkaufman/icdiff.git
-[submodule ".vim/bundle/Vundle.vim"]
-	path = .vim/bundle/Vundle.vim
-	url = https://github.com/VundleVim/Vundle.vim.git
 [submodule ".zprezto"]
 	path = .zprezto
 	url = https://github.com/sorin-ionescu/prezto.git

.vim/.gitignore

@@ -0,0 +1,3 @@
+autoload/
+plugged/
+

.vim/bundle/Vundle.vim

@@ -1 +0,0 @@
-Subproject commit fcc204205e3305c4f86f07e09cd756c7d06f0f00

.vimrc.common.epilogue

@@ -1,5 +1,4 @@
-call vundle#end()
+call plug#end()
-filetype plugin indent on
 
 " line ending
 set fileformats=unix,dos

.vimrc.common.plugins

@@ -1,21 +1,20 @@
-Plugin 'VundleVim/Vundle.vim'
+Plug 'https://github.com/cyplo/vim-colors-solarized.git'
-Plugin 'https://github.com/cyplo/vim-colors-solarized.git'
+Plug 'mileszs/ack.vim'
-Plugin 'mileszs/ack.vim'
+Plug 'scrooloose/nerdtree.git'
-Plugin 'scrooloose/nerdtree.git'
+Plug 'scrooloose/syntastic.git'
-Plugin 'scrooloose/syntastic.git'
+Plug 'wting/rust.vim'
-Plugin 'wting/rust.vim'
+Plug 'sjl/splice.vim.git'
-Plugin 'sjl/splice.vim.git'
+Plug 'vim-airline/vim-airline'
-Plugin 'vim-airline/vim-airline'
+Plug 'vim-airline/vim-airline-themes'
-Plugin 'vim-airline/vim-airline-themes'
+Plug 'timonv/vim-cargo'
-Plugin 'timonv/vim-cargo'
+Plug 'kien/ctrlp.vim'
-Plugin 'kien/ctrlp.vim'
+Plug 'junegunn/fzf.vim'
-Plugin 'junegunn/fzf.vim'
+Plug 'will133/vim-dirdiff'
-Plugin 'will133/vim-dirdiff'
+Plug 'tpope/vim-dispatch.git'
-Plugin 'tpope/vim-dispatch.git'
+Plug 'tpope/vim-fugitive.git'
-Plugin 'tpope/vim-fugitive.git'
+Plug 'tpope/vim-sensible'
-Plugin 'tpope/vim-sensible'
+Plug 'tpope/vim-cucumber'
-Plugin 'tpope/vim-cucumber'
+Plug 'airblade/vim-gitgutter.git'
-Plugin 'airblade/vim-gitgutter.git'
+Plug 'godlygeek/tabular'
-Plugin 'godlygeek/tabular'
+Plug 'plasticboy/vim-markdown'
-Plugin 'plasticboy/vim-markdown'
+Plug 'mhinz/vim-startify'
-Plugin 'mhinz/vim-startify'

.vimrc.common.prelude

@@ -46,10 +46,11 @@ set shiftwidth=4
 set expandtab
 
 " plugins
+if empty(glob('~/.vim/autoload/plug.vim'))
+  silent !curl -fLo ~/.vim/autoload/plug.vim --create-dirs
+    \ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
+  autocmd VimEnter * PlugInstall --sync | source $MYVIMRC
+endif
 
-filetype off 
+call plug#begin('~/.vim/plugged')
 
-set rtp+=~/.vim/bundle/Vundle.vim
-set rtp+=~/.fzf
-
-call vundle#begin()

.vimrc.cygwin

@@ -1,6 +0,0 @@
-source ~/dev/dotfiles/.vimrc.common.prelude
-source ~/dev/dotfiles/.vimrc.common.plugins
-source ~/dev/dotfiles/.vimrc.cygwin.plugins
-source ~/dev/dotfiles/.vimrc.common.epilogue
-source ~/dev/dotfiles/.vimrc.cygwin.settings
-

.vimrc.cygwin.plugins

@@ -1 +0,0 @@
-Plugin 'Shougo/neocomplete.vim'

.vimrc.cygwin.settings

@@ -1,10 +0,0 @@
-" plugins: neocomplete
-let g:neocomplete#enable_at_startup = 1
-let g:neocomplete#enable_smart_case = 1
-"" <CR>: close popup and save indent.
-inoremap <silent> <CR> <C-r>=<SID>my_cr_function()<CR>
-function! s:my_cr_function()
-  return (pumvisible() ? "\<C-y>" : "" ) . "\<CR>"
-endfunction
-"" <TAB>: completion.
-inoremap <expr><TAB>  pumvisible() ? "\<C-n>" : "\<TAB>"

.vimrc.linux.plugins

@@ -1 +1 @@
-Plugin 'Valloric/YouCompleteMe'
+Plug 'Valloric/YouCompleteMe'