temp!

Neovim already changes cursor shape by default, there's no need to
override it.

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "pack/minpac/opt/minpac"]
-	path = pack/minpac/opt/minpac
-	url = https://github.com/k-takata/minpac.git

after/syntax/c.vim

@@ -45,7 +45,7 @@ if exists('g:c_doxygen') && g:c_doxygen
 
   " Match: @param name description.   @retval name description.
   "               ^^^^                        ^^^^
-  syn region cDoxygenSpecial matchgroup=cDoxygenComment start='@\(param\(\[\(\|in\|out\|in,out\)\]\)\|retval\)\=\s\+' end='\(\s\|$\)' contained display
+  syn region cDoxygenSpecial matchgroup=cDoxygenComment start='@\(param\(\[\(\|in\|out\|in,out\)\]\)\?\|retval\)\=\s\+' end='\(\s\|$\)' contained display
 
   " Match: @tparam name description.
   "                ^^^^

after/syntax/json.vim

@@ -1,3 +1,4 @@
 hi link jsonKeyword Function
 hi link jsonNull Constant
 hi link jsonQuote Delimiter
+setlocal conceallevel=0

autoload/wsl.vim

@@ -0,0 +1,3 @@
+function! wsl#isDetected() abort
+  return $WSLENV !=# ''
+endfunction

coc-settings.json

@@ -1,8 +1,17 @@
 {
+  "clangd.inlayHints.enable": false,
   "cmake.lsp.enable": true,
+  "diagnostic.enableHighlightLineNumber": false,
+  "diagnostic.errorSign": "▸",
   "diagnostic.hintSign": "▸",
   "diagnostic.infoSign": "▸",
   "diagnostic.warningSign": "▸",
-  "diagnostic.errorSign": "▸",
-  "diagnostic.enableHighlightLineNumber": false
+  "powershell.integratedConsole.showOnStartup": false,
+  "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"
+    ]
+  }
 }

colors/fresh.vim

@@ -215,6 +215,7 @@ if has('gui_running') || &t_Co == 256
   call s:hi('CocInfoFloat', '8', '235', '')
   call s:hi('CocHintSign', '33', '233', '')
   call s:hi('CocHintFloat', '33', '235', '')
+  call s:hi('CocInlayHint', '8', '', '')
 
   call s:hi('SyntasticErrorSign', '160', '233', 'bold')
   call s:hi('SyntasticWarningSign', '129', '233', 'bold')

ginit.vim

@@ -5,3 +5,8 @@ if exists(':GuiFont')
     GuiFont Source\ Code\ Pro:h9
   endif
 endif
+
+if exists(':GuiTabline')
+  " Don't use GUI tabline, matches terminal tabline.
+  GuiTabline 0
+endif

plugin/autocmds.vim

@@ -12,9 +12,6 @@ augroup benieAugroup
   au BufReadPost * if line("'\"") > 0 && line("'\"") <= line("$")
           \ | exe "normal! g'\"" | endif
 
-  " Highlight conflict markers in any filetype
-  au FileType * call matchadd('Todo', '^\(<<<<<<<\s.*\||||||||\|=======\|>>>>>>>\s.*\)$')
-
   " Update `Last change: <date>` on write & go back previous cursor position
   au FileType help au BufWritePre <buffer>
         \ 1s/Last change: \zs.*$/\=strftime('%Y %b %d')/e|norm!``

plugin/commands.vim

@@ -1,11 +1,3 @@
-" minpac
-function! s:minpac_init() abort
-  packadd minpac | call minpac#init() | source $MYVIMRC
-endfunction
-command! PackUpdate call s:minpac_init() | call minpac#update('', {'do': 'call minpac#status()'})
-command! PackStatus call s:minpac_init() | call minpac#status()
-command! PackClean call s:minpac_init() | call minpac#clean()
-
 " Sort Python Imports
 command! ISort call do#isort()
 

plugin/settings.vim

@@ -176,7 +176,7 @@ if &t_Co == 8 && $TERM !~# '^linux\|^Eterm'
 endif
 
 " Change cursor dependant on current mode
-if has('cursorshape') && has('unix') && !has('gui_running')
+if !has('nvim') && has('cursorshape') && has('unix') && !has('gui_running')
   if $TMUX ==# '' && $ITERM_PROFILE !=# ''
     let &t_SI = "\<Esc>]50;CursorShape=1\x7"
     let &t_EI = "\<Esc>]50;CursorShape=0\x7"

