Clean up plugins further

Switch most languages to vim-polyglot

vim/rc/plug-snapshot.rc.vim

@@ -1,58 +1,47 @@
 " Generated by vim-plug
-" Thu Oct 24 14:11:48 2019
+" Wed Feb  5 10:15:58 2020
 " :source this file in vim to restore the snapshot
 " or execute: vim -S snapshot.vim
 
 silent! let g:plugs['MatchTag'].commit = 'f190ed0'
-silent! let g:plugs['ale'].commit = '67d0ccc'
-silent! let g:plugs['asyncomplete.vim'].commit = 'db3ab51'
-silent! let g:plugs['coveragepy.vim'].commit = '321ea36'
+silent! let g:plugs['ale'].commit = '4afbf2f'
+silent! let g:plugs['asyncomplete.vim'].commit = '52f857a'
+silent! let g:plugs['coveragepy.vim'].commit = 'ae5abae'
 silent! let g:plugs['dash.vim'].commit = '25b17d9'
 silent! let g:plugs['file-line'].commit = '67c3590'
 silent! let g:plugs['force-vim'].commit = '69d9f68'
-silent! let g:plugs['fzf'].commit = '0c6c76e'
-silent! let g:plugs['fzf.vim'].commit = '359a80e'
+silent! let g:plugs['fzf'].commit = '0896036'
+silent! let g:plugs['fzf.vim'].commit = '467c327'
 silent! let g:plugs['goyo.vim'].commit = '6b6ed27'
-silent! let g:plugs['groovy.vim'].commit = 'f121908'
-silent! let g:plugs['jedi-vim'].commit = '08f13af'
-silent! let g:plugs['kotlin-vim'].commit = 'b9fa728'
+silent! let g:plugs['jedi-vim'].commit = '8d24b83'
 silent! let g:plugs['limelight.vim'].commit = '26e913a'
 silent! let g:plugs['pytest.vim'].commit = '847aa6f'
 silent! let g:plugs['python-mode'].commit = 'f94b0d7'
-silent! let g:plugs['rust.vim'].commit = '97fdc4e'
+silent! let g:plugs['rust.vim'].commit = 'db0137d'
 silent! let g:plugs['startuptime.vim'].commit = 'dfa57f5'
-silent! let g:plugs['swift.vim'].commit = 'd3d6615'
 silent! let g:plugs['tabular'].commit = '339091a'
-silent! let g:plugs['tagbar'].commit = 'ede1586'
-silent! let g:plugs['tcomment_vim'].commit = 'c9cecef'
-silent! let g:plugs['tmuxline.vim'].commit = '6386ac1'
-silent! let g:plugs['typescript-vim'].commit = '5a319ea'
-silent! let g:plugs['vim-airline'].commit = '62ec219'
-silent! let g:plugs['vim-airline-themes'].commit = '0d5c5c1'
-silent! let g:plugs['vim-android'].commit = '1d5d169'
+silent! let g:plugs['tagbar'].commit = '679a9d9'
+silent! let g:plugs['tcomment_vim'].commit = '239c0c0'
+silent! let g:plugs['tmuxline.vim'].commit = '7001ab3'
+silent! let g:plugs['vim-airline'].commit = 'f659a98'
+silent! let g:plugs['vim-airline-themes'].commit = '9d6b2fd'
+silent! let g:plugs['vim-android'].commit = '0849bcb'
 silent! let g:plugs['vim-argwrap'].commit = '7e3db5f'
 silent! let g:plugs['vim-colors-solarized'].commit = '528a59f'
-silent! let g:plugs['vim-endwise'].commit = '9b04cdc'
-silent! let g:plugs['vim-eunuch'].commit = 'e066a09'
-silent! let g:plugs['vim-fish'].commit = '50b95cb'
+silent! let g:plugs['vim-endwise'].commit = 'bf90d8b'
+silent! let g:plugs['vim-eunuch'].commit = '33e875b'
 silent! let g:plugs['vim-forcedotcom'].commit = 'a30ba7e'
-silent! let g:plugs['vim-fugitive'].commit = 'b09c5d2'
-silent! let g:plugs['vim-gitgutter'].commit = 'af20a9f'
-silent! let g:plugs['vim-go'].commit = '2f7a00e'
-silent! let g:plugs['vim-gradle'].commit = '508629f'
-silent! let g:plugs['vim-grepper'].commit = '8b78347'
-silent! let g:plugs['vim-gutentags'].commit = 'eecb136'
-silent! let g:plugs['vim-javascript'].commit = 'b6c8c84'
-silent! let g:plugs['vim-repeat'].commit = 'ae361be'
-silent! let g:plugs['vim-rsi'].commit = '8b7abe2'
-silent! let g:plugs['vim-startify'].commit = '520f277'
-silent! let g:plugs['vim-surround'].commit = 'fab8621'
-silent! let g:plugs['vim-tmux'].commit = '4e77341'
+silent! let g:plugs['vim-fugitive'].commit = '18582f4'
+silent! let g:plugs['vim-gitgutter'].commit = '2ef4f7e'
+silent! let g:plugs['vim-go'].commit = 'b686094'
+silent! let g:plugs['vim-grepper'].commit = 'dde6a66'
+silent! let g:plugs['vim-gutentags'].commit = '2317cec'
+silent! let g:plugs['vim-polyglot'].commit = '35ea4d2'
+silent! let g:plugs['vim-repeat'].commit = 'c947ad2'
+silent! let g:plugs['vim-rsi'].commit = 'ad8ba6b'
+silent! let g:plugs['vim-startify'].commit = '05122f0'
+silent! let g:plugs['vim-surround'].commit = 'f51a26d'
 silent! let g:plugs['vim-togglelist'].commit = 'cafedc4'
