Plug instead of Vundle

.vimrc

@@ -2,52 +2,55 @@ set nocompatible
 filetype off
 set background=light
 
-set rtp+=~/.vim/bundle/Vundle.vim
 let g:python_host_prog = '/usr/bin/python2'
 let g:python3_host_prog = '/usr/bin/python3'
 let g:ruby_host_prog = 'rvm system do neovim-ruby-host'
 let g:node_host_prog = '/usr/lib/node_modules/neovim/bin/cli.js'
 set clipboard+=unnamedplus
 
-call vundle#begin()
+" Specify a directory for plugins
+" - For Neovim: ~/.local/share/nvim/plugged
+" - Avoid using standard Vim directory names like 'plugin'
+call plug#begin('~/.vim/plugged')
 
-" let Vundle manage Vundle, required
-Plugin 'VundleVim/Vundle.vim'
+Plug 'junegunn/vim-plug'
 
-Plugin 'Valloric/YouCompleteMe'
-Plugin 'docunext/closetag.vim'
-Plugin 'editorconfig/editorconfig-vim'
-Plugin 'scrooloose/nerdtree'
-Plugin 'StanAngeloff/php.vim'
-Plugin 'majutsushi/tagbar'
-Plugin 'tpope/vim-commentary'
-Plugin 'airblade/vim-gitgutter'
+Plug 'tpope/vim-sensible'
+Plug 'Valloric/YouCompleteMe', { 'do': './install.py' }
+Plug 'docunext/closetag.vim'
+Plug 'editorconfig/editorconfig-vim'
+Plug 'scrooloose/nerdtree', { 'on':  'NERDTreeToggle' }
+Plug 'majutsushi/tagbar'
+Plug 'tpope/vim-commentary'
+Plug 'airblade/vim-gitgutter'
 
-Plugin 'Shougo/neosnippet'
-Plugin 'Shougo/neosnippet-snippets'
+Plug 'Shougo/neosnippet'
+Plug 'Shougo/neosnippet-snippets'
 
-Plugin 'qpkorr/vim-bufkill'
-Plugin 'kchmck/vim-coffee-script'
+Plug 'qpkorr/vim-bufkill'
+Plug 'pseewald/vim-anyfold'
+
+Plug 'kchmck/vim-coffee-script', { 'for': 'coffee' }
+Plug 'StanAngeloff/php.vim', { 'for': 'php' }
 " GPG support
 " Plugin 'mhinz/vim-signify'
 " Plugin 'godlygeek/tabular'
-Plugin 'plasticboy/vim-markdown'
-Plugin 'junegunn/goyo.vim'
+Plug 'plasticboy/vim-markdown'
+Plug 'junegunn/goyo.vim', { 'for': 'markdown' }
 " Plugin 'joonty/vdebug'
 " Fountain support
-" Plugin 'kblin/vim-fountain'
-" Plugin 'leafgarland/typescript-vim'
-Plugin 'jason0x43/vim-js-indent'
+Plug 'kblin/vim-fountain', { 'for': 'fountain' }
+Plug 'leafgarland/typescript-vim', { 'for': ['ts', 'typescript' ]}
+Plug 'jason0x43/vim-js-indent', { 'for': ['js', 'javascript']}
 " Plugin 'Quramy/tsuquyomi'
-Plugin 'evidens/vim-twig'
-Plugin 'jwalton512/vim-blade'
-Plugin 'pseewald/vim-anyfold'
-Plugin 'elzr/vim-json'
-Plugin 'mustache/vim-mustache-handlebars'
+Plug 'evidens/vim-twig', { 'for': 'twig' }
+Plug 'jwalton512/vim-blade', { 'for': ['blade', 'blade.php']}
+Plug 'elzr/vim-json', { 'for': 'json' }
+Plug 'mustache/vim-mustache-handlebars', { 'for': ['mustache', 'handlebars'] }
 
-Plugin 'maksimr/vim-jsbeautify'
+Plug 'maksimr/vim-jsbeautify', { 'for': 'js' }
 
-call vundle#end()
+call plug#end()
 filetype plugin indent on
 
 syntax enable