tasks.yaml

@@ -1,45 +1,17 @@
 ---
-- name: (neo)vim clone minpac
+- include_vars: ~/.config/nvim/vars.yaml
+
+- name: clone plugin repos
+  when: ansible_os_family != "Windows"
   git:
-    repo: https://github.com/k-takata/minpac.git
-    dest: pack/minpac/opt/minpac
+    repo: 'https://github.com/{{item.repo}}.git'
+    dest: '~/.config/nvim/pack/minpac/{{lookup("vars", "item.mode", default="start")}}/{{item.repo | regex_replace("^.*\/(.*)$", "\1")}}'
+    version: '{{lookup("vars", "item.branch", default="HEAD")}}'
+  with_items: '{{plugins}}'
 
-- name: (neo)vim install pip packages
-  pip:
-    name:
-      - cmake-language-server
-      - cmakelint
-      - compdb
-      - vim-vint
-      - yamllint
-    state: latest
-    extra_args: --user
-
-- name: (neo)vim install node.js Linux
-  when: ansible_system == "Linux"
-  include_tasks: nodejs-linux.yaml
-- name: (neo)vim install node.js macOS
-  when: ansible_os_family == "Darwin"
-  homebrew: name=node state=latest
-- name: (neo)vim install node.js Windows
+- name: clone plugin repos
   when: ansible_os_family == "Windows"
-  win_chocolatey: name=nodejs state=latest
-
-- name: (neo)vim install apt packages
-  when: ansible_distribution == 'Ubuntu' and
-        ansible_distribution_release == '20.04'
-  become: true
-  apt:
-    name:
-      - clangd-12
-    state: latest
-
-- name: (neo)vim install clangd alternative
-  when: ansible_distribution == 'Ubuntu' and
-        ansible_distribution_release == '20.04'
-  become: true
-  alternatives:
-    name: clangd
-    path: /usr/bin/clangd-12
-    link: /usr/local/bin/clangd
-    priority: 120
+  win_git:
+    repo: 'https://github.com/{{item.repo}}.git'
+    dest: '{{ansible_env.LOCALAPPDATA}}/nvim/pack/minpac/{{lookup("vars", "item.mode", default="start")}}/{{item.repo | regex_replace("^.*\/(.*)$", "\1")}}'
+    version: '{{lookup("vars", "item.branch", default="HEAD")}}'

vars.yaml

@@ -0,0 +1,66 @@
+---
+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

@@ -11,14 +11,6 @@ if has('syntax') && !exists('g:syntax_on')
   syntax enable
 endif
 
-if exists('*minpac#init')
-  " When minpac is loaded define the Pack command to add packages.
-  command! -nargs=+ Pack call minpac#add(<args>)
-else
-  " Otherwise define the Pack command to do nothing.
-  command! -nargs=+ Pack
-endif
-
 " Append work config to runtimepath and packpath.
 set runtimepath+=~/.config/work
 set packpath+=~/.config/work
@@ -26,7 +18,7 @@ set packpath+=~/.config/work
 " tabline.vim - sanely numbered tabs
 Pack 'mkitt/tabline.vim'
 
-" coc.nvim Conqueror of Completion
+" coc.nvim - Conqueror of Completion
 Pack 'neoclide/coc.nvim', {'branch': 'release'}
 let g:coc_global_extensions = [
 \   'coc-clangd',
@@ -42,6 +34,11 @@ let g:coc_global_extensions = [
 \   '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
@@ -59,9 +56,11 @@ let g:ale_linters = {'c': [], 'cpp': []}
 let g:ale_cmake_cmakelint_options =
       \ '-convention/filename,-package/consistency,-package/stdargs'
 
-" Version control differences in the sign column
+" 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'
@@ -97,6 +96,10 @@ Pack 'tpope/vim-fugitive'
 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'
@@ -162,7 +165,7 @@ let g:rst_syntax_code_list = {
 \   'python': ['python']
 \ }
 
-" Python folding
+" vim-coiled-snake - Python folding
 Pack 'kalekundert/vim-coiled-snake'
 
 " Enable builtin syntax folding