-silent! let g:plugs['vim-toml'].commit = 'a4ec206'
 silent! let g:plugs['vim-tsv'].commit = '116058a'
-silent! let g:plugs['vim-vinegar'].commit = '09ac84c'
-silent! let g:plugs['vividchalk.vim'].commit = 'c2d69cc'
+silent! let g:plugs['vim-vinegar'].commit = 'fcce70f'
 silent! let g:plugs['wombat256.vim'].commit = '8734ba4'
-
-PlugUpdate!

vim/rc/plugins.rc.vim

@@ -43,7 +43,6 @@ endif
 
 " Programming {{
 Plug 'FooSoft/vim-argwrap'
-
 Plug 'tomtom/tcomment_vim', { 'on': ['TComment', 'TCommentBlock'] }
 nnoremap // :TComment<CR>
 vnoremap // :TCommentBlock<CR>
@@ -53,14 +52,11 @@ if !g:vim_as_an_ide || g:gui.has_linter_features
     " We'll keep skip adding any of these features
 elseif has('nvim') || v:version >= 800
     Plug 'dense-analysis/ale'
-    set omnifunc=ale#completion#OmniFunc
     let g:airline#extensions#ale#enabled = 1
+    " Speed up first load time
     let g:ale_lint_on_enter = 0
 
-    " TODO: Maybe move this to something per language
-    " TODO: Handle installing of language servers on setup (see ./install-language-servers.sh)
-    " NOTE: Some of these are installed when bootstrapping environment,
-    " outside of vim setup
+    " NOTE: Some of these are installed when bootstrapping environment, outside of vim setup
     let g:ale_linters = {
         \ 'go': ['gopls', 'golint', 'gometalinter'],
         \ 'python': ['pyls', 'flake8', 'mypy', 'pylint'],
@@ -86,6 +82,8 @@ elseif has('nvim') || v:version >= 800
     " Create shortcut for ALEFix
     nnoremap <F4> :ALEFix<CR>
 
+    " Set ale completion as omni-func
+    set omnifunc=ale#completion#OmniFunc
     " Enable asyncomplete
     Plug 'prabirshrestha/asyncomplete.vim'
     " Add ALE to asyncomplete
@@ -131,35 +129,31 @@ endif
 " }} GUI
 
 " Filetypes {{
-Plug 'ViViDboarder/force-vim', { 'for': ['apex', 'visualforce'] }
-Plug 'ViViDboarder/vim-forcedotcom'
-" YAML seems to be supported by Vim now?
-" Plug 'avakhov/vim-yaml'
-Plug 'cespare/vim-toml'
-Plug 'dag/vim-fish'
-Plug 'fatih/vim-go', { 'do': ':GoInstallBinaries' }
-Plug 'hsanson/vim-android'
-Plug 'keith/swift.vim'
-Plug 'pangloss/vim-javascript'
-Plug 'pdurbin/vim-tsv'
-Plug 'tfnico/vim-gradle'
-Plug 'tmux-plugins/vim-tmux'
-Plug 'udalov/kotlin-vim'
-Plug 'vim-scripts/groovy.vim'
-Plug 'leafgarland/typescript-vim'
-Plug 'rust-lang/rust.vim'
+
+" Languages with custom configuration
+" Custom go
 let g:go_def_mapping_enabled = 0
 let g:go_version_warning = 0
+Plug 'fatih/vim-go', { 'do': ':GoInstallBinaries' }
+" Custom rust
 let g:rustfmt_autosave = 1
-" }}
-
-" Python {{
+Plug 'rust-lang/rust.vim'
+" Lots of custom python
 call s:smart_source_rc('plugins/python')
+
+" Disable polyglog for languages with more robust plugins
+let g:polyglot_disabled = ['python', 'go', 'rust']
+Plug 'sheerun/vim-polyglot'
+
+" Languages not in polyglot
+Plug 'ViViDboarder/force-vim', { 'for': ['apex', 'visualforce'] }
+Plug 'ViViDboarder/vim-forcedotcom'
+Plug 'hsanson/vim-android'
+Plug 'pdurbin/vim-tsv'
 " }}
 
 " Themes {{
 Plug 'altercation/vim-colors-solarized'
-Plug 'vim-scripts/vividchalk.vim'
 Plug 'vim-scripts/wombat256.vim'
 call s:smart_source_rc('plugins/goyo-limelight') " Distraction free editing
 " }}
@@ -170,5 +164,9 @@ Plug 'tpope/vim-endwise'
 Plug 'tpope/vim-eunuch'
 Plug 'tpope/vim-repeat'
 Plug 'tpope/vim-rsi' " emacs bindinds in insert
-call s:smart_source_rc('plugins/vim-togglelist')
+Plug 'godlygeek/tabular' " Tabular spacing
+
+Plug 'milkypostman/vim-togglelist'
+nnoremap <silent> <F6> :call ToggleQuickfixList()<CR>
+nnoremap <silent> <F7> :call ToggleLocationList()<CR>
 " }}

vim/rc/plugins/vim-togglelist.rc.vim

@@ -1,3 +0,0 @@
-Plug 'milkypostman/vim-togglelist'
-nnoremap <silent> <F6> :call ToggleQuickfixList()<CR>
-nnoremap <silent> <F7> :call ToggleLocationList()<CR>

vim/rc/ui.rc.vim

@@ -22,7 +22,7 @@ if IsGuiApp()
         set guifont=Consolas:h10:b
     elseif IsMac()
         try
-            set guifont=DejaVu\ Sans\ Mono\ for\ Powerline:h11
+            set guifont=DejaVu\ Sans\ Mono\ for\ Powerline:h12
         catch
             " Failed to set font, ok with default
         endtry