Don't ignore case in command line file completions

Also change the completion confirm mapping to <TAB> and make the
priority of snippets higher.

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()

coc-settings.json

@@ -1,5 +1,5 @@
 {
-  "clangd.inlayHints.enable": false,
+  "inlayHint.enable": false,
   "cmake.lsp.enable": true,
   "diagnostic.enableHighlightLineNumber": false,
   "diagnostic.errorSign": "▸",
@@ -7,6 +7,7 @@
   "diagnostic.infoSign": "▸",
   "diagnostic.warningSign": "▸",
   "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": [

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', '')

plugin/mappings.vim

@@ -1,12 +1,13 @@
 " 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> K :call do#show_documentation()<CR>
-nmap <silent> <C-p> <Plug>(coc-diagnostic-prev)
+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 +65,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 +90,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
@@ -152,11 +154,7 @@ set formatoptions+=rq
 
 " Always show the signcolum
 if exists('&signcolumn')
-  try
+  set signcolumn=yes
-    set signcolumn=number
-  catch /E474/
-    set signcolumn=yes
-  endtry
 endif
 
 " Enable modeline

plugin/statusline.vim

@@ -3,12 +3,12 @@ scriptencoding utf-8
 set laststatus=2
 
 " Define color variables.
-let g:statusline#light_green  = {'fg': ['235', '#080808'], 'bg': [ '35', '#0087ff']}
+let g:statusline#light_green  = {'fg': ['235', '#262626'], 'bg': [ '35', '#00af5f']}
-let g:statusline#light_blue   = {'fg': ['235', '#080808'], 'bg': [ '33', '#0087ff']}
+let g:statusline#light_blue   = {'fg': ['235', '#262626'], 'bg': [ '33', '#0087ff']}
-let g:statusline#light_orange = {'fg': ['235', '#080808'], 'bg': ['209', '#eb754d']}
+let g:statusline#light_orange = {'fg': ['235', '#262626'], 'bg': ['209', '#ff875f']}
-let g:statusline#light_red    = {'fg': ['235', '#080808'], 'bg': ['124', '#af0000']}
+let g:statusline#light_red    = {'fg': ['235', '#262626'], 'bg': ['124', '#af0000']}
-let g:statusline#light_grey   = {'fg': ['250', '#bcbcbc'], 'bg': ['236', '#303030']}
+let g:statusline#light_grey   = {'fg': ['235', '#262626'], 'bg': ['246', '#949494']}
-let g:statusline#light_violet = {'fg': ['235', '#080808'], 'bg': [ '99', '#986fec']}
+let g:statusline#light_violet = {'fg': ['235', '#262626'], 'bg': [ '99', '#875fff']}
 let g:statusline#dark_white   = {'fg': [ '15', '#ffffff'], 'bg': ['233', '#121212']}
 let g:statusline#dark_yellow  = {'fg': ['179', '#dfaf5f'], 'bg': ['233', '#121212']}
 let g:statusline#dark_grey    = {'fg': ['244', '#808080'], 'bg': ['233', '#121212']}

tasks.yaml

@@ -1,17 +1,119 @@
 ---
-- include_vars: ~/.config/nvim/vars.yaml
+- set_fact:
+    plugin_dir: '{{vim_config_dir}}/pack/managed'
+    plugins:
+      # ====================== Completion & Diagnostics ========================
 
-- name: clone plugin repos
+      # Conqueror of Completion
+      - repo: neoclide/coc.nvim
+        branch: release
+      # Snippet collection
+      - repo: honza/vim-snippets
+      # Completion for vimscript
+      - repo: vim-scripts/vimomni
+        mode: opt
+      # Version control differences in the sign column
+      - repo: mhinz/vim-signify
+      # Conflict marker utilities
+      - repo: rhysd/conflict-marker.vim
+      # Doxygen documentation stubs
+      - repo: vim-scripts/DoxygenToolkit.vim
+        mode: opt
+      # Easy table manipulation
+      - repo: dhruvasagar/vim-table-mode
+
+      # =========================== User Interface =============================
+
+      # Sanley numbered tabs in tabline
+      - repo: mkitt/tabline.vim
+      # Fuzzy finder
+      # TODO: Still necessary?
+      - repo: junegunn/fzf
+      - repo: junegunn/fzf.vim
+      # Replay macros with the enter key
+      - repo: wincent/replay
+      # Improved % matching
+      - repo: andymass/vim-matchup
+      # Forgot about this...
+      - repo: kbenzie/note.vim
+      # View term and hex colors
+      - repo: guns/xterm-color-table.vim
+
+      # ============================== Text Objects ============================
+
+      # Library for creating text objects
+      - 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
+
+      # ================================ Tim Pope ==============================
+
+      # Toggle comments
+      - repo: tpope/vim-commentary
+      # Edit delimiters
+      - repo: tpope/vim-surround
+      # Better dot command
+      - repo: tpope/vim-repeat
+      # Git wrapper
+      - repo: tpope/vim-fugitive
+      # Unix command warppers
+      - repo: tpope/vim-eunuch
+      # Improved directory browser
+      - repo: tpope/vim-vinegar
+      # PascalCase to under_score to camelCase
+      # TODO: Copy the good bit remove this plugin
+      - repo: tpope/vim-abolish
+      # Mappings for pairs of tasks
+      - repo: tpope/vim-unimpaired
+      # Sane date manipulation
+      - repo: tpope/vim-speeddating
+      # Wisely add end{if,function} fork with cmake support
+      - repo: godbyk/vim-endwise
+        branch: patch-1
+      # Text object & formatting for json
+      - repo: tpope/vim-jdaddy
+      # Granular project configuration
+      - repo: tpope/vim-projectionist
+
+      # ================================ tmux ==================================
+
+      # Seemless vim/tmux pane navigation
+      - repo: 'christoomey/vim-tmux-navigator'
+        mode: opt
+      # Enable focus events when in tmux session
+      - repo: 'tmux-plugins/vim-tmux-focus-events'
+        mode: opt
+
+      # =============================== Syntax =================================
+
+      - repo: kalekundert/vim-coiled-snake
+      - repo: kbenzie/vim-spirv
+      - repo: rperier/vim-cmake-syntax
+      - repo: tikhomirov/vim-glsl
+      - repo: beyondmarc/hlsl.vim
+      - repo: frasercrmck/opencl.vim
+      - repo: asciidoc/vim-asciidoc
+      - repo: mustache/vim-mustache-handlebars
+      - repo: joshglendenning/vim-caddyfile
+      - repo: kbenzie/vim-khr
+      - repo: jrozner/vim-antlr
+      - repo: sophacles/vim-bundle-mako
+
+- name: remove minpac directory
   when: ansible_os_family != "Windows"
-  git:
+  file:
-    repo: 'https://github.com/{{item.repo}}.git'
+    path: '{{vim_config_dir}}/pack/minpac'
-    dest: '~/.config/nvim/pack/minpac/{{lookup("vars", "item.mode", default="start")}}/{{item.repo | regex_replace("^.*\/(.*)$", "\1")}}'
+    state: absent
-    version: '{{lookup("vars", "item.branch", default="HEAD")}}'
+- name: remove minpac directory
-  with_items: '{{plugins}}'
-
-- name: clone plugin repos
   when: ansible_os_family == "Windows"
-  win_git:
+  win_file:
-    repo: 'https://github.com/{{item.repo}}.git'
+    path: '{{vim_config_dir}}/pack/minpac'
-    dest: '{{ansible_env.LOCALAPPDATA}}/nvim/pack/minpac/{{lookup("vars", "item.mode", default="start")}}/{{item.repo | regex_replace("^.*\/(.*)$", "\1")}}'
+    state: absent
-    version: '{{lookup("vars", "item.branch", default="HEAD")}}'

vars.yaml

@@ -1,66 +0,0 @@
----
-plugins:
-  - repo: mkitt/tabline.vim
-  - repo: neoclide/coc.nvim
-    branch: release
-  - repo: SirVer/ultisnips
-  - repo: honza/vim-snippets
-  - repo: vim-scripts/vimomni
-    mode: opt
-  - repo: w0rp/ale
-  - repo: mhinz/vim-signify
-
-  # Text Objects
-  - repo: kana/vim-textobj-user
-  # TODO: Doesn't work with nvim
-  - repo: kana/vim-textobj-entire
-  - repo: sgur/vim-textobj-parameter
-  - repo: jceb/vim-textobj-uri
-  - repo: glts/vim-textobj-comment
-  - repo: reedes/vim-textobj-sentence
-
-  # Tim Pope
-  - repo: tpope/vim-commentary
-  - repo: tpope/vim-surround
-  - repo: tpope/vim-repeat
-  - repo: tpope/vim-fugitive
-  - repo: tpope/vim-eunuch
-  - repo: tpope/vim-vinegar
-  - repo: tpope/vim-abolish
-  - repo: tpope/vim-unimpaired
-  - repo: tpope/vim-speeddating
-  - repo: godbyk/vim-endwise
-    branch: patch-1
-  - repo: tpope/vim-jdaddy
-  - repo: tpope/vim-projectionist
-
-  # Still necessary?
-  - repo: junegunn/fzf
-  - repo: junegunn/fzf.vim
-
-  # Forgot about this...
-  - repo: kbenzie/note.vim
-
-  # TODO: Move to tmux role?
-  # Pack 'christoomey/vim-tmux-navigator'
-  # Pack 'tmux-plugins/vim-tmux-focus-events'
-
-  - repo: wincent/replay
-  - repo: andymass/vim-matchup
-  - repo: dhruvasagar/vim-table-mode
-  - repo: vim-scripts/DoxygenToolkit.vim
-    mode: opt
-  - repo: guns/xterm-color-table.vim
-
-  # Syntax
-  - repo: kalekundert/vim-coiled-snake
-  - repo: kbenzie/vim-spirv
-  - repo: rperier/vim-cmake-syntax
-  - repo: tikhomirov/vim-glsl
-  - repo: beyondmarc/hlsl.vim
-  - repo: frasercrmck/opencl.vim
-  - repo: asciidoc/vim-asciidoc
-  - repo: mustache/vim-mustache-handlebars
-  - repo: joshglendenning/vim-caddyfile
-  - repo: kbenzie/vim-khr
-  - repo: jrozner/vim-antlr

vimrc

@@ -15,141 +15,7 @@ endif
 set runtimepath+=~/.config/work
 set packpath+=~/.config/work
 
-" tabline.vim - sanely numbered tabs
+" Markdown fenced code block languages
-Pack 'mkitt/tabline.vim'
-
-" coc.nvim - Conqueror of Completion
-Pack 'neoclide/coc.nvim', {'branch': 'release'}
-let g:coc_global_extensions = [
-\   'coc-clangd',
-\   'coc-cmake',
-\   'coc-css',
-\   'coc-docker',
-\   'coc-html',
-\   'coc-jedi',
-\   'coc-json',
-\   'coc-marketplace',
-\   'coc-pyright',
-\   'coc-ultisnips',
-\   'coc-vimlsp',
-\   'coc-yaml',
-\]
-if has("win32")
-  let g:coc_global_extensions += [
-  \   'coc-powershell'
-  \]
-endif
-let g:coc_default_semantic_highlight_groups = 0
-
-" ultisnips - snippet engine
-Pack 'SirVer/ultisnips'
-Pack 'honza/vim-snippets'
-" vimomni - Completion for vimscript
-Pack 'vim-scripts/vimomni', {'type': 'opt'}
-
-" ale - Asynchronous Lint Engine
-Pack 'w0rp/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 - Version control differences in the sign column
-Pack 'mhinz/vim-signify'
-let g:signify_sign_change = '~'
-" Conflict marker utilities
-Pack 'rhysd/conflict-marker.vim'
-
-" vim-textobj-user - library for creating text objects
-Pack 'kana/vim-textobj-user'
-" vim-textobj-entire - Entire file text object
-let g:textobj_entire_no_default_key_mappings = 1
-Pack 'kana/vim-textobj-entire'
-xmap a% <Plug>(textobj-entire-a)
-omap a% <Plug>(textobj-entire-a)
-xmap i% <Plug>(textobj-entire-i)
-omap i% <Plug>(textobj-entire-i)
-" vim-textobj-parameter - Parameter text object
-Pack 'sgur/vim-textobj-parameter'
-" vim-textobj-uri - URI text object
-Pack 'jceb/vim-textobj-uri'
-" vim-textobj-comment - Comment text object
-Pack 'glts/vim-textobj-comment'
-omap a/ <Plug>(textobj-comment-a)
-xmap a/ <Plug>(textobj-comment-a)
-omap i/ <Plug>(textobj-comment-i)
-xmap i/ <Plug>(textobj-comment-i)
-" vim-textobj-sentence - Improved sentence text object
-Pack 'reedes/vim-textobj-sentence'
-
-" vim-commentary - toggle comments
-Pack 'tpope/vim-commentary'
-" vim-surround - edit delimiters
-Pack 'tpope/vim-surround'
-" vim-repeat - better dot command
-Pack 'tpope/vim-repeat'
-" vim-fugitive - git wrapper
-Pack 'tpope/vim-fugitive'
-" vim-eunuch - unix command warppers
-Pack 'tpope/vim-eunuch'
-" vim-vinegar - improved directory browser
-Pack 'tpope/vim-vinegar'
-if wsl#isDetected()
-  " Make gx work in WSL
-  let g:netrw_browsex_viewer='cmd.exe /C start'
-endif
-" vim-abolish - CamelCase to under_score to mixedCase
-" TODO: Copy the good bit remove this plugin
-Pack 'tpope/vim-abolish'
-" vim-unimpaired - for pairs of tasks
-Pack 'tpope/vim-unimpaired'
-" vim-speeddating - sane date manipulation
-Pack 'tpope/vim-speeddating'
-" vim-endwise - wisely add end{if,function}, fork with cmake support
-Pack 'godbyk/vim-endwise', {'rev': 'patch-1'}
-" vim-jdaddy - text object & formatting for json
-Pack 'tpope/vim-jdaddy'
-" vim-projectionist - granular project configuration
-Pack 'tpope/vim-projectionist'
-
-" fzf.vim - Fuzzy finder
-Pack 'junegunn/fzf'
-Pack 'junegunn/fzf.vim'
-let g:fzf_action = {
-\   'ctrl-t': 'tab split',
-\   'ctrl-s': 'split',
-\   'ctrl-v': 'vsplit'
-\ }
-
-Pack 'kbenzie/note.vim'
-let g:note_directory = '~/Sync/Notes'
-
-if !has('win32')
-  " Seemless vim/tmux pane navigation
-  Pack 'christoomey/vim-tmux-navigator'
-  let g:tmux_navigator_no_mappings = 1
-  " Enable focus events when in tmux session
-  Pack 'tmux-plugins/vim-tmux-focus-events'
-endif
-
-" replay macros with the enter key
-Pack 'wincent/replay'
-" vim-matchit - Improved % matching
-Pack 'andymass/vim-matchup'
-let g:matchup_matchparen_offscreen = {'method': 'status_manual'}
-
-" vim-table-mode - Easy table manipulation
-Pack 'dhruvasagar/vim-table-mode'
-let g:table_mode_map_prefix = '<leader>t'
-let g:table_mode_toggle_map = 'M'
-
-" DoxygenToolkit.vim - documentation stubs
-Pack 'vim-scripts/DoxygenToolkit.vim', {'type': 'opt'}
-let g:DoxygenToolkit_commentType = 'C++'
-
-" markdown fenced code block languages
 let g:markdown_fenced_languages =
   \ ['cpp', 'c', 'cmake', 'console', 'sh', 'vim', 'python', 'yaml']
 
@@ -165,25 +31,79 @@ let g:rst_syntax_code_list = {
 \   'python': ['python']
 \ }
 
-" vim-coiled-snake - Python folding
-Pack 'kalekundert/vim-coiled-snake'
-
 " Enable builtin syntax folding
 let g:xml_syntax_folding = 1
 let g:sh_fold_enabled = 1
 
-" xterm-color-table.vim - view term and hex colors
+if wsl#isDetected()
-Pack 'guns/xterm-color-table.vim'
+  " Make gx work in WSL
+  let g:netrw_browsex_viewer='cmd.exe /C start'
+endif
 
-" Syntax plugins
+if tmux#inSession()
-Pack 'kbenzie/vim-spirv'
+  " Seemless vim/tmux pane navigation
+  packadd vim-tmux-navigator
+  let g:tmux_navigator_no_mappings = 1
+  " Enable focus events when in tmux session
+  packadd vim-tmux-focus-events
+endif
+
+" coc.nvim
+let g:coc_global_extensions = [
+\   'coc-clangd',
+\   'coc-cmake',
+\   'coc-css',
+\   'coc-docker',
+\   'coc-html',
+\   'coc-jedi',
+\   'coc-json',
+\   'coc-marketplace',
+\   'coc-pyright',
+\   'coc-snippets',
+\   'coc-vimlsp',
+\   'coc-yaml',
+\]
+if has("win32")
+  let g:coc_global_extensions += [
+  \   'coc-powershell'
+  \]
+endif
+let g:coc_default_semantic_highlight_groups = 0
+
+" vim-signify
+let g:signify_sign_change = '~'
+
+" vim-textobj-entire
+let g:textobj_entire_no_default_key_mappings = 1
+xmap a% <Plug>(textobj-entire-a)
+omap a% <Plug>(textobj-entire-a)
+xmap i% <Plug>(textobj-entire-i)
+omap i% <Plug>(textobj-entire-i)
+" vim-textobj-comment
+omap a/ <Plug>(textobj-comment-a)
+xmap a/ <Plug>(textobj-comment-a)
+omap i/ <Plug>(textobj-comment-i)
+xmap i/ <Plug>(textobj-comment-i)
+
+" fzf.vim
+let g:fzf_action = {
+\   'ctrl-t': 'tab split',
+\   'ctrl-s': 'split',
+\   'ctrl-v': 'vsplit'
+\ }
+
+" note.vim
+let g:note_directory = '~/Sync/Notes'
+
+" vim-matchit
+let g:matchup_matchparen_offscreen = {'method': 'status_manual'}
+
+" vim-table-mode
+let g:table_mode_map_prefix = '<leader>t'
+let g:table_mode_toggle_map = 'M'
+
+" DoxygenToolkit.vim
+let g:DoxygenToolkit_commentType = 'C++'
+
+" vim-spirv
 let g:spirv_current_id_highlight = 'ctermbg=234, guibg=#1c1c1c'
-Pack 'rperier/vim-cmake-syntax'
-Pack 'tikhomirov/vim-glsl'
-Pack 'beyondmarc/hlsl.vim'
-Pack 'frasercrmck/opencl.vim'
-Pack 'asciidoc/vim-asciidoc'
-Pack 'mustache/vim-mustache-handlebars'
-Pack 'joshglendenning/vim-caddyfile'
-Pack 'kbenzie/vim-khr'
-Pack 'jrozner/vim-antlr'