From 556b8baeaee5202031b15990d92188696b0cde1d Mon Sep 17 00:00:00 2001
From: ViViDboarder <ViViDboarder@gmail.com>
Date: Thu, 24 Oct 2019 13:47:40 -0700
Subject: [PATCH] Remove unused rc files

---
 vim/rc/init.rc.vim                  |  7 ++--
 vim/rc/plugins.rc.vim               |  4 +-
 vim/rc/plugins/deoplete.rc.vim      | 64 -----------------------------
 vim/rc/plugins/incsearch.rc.vim     |  4 --
 vim/rc/plugins/neocomplcache.rc.vim | 37 -----------------
 vim/rc/plugins/neocomplete.rc.vim   | 25 -----------
 vim/rc/plugins/neomake.rc.vim       |  1 -
 vim/rc/plugins/tcomment_vim.rc.vim  |  0
 8 files changed, 6 insertions(+), 136 deletions(-)
 delete mode 100644 vim/rc/plugins/deoplete.rc.vim
 delete mode 100644 vim/rc/plugins/incsearch.rc.vim
 delete mode 100644 vim/rc/plugins/neocomplcache.rc.vim
 delete mode 100644 vim/rc/plugins/neocomplete.rc.vim
 delete mode 100644 vim/rc/plugins/tcomment_vim.rc.vim

diff --git a/vim/rc/init.rc.vim b/vim/rc/init.rc.vim
index f737cbb..0ce2753 100644
--- a/vim/rc/init.rc.vim
+++ b/vim/rc/init.rc.vim
@@ -14,9 +14,10 @@ else
     set viminfo='100,n~/.vim/tmp/viminfo.vim
 endif
 
-" TODO: Should this go somewhere else?
-" Filetype extension
-au BufRead,BufNewFile *.md set syntax=markdown
+" Filetype extension overrides
+augroup syntax_overrides
+    au BufRead,BufNewFile *.md set syntax=markdown
+augroup end
 
 " Default to running vim like it's an IDE. To disable on a more restricted
 " machine, override this to 0 using an init.local.rc.vim
diff --git a/vim/rc/plugins.rc.vim b/vim/rc/plugins.rc.vim
index 72c9010..df1f55e 100644
--- a/vim/rc/plugins.rc.vim
+++ b/vim/rc/plugins.rc.vim
@@ -123,10 +123,10 @@ endif
 " Filetypes {{
 Plug 'ViViDboarder/force-vim', { 'for': ['apex', 'visualforce'] }
 Plug 'ViViDboarder/vim-forcedotcom'
-Plug 'avakhov/vim-yaml'
+" YAML seems to be supported by Vim now?
+" Plug 'avakhov/vim-yaml'
 Plug 'cespare/vim-toml'
 Plug 'dag/vim-fish'
-Plug 'dart-lang/dart-vim-plugin'
 Plug 'fatih/vim-go', { 'do': ':GoInstallBinaries' }
 Plug 'hsanson/vim-android'
 Plug 'keith/swift.vim'
diff --git a/vim/rc/plugins/deoplete.rc.vim b/vim/rc/plugins/deoplete.rc.vim
deleted file mode 100644
index ea402e9..0000000
--- a/vim/rc/plugins/deoplete.rc.vim
+++ /dev/null
@@ -1,64 +0,0 @@
-" Install plugins
-if has('nvim')
-    Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
-else
-    " Vim8 capable layer
-    Plug 'Shougo/deoplete.nvim'
-    Plug 'roxma/nvim-yarp'
-    Plug 'roxma/vim-hug-neovim-rpc'
-endif
-
-Plug 'Shougo/neoinclude.vim'
-Plug 'Shougo/neco-syntax'
-Plug 'zchee/deoplete-jedi', { 'for': 'python' }
-Plug 'zchee/deoplete-go', { 'do': 'make' }
-Plug 'landaire/deoplete-swift'
-
-" Auto complete with C-Space
-inoremap <silent><expr> <C-Space>
-        \ pumvisible() ? "\<C-n>" :
-        \ <SID>check_back_space() ? "\<C-Space>" :
-        \ deoplete#manual_complete()
-
-function! s:check_back_space() abort "{{{
-    let col = col('.') - 1
-    return !col || getline('.')[col - 1]  =~ '\s'
-endfunction
-"}}}
-
-" Auto close preview when done
-autocmd InsertLeave,CompleteDone * if pumvisible() == 0 | pclose | endif
-
-if !exists('g:deoplete#sources')
-    let g:deoplete#sources = {}
-endif
-if !exists('g:deoplete#keyword_patterns')
-    let g:deoplete#keyword_patterns = {}
-endif
-if !exists('g:deoplete#omni#input_patterns')
-    let g:deoplete#omni#input_patterns = {}
-endif
-
-" Set allowed sources
-let g:deoplete#sources._ = ['buffer', 'member', 'file', 'tag'] ", 'omni']
-let g:deoplete#sources.go = ['buffer', 'member', 'file', 'omni']
-let g:deoplete#sources.python = ['buffer', 'member', 'file', 'omni']
-" Set default keyword pattern (vim regex)
-let g:deoplete#keyword_patterns['default'] = '\h\w*'
-" Set omni patters for deoplete (python3 regex)
-let g:deoplete#omni#input_patterns.go = '([^. \t](\.|->))\w*'
-let g:deoplete#omni#input_patterns.python = '([^. \t]\.|^\s*@|^\s*from\s.+ import |^\s*from |^\s*import )\w*'
-
-" Default settings
-let g:deoplete#enable_at_startup = 1
-let g:deoplete#enable_smart_case = 1
-let g:deoplete#auto_completion_start_length = 2
-let g:deoplete#manual_completion_start_length = 0
-
-" Be extra sure that jedi works
-let g:jedi#auto_vim_configuration = 0
-let g:jedi#completions_enabled = 0
-let g:jedi#popup_on_dot = 0
-let g:jedi#popup_select_first = 0
-let g:jedi#show_call_signatures = 0
-let g:jedi#smart_auto_mappings = 0
diff --git a/vim/rc/plugins/incsearch.rc.vim b/vim/rc/plugins/incsearch.rc.vim
deleted file mode 100644
index 09cc477..0000000
--- a/vim/rc/plugins/incsearch.rc.vim
+++ /dev/null
@@ -1,4 +0,0 @@
-Plug 'haya14busa/incsearch.vim'
-map / <Plug>(incsearch-forward)
-map ? <Plug>(incsearch-backward)
-map g/ <Plug>(incsearch-stay)
diff --git a/vim/rc/plugins/neocomplcache.rc.vim b/vim/rc/plugins/neocomplcache.rc.vim
deleted file mode 100644
index 05e1822..0000000
--- a/vim/rc/plugins/neocomplcache.rc.vim
+++ /dev/null
@@ -1,37 +0,0 @@
-" Install plugins
-Plug 'Shougo/vimproc.vim', { 'do': 'make' }
-Plug 'Shougo/neocomplcache.vim'
-
-" Set configuration
-let g:neocomplcache_enable_at_startup = 1
-let g:neocomplcache_enable_smart_case = 1
-let g:neocomplcache_max_list = 10
-"let g:neocomplcache_enable_camel_case_completion = 1
-let g:neocomplcache_enable_fuzzy_completion = 1
-let g:neocomplcache_auto_completion_start_length = 2
-let g:neocomplcache_manual_completion_start_length = 0
-
-" omni_patterns
-if !exists('g:neocomplcache_omni_patterns')
-  let g:neocomplcache_omni_patterns = {}
-endif
-
-" omni_functions
-if !exists('g:neocomplcache_omni_functions')
-  let g:neocomplcache_omni_functions = {}
-endif
-
-" force_omni_patterns
-if !exists('g:neocomplcache_force_omni_patterns')
-  let g:neocomplcache_force_omni_patterns = {}
-endif
-let g:neocomplcache_force_omni_patterns['c'] = '[^.[:digit:] *\t]\%(\.\|->\)'
-let g:neocomplcache_force_omni_patterns['go'] = '[^.[:digit:] *\t]\%(\.\|->\)'
-let g:neocomplcache_force_omni_patterns['python'] =
-    \ '\%([^. \t]\.\|^\s*@\|^\s*from\s.\+import \|^\s*from \|^\s*import \)\w*'
-
-" keyword_patterns
-if !exists('g:neocomplcache_keyword_patterns')
-  let g:neocomplcache_keyword_patterns = {}
-endif
-let g:neocomplcache_keyword_patterns['default'] = '[0-9a-zA-Z:#_]\+'
diff --git a/vim/rc/plugins/neocomplete.rc.vim b/vim/rc/plugins/neocomplete.rc.vim
deleted file mode 100644
index 9683a3a..0000000
--- a/vim/rc/plugins/neocomplete.rc.vim
+++ /dev/null
@@ -1,25 +0,0 @@
-" Install plugins
-Plug 'Shougo/neocomplete.vim'
-
-" Configure plugins
-let g:acp_enableAtStartup = 0
-let g:neocomplete#enable_at_startup = 1
-let g:neocomplete#enable_smart_case = 1
-let g:neocomlete#max_list=10
-let g:neocomplete#auto_completion_start_length = 2
-let g:neocomplete#manual_completion_start_length = 0
-
-if !exists('g:neocomplete#keyword_patterns')
-    let g:neocomplete#keyword_patterns = {}
-endif
-let g:neocomplete#keyword_patterns['default'] = '\h\w*'
-" let g:neocomplete#keyword_patterns['python'] =
-"     \ '\%([^. \t]\.\|^\s*@\|^\s*from\s.\+import \|^\s*from \|^\s*import \)\w*'
-
-if !exists('g:neocomplete#force_omni_input_patterns')
-    let g:neocomplete#force_omni_input_patterns = {}
-endif
-let g:neocomplete#force_omni_input_patterns['cpp'] = '[^.[:digit:] *\t]\%(\.\|->\)\|\h\w*::'
-let g:neocomplete#force_omni_input_patterns['go'] = '[^.[:digit:] *\t]\%(\.\|->\)'
-let g:neocomplete#force_omni_input_patterns['python'] =
-    \ '\%([^. \t]\.\|^\s*@\|^\s*from\s.\+import \|^\s*from \|^\s*import \)\w*'
diff --git a/vim/rc/plugins/neomake.rc.vim b/vim/rc/plugins/neomake.rc.vim
index 2a4c8fb..40df9bf 100644
--- a/vim/rc/plugins/neomake.rc.vim
+++ b/vim/rc/plugins/neomake.rc.vim
@@ -1,6 +1,5 @@
 Plug 'neomake/neomake'
 nnoremap <F5> :Neomake<CR>
-command! TagsUpdate NeomakeSh ctags -R .
 
 let g:neomake_python_enabled_makers = ['flake8']
 let g:neomake_python_pytest_maker = {
diff --git a/vim/rc/plugins/tcomment_vim.rc.vim b/vim/rc/plugins/tcomment_vim.rc.vim
deleted file mode 100644
index e69de29..0000000