Update vimrc

.gitmodules

@@ -1,7 +1,3 @@
-[submodule "editors/vim/bundle/Vundle.vim"]
-	path = editors/vim/bundle/Vundle.vim
-	url = https://github.com/VundleVim/Vundle.vim.git
-	branch = master
 [submodule "terminals/colors/base16-shell"]
 	path = terminals/colors/base16-shell
 	url = https://github.com/chriskempson/base16-shell.git

editors/vim/bundle/Vundle.vim

@@ -1 +0,0 @@
-Subproject commit 6497e37694cd2134ccc3e2526818447ee8f20f92

editors/vim/plugins.vim

@@ -1,61 +1,51 @@
-call vundle#begin()
+call plug#begin('~/.vim/plugged')
 
-" vundle needs to handle itself
+Plug 'vim-airline/vim-airline' | Plug 'vim-airline/vim-airline-themes'
-Plugin 'VundleVim/Vundle.vim'
-
-Plugin 'vim-airline/vim-airline'
-Plugin 'vim-airline/vim-airline-themes'
 
 " colorschemes
 " Plug 'dracula/vim'
-Plugin 'joshdick/onedark.vim'
+Plug 'joshdick/onedark.vim'
 
-Plugin 'editorconfig/editorconfig-vim'
+Plug 'editorconfig/editorconfig-vim'
 
 " Notetaking
-Plugin 'xolox/vim-misc'
+Plug 'xolox/vim-misc'
-Plugin 'xolox/vim-notes'
+Plug 'xolox/vim-notes'
 
-" reStructuredText
+Plug 'Rykka/riv.vim', { 'for': 'rst' }						" reStructuredText
-Plugin 'Rykka/riv.vim'
-Plugin 'Rykka/InstantRst'					" instant preview
 
-Plugin 'cespare/vim-toml'					" toml highlighting
+Plug 'cespare/vim-toml', { 'for': 'toml' }					" toml highlighting
 
-" Plugin 'w0rp/ale'							" syntax checking
+Plug 'ervandew/supertab'									" simple autocomplete
-Plugin 'ervandew/supertab'
+Plug 'tpope/vim-commentary'									" (un)comment
-Plugin 'tpope/vim-commentary'
+Plug 'tpope/vim-surround'									" handle surroundings
-Plugin 'tpope/vim-surround'
+Plug 'tpope/vim-repeat'										" make plugin commands repeatable
-Plugin 'tpope/vim-repeat'					" make plugin commands repeatable
+Plug 'tpope/vim-dispatch'									" dispatch into tmux panes
-Plugin 'tpope/vim-dispatch'					" dispatch into tmux panes
+Plug 'vim-scripts/ReplaceWithRegister'
-Plugin 'vim-scripts/ReplaceWithRegister'
+Plug 'mattn/gist-vim' | Plug 'mattn/webapi-vim'				" create gist from within vim
-Plugin 'mattn/vim-maketable'				" create tables from selection
+Plug 'Raimondi/delimitMate'									" autoclose quotes and brackets
-Plugin 'dhruvasagar/vim-table-mode'			" handle tables
+Plug 'tpope/vim-fugitive'									" awesome git plugin
-Plugin 'mattn/webapi-vim'					" web api
+Plug 'scrooloose/nerdtree', { 'on': ['NERDTreeToggle', 'NERDTreeFind'] } 
-Plugin 'mattn/gist-vim'						" create gist from within vim
+Plug 'Xuyuanp/nerdtree-git-plugin', { 'on': ['NERDTreeToggle', 'NERDTreeFind'] } 
-Plugin 'michaeljsmith/vim-indent-object'	" indent as textobject
+Plug 'ryanoasis/vim-devicons'								" icons
-Plugin 'Raimondi/delimitMate'			" autoclose quotes and brackets
+Plug 'ctrlpvim/ctrlp.vim'									" fuzzy file finder
-"Plugin 'SirVer/ultisnips'				" snippets
+Plug 'neomake/neomake'										" async linting and making
-Plugin 'tpope/vim-fugitive'
+Plug 'benmills/vimux'										" tmux support
-Plugin 'scrooloose/nerdtree', { 'on': ['NERDTreeToggle', 'NERDTreeFind'] } | Plugin 'Xuyuanp/nerdtree-git-plugin' | Plugin 'ryanoasis/vim-devicons' 
+Plug 'sickill/vim-pasta'									" context aware pasting
-Plugin 'ctrlpvim/ctrlp.vim'
+Plug 'junegunn/goyo.vim'									" distraction free writing
-Plugin 'neomake/neomake'
+
-Plugin 'benmills/vimux'
+Plug 'elzr/vim-json', { 'for': 'json' }						" better JSON support
-Plugin 'AndrewRadev/splitjoin.vim'
+
-Plugin 'tpope/vim-sleuth'				" autodetect indent style (tabs vs. spaces)
+" Python
-Plugin 'sickill/vim-pasta'				" context aware pasting
+Plug 'davidhalter/jedi-vim', { 'for': 'python' }			" python autocomplete
-Plugin 'elzr/vim-json'					" JSON support
-Plugin 'davidhalter/jedi-vim'			" python autocomplete
-Plugin 'junegunn/goyo.vim'				" distraction free writing
 
 " Rust plugins
-Plugin 'racer-rust/vim-racer'			" rust autocomplete
+Plug 'racer-rust/vim-racer', { 'for': 'rust' }				" rust autocomplete
-Plugin 'rust-lang/rust.vim'				" rust syntax, error checking, etc
+Plug 'rust-lang/rust.vim', { 'for': 'rust' }				" rust syntax, error checking, etc
-Plugin 'jtdowney/vimux-cargo'			" run cargo in tmux using vimux
+Plug 'jtdowney/vimux-cargo', { 'for': 'rust' }				" run cargo in tmux using vimux
 
 " LaTeX
-Plugin 'lervag/vimtex'
+Plug 'lervag/vimtex', { 'for': ['tex', 'plaintex'] }
-
-call vundle#end()
 
+call plug#end()
 " vim: set filetype=vim ts=4 sw=4 tw=120 noet :

editors/vim/vimrc

@@ -1,13 +1,10 @@
 " vundle
 " set vIM mode
 set nocompatible
-filetype off
+filetype plugin indent on
-set rtp+=~/.vim/bundle/Vundle.vim
 
 source ~/.vim/plugins.vim
 
-filetype plugin indent on
-
 " Get the defaults that most users want.
 source $VIMRUNTIME/defaults.vim
 
@@ -85,6 +82,8 @@ set fileencoding=utf-8
 " break at last word instead of last char
 set linebreak
 
+set autoread	" autoload file changes
+
 " tab control
 set noexpandtab				"  insert tabs
 set smarttab