Disable Node, Perl, and Ruby providers

I never used these so disable attempting to load them.

UltiSnips/all.snippets

@@ -27,18 +27,15 @@ class Comment(object):
 endglobal
 
 snippet todo "TODO commment"
-`!p comment=Comment()
+`!p comment=Comment();snip.rv=comment.before()`TODO${1/.+/(/}$1${1/.+/)/}: $0`!p snip.rv=comment.after()`
-snip.rv=comment.before()`TODO${1/.+/(/}$1${1/.+/)/}: $0`!p snip.rv=comment.after()`
 endsnippet
 
 snippet fixme "FIXME comment"
-`!p comment=Comment()
+`!p comment=Comment();snip.rv=comment.before()`FIXME${1/.+/(/}$1${1/.+/)/}: $0`!p snip.rv=comment.after()`
-snip.rv=comment.before()`FIXME${1/.+/(/}$1${1/.+/)/}: $0`!p snip.rv=comment.after()`
 endsnippet
 
 snippet note "NOTE comment"
-`!p comment=Comment()
+`!p comment=Comment();snip.rv=comment.before()`NOTE: $0`!p snip.rv=comment.after()`
-snip.rv=comment.before()`NOTE: $0`!p snip.rv=comment.after()`
 endsnippet
 
 global !p

UltiSnips/help.snippets

@@ -1,13 +1,3 @@
-snippet _template "help file template"
-*`!p snip.rv = snip.fn`*	For Vim version 8.0	Last change: `!p
-from datetime import datetime
-snip.rv = datetime.now().strftime('%B %d, %Y')`
-
-$0
-
- vim:tw=78:ts=8:ft=help:norl:
-endsnippet
-
 snippet s "help section"
 ==============================================================================
 ${1:1}. ${2:Section}`!p

UltiSnips/python.snippets

@@ -3,13 +3,8 @@ snippet #! "Shebang"
 endsnippet
 
 snippet main "Python main stub"
-from argparse import ArgumentParser
-
-
 def main():
-	parser = ArgumentParser()
+	${0:pass}
-	$0
-	args = parser.parse_args()
 
 
 if __name__ == '__main__':

after/ftdetect/python.vim

@@ -1,6 +1,5 @@
 function! s:set_lit_cfg_filetype()
   set filetype=python
-  ALEDisableBuffer
 endfunction
 
 au BufNewFile,BufReadPost lit.cfg call s:set_lit_cfg_filetype()

after/ftplugin/cpp.lua

@@ -0,0 +1 @@
+vim.bo.commentstring = '//%s'

autoload/snippet.vim

@@ -1,16 +0,0 @@
-" Description: Expand snippet on file creation.
-
-" Attempt to expand the _template snippet if this is a new file.
-" https://noahfrederick.com/log/vim-templates-with-ultisnips-and-projectionist
-function! snippet#template() abort
-  " Return if non-empty buffer or file exists.
-  if !(line('$') == 1 && getline('$') ==# '') || filereadable(expand('%'))
-    return
-  endif
-  " Attempt to expand the _template snippet.
-  execute "normal! i_template\<C-r>=UltiSnips#ExpandSnippet()\<CR>"
-  if g:ulti_expand_res == 0
-    " Expansions failed, undo insert.
-    silent! undo
-  endif
-endfunction

coc-settings.json

@@ -1,17 +1,81 @@
 {
-  "clangd.inlayHints.enable": false,
   "cmake.lsp.enable": true,
   "diagnostic.enableHighlightLineNumber": false,
   "diagnostic.errorSign": "▸",
   "diagnostic.hintSign": "▸",
   "diagnostic.infoSign": "▸",
   "diagnostic.warningSign": "▸",
+  "inlayHint.enable": false,
   "powershell.integratedConsole.showOnStartup": false,
+  "snippets.priority": 100,
   "suggest.noselect": true,
   "yaml.schemas": {
     "https://gitlab.com/gitlab-org/gitlab/-/raw/master/app/assets/javascripts/editor/schema/ci.json": [
       ".gitlab-ci.yml",
+      ".gitlab/ci.yml",
       ".gitlab/ci/*.yml"
+    ],
+    "https://raw.githubusercontent.com/ansible/ansible-lint/main/src/ansiblelint/schemas/ansible-lint-config.json": [
+      ".ansible-lint",
+      ".config/ansible-lint.yml",
+      ".config/ansible-lint.yaml"
+    ],
+    "https://raw.githubusercontent.com/ansible/ansible-lint/main/src/ansiblelint/schemas/ansible-navigator.json": [
+      "ansible-navigator.yml",
+      "ansible-navigator.yaml"
+    ],
+    "https://raw.githubusercontent.com/ansible/ansible-lint/main/src/ansiblelint/schemas/execution-environment.json": [
+      "execution-environment.yml",
+      "execution-environment.yaml"
+    ],
+    "https://raw.githubusercontent.com/ansible/ansible-lint/main/src/ansiblelint/schemas/galaxy.json": [
+      "galaxy.yml",
+      "galaxy.yaml"
+    ],
+    "https://raw.githubusercontent.com/ansible/ansible-lint/main/src/ansiblelint/schemas/inventory.json": [
+      "inventory.yaml",
+      "inventory.yml",
+      "inventory/*.yml",
+      "inventory/*.yaml"
+    ],
+    "https://raw.githubusercontent.com/ansible/ansible-lint/main/src/ansiblelint/schemas/meta-runtime.json": [
+      "meta/runtime.yml",
+      "meta/runtime.yaml"
+    ],
+    "https://raw.githubusercontent.com/ansible/ansible-lint/main/src/ansiblelint/schemas/molecule.json": [
+      "molecule/*/molecule.yml",
+      "molecule/*/molecule.yaml"
+    ],
+    "https://raw.githubusercontent.com/ansible/ansible-lint/main/src/ansiblelint/schemas/playbook.json": [
+      "playbooks/*.yml",
+      "playbooks/*.yaml"
+    ],
+    "https://raw.githubusercontent.com/ansible/ansible-lint/main/src/ansiblelint/schemas/requirements.json": [
+      "requirements.yml",
+      "requirements.yaml"
+    ],
+    "https://raw.githubusercontent.com/ansible/ansible-lint/main/src/ansiblelint/schemas/rulebook.json": [
+      "rulebooks/*.yml",
+      "rulebooks/*.yaml"
+    ],
+    "https://raw.githubusercontent.com/ansible/ansible-lint/main/src/ansiblelint/schemas/tasks.json": [
+      "tasks/*.yml",
+      "tasks/*.yaml",
+      "handlers/*.yml",
+      "handlers/*.yaml"
+    ],
+    "https://raw.githubusercontent.com/ansible/ansible-lint/main/src/ansiblelint/schemas/vars.json": [
+      "playbooks/vars/*.yml",
+      "playbooks/vars/*.yaml",
+      "vars/*.yml",
+      "vars/*.yaml",
+      "defaults/*.yml",
+      "defaults/*.yaml",
+      "host_vars/*.yml",
+      "host_vars/*.yaml",
+      "group_vars/*.yml",
+      "group_vars/*.yaml"
     ]
-  }
+  },
+  "snippets.ultisnips.pythonPrompt": false
 }

colors/fresh.vim

@@ -202,11 +202,6 @@ if has('gui_running') || &t_Co == 256
   call s:hi('Important', '220', '', 'bold')
   call s:hi('Research', '202', '', 'bold')
 
-  call s:hi('ALEError', '160', '', '')
-  call s:hi('ALEWarning', '129', '', '')
-  call s:hi('ALEErrorSign', '160', '233', 'bold')
-  call s:hi('ALEWarningSign', '129', '233', 'bold')
-
   call s:hi('CocErrorSign', '160', '233', '')
   call s:hi('CocErrorFloat', '160', '235', '')
   call s:hi('CocWarningSign', '129', '233', '')

ginit.vim

@@ -1,9 +1,5 @@
 if exists(':GuiFont')
-  if platform#is_windows()
+  GuiFont! CaskaydiaCove\ Nerd\ Font\ Mono:h9
-    GuiFont! Source\ Code\ Pro:h10
-  else
-    GuiFont Source\ Code\ Pro:h9
-  endif
 endif
 
 if exists(':GuiTabline')

plugin/autocmds.vim

@@ -18,10 +18,6 @@ augroup benieAugroup
 
   " Read template into buffer then send line 1 to the black hold register
   au BufNewFile todo.md read ~/.vim/templates/skeleton.todo.md | 1delete _
-  " Attempt to expand snippet named `_template` if it exists
-  au BufNewFile * silent! call snippet#template()
-  " Do the same when filetype changes to help
-  au FileType help silent! call snippet#template()
 
   " Augment vim-signify by modifying it's autocmds
   au User SignifyAutocmds call do#signify()

plugin/mappings.vim

@@ -1,12 +1,14 @@
 " coc.nvim
-nmap <silent> <leader>fi <Plug>(coc-fix-current)
+inoremap <silent><expr> <TAB> coc#pum#visible() ? coc#pum#confirm() : "\<TAB>"
-nmap <silent> <leader>gd <Plug>(coc-definition)
+nnoremap <silent> <leader>fi <Plug>(coc-fix-current)
-nmap <silent> <leader>gt <Plug>(coc-type-definition)
+nnoremap <silent> <leader>gd <Plug>(coc-definition)
-nmap <silent> <leader>sd <Plug>(coc-diagnostic-info)
+nnoremap <silent> <leader>gt <Plug>(coc-type-definition)
-nmap <silent> <leader>gr <Plug>(coc-references)
+nnoremap <silent> <leader>sd <Plug>(coc-diagnostic-info)
-nmap <silent> K :call do#show_documentation()<CR>
+nnoremap <silent> <leader>gr <Plug>(coc-references)
-nmap <silent> <C-n> <Plug>(coc-diagnostic-next)
+nnoremap <silent> <leader>gu <Plug>(coc-references-used)
-nmap <silent> <C-p> <Plug>(coc-diagnostic-prev)
+nnoremap <silent> K :call do#show_documentation()<CR>
+nnoremap <silent> <C-n> <Plug>(coc-diagnostic-next)
+nnoremap <silent> <C-p> <Plug>(coc-diagnostic-prev)
 
 if has('nvim')
   " Make nvim :terminal more like vim :terminal
@@ -64,7 +66,12 @@ nnoremap k gk
 nnoremap <leader>w :w!<CR>
 
 " Switch panes in a tmux aware way
-if !has('win32')
+if !tmux#inSession() || has('win32')
+  nnoremap <silent> <C-h> <C-w>h
+  nnoremap <silent> <C-j> <C-w>j
+  nnoremap <silent> <C-k> <C-w>k
+  nnoremap <silent> <C-l> <C-w>l
+else
   nnoremap <silent> <C-h> :TmuxNavigateLeft<CR>
   nnoremap <silent> <C-j> :TmuxNavigateDown<CR>
   nnoremap <silent> <C-k> :TmuxNavigateUp<CR>
@@ -84,11 +91,6 @@ if !has('win32')
     tnoremap <silent> <C-w>k <C-w>N:TmuxNavigateUp<CR>
     tnoremap <silent> <C-w>l <C-w>N:TmuxNavigateRight<CR>
   endif
-else
-  nnoremap <silent> <C-h> <C-w>h
-  nnoremap <silent> <C-j> <C-w>j
-  nnoremap <silent> <C-k> <C-w>k
-  nnoremap <silent> <C-l> <C-w>l
 endif
 
 " Quick tabs

plugin/settings.vim

@@ -112,6 +112,8 @@ set isfname-=:
 set hlsearch incsearch
 " Set ignore search case unless mixed
 set ignorecase smartcase
+" Don't ignore case in command line file completions
+set nofileignorecase
 
 " Allow buffers with changes to be hidden
 set hidden

tasks.yaml

@@ -7,14 +7,11 @@
       # Conqueror of Completion
       - repo: neoclide/coc.nvim
         branch: release
-      # Snippet engine & snippets
+      # Snippet collection
-      - repo: SirVer/ultisnips
       - repo: honza/vim-snippets
       # Completion for vimscript
       - repo: vim-scripts/vimomni
         mode: opt
-      # Asynchronous Lint Engine
-      - repo: w0rp/ale
       # Version control differences in the sign column
       - repo: mhinz/vim-signify
       # Conflict marker utilities
@@ -48,14 +45,14 @@
       - repo: kana/vim-textobj-user
       # TODO: Doesn't work with nvim
       - repo: kana/vim-textobj-entire
-      # Text object for function parameters
-      - repo: sgur/vim-textobj-parameter
       # Text object for URI's
       - repo: jceb/vim-textobj-uri
       # Text object for comment blocks
       - repo: glts/vim-textobj-comment
       # Text object for sentences
       - repo: reedes/vim-textobj-sentence
+      # Text object & bindings for arguments
+      - repo: PeterRincker/vim-argumentative
 
       # ================================ Tim Pope ==============================
 
@@ -97,7 +94,7 @@
 
       # =============================== Syntax =================================
 
-      # Python folding
+      - repo: editorconfig/editorconfig-vim
       - repo: kalekundert/vim-coiled-snake
       - repo: kbenzie/vim-spirv
       - repo: rperier/vim-cmake-syntax
@@ -109,6 +106,8 @@
       - repo: joshglendenning/vim-caddyfile
       - repo: kbenzie/vim-khr
       - repo: jrozner/vim-antlr
+      - repo: sophacles/vim-bundle-mako
+      - repo: Glench/Vim-Jinja2-Syntax
 
 - name: remove minpac directory
   when: ansible_os_family != "Windows"

vimrc

@@ -15,6 +15,11 @@ endif
 set runtimepath+=~/.config/work
 set packpath+=~/.config/work
 
+" Disable unused providers
+let g:loaded_node_provider = 0
+let g:loaded_perl_provider = 0
+let g:loaded_ruby_provider = 0
+
 " Markdown fenced code block languages
 let g:markdown_fenced_languages =
   \ ['cpp', 'c', 'cmake', 'console', 'sh', 'vim', 'python', 'yaml']
@@ -59,7 +64,7 @@ let g:coc_global_extensions = [
 \   'coc-json',
 \   'coc-marketplace',
 \   'coc-pyright',
-\   'coc-ultisnips',
+\   'coc-snippets',
 \   'coc-vimlsp',
 \   'coc-yaml',
 \]
@@ -70,14 +75,6 @@ if has("win32")
 endif
 let g:coc_default_semantic_highlight_groups = 0
 
-" ale
-let g:ale_sign_error = '▸'
-let g:ale_sign_warning = '▸'
-let g:ale_echo_msg_format = '[%linter%] %s (%code%)'
-let g:ale_linters = {'c': [], 'cpp': []}
-let g:ale_cmake_cmakelint_options =
-      \ '-convention/filename,-package/consistency,-package/stdargs'
-
 " vim-signify
 let g:signify_sign_change = '~'
 
@@ -114,4 +111,6 @@ let g:table_mode_toggle_map = 'M'
 let g:DoxygenToolkit_commentType = 'C++'
 
 " vim-spirv
+let g:spirv_enable_current_id = 0
+let g:spirv_enable_extinst_error = 0
 let g:spirv_current_id_highlight = 'ctermbg=234, guibg=#1c1c1c'