temp!

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

.conduit.yaml

@@ -1,9 +0,0 @@
----
-- location: ~/.vim
-- pip:
-    - vim-vint
-    - yamllint
-    - cmakelint
-- repo:
-    - remote: https://github.com/k-takata/minpac.git
-      location: ~/.vim/pack/minpac/opt/minpac

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/build.vim

@@ -10,12 +10,26 @@ function! build#dir(...) abort
       let l:dir = s:dirs[0]
       unlet s:dirs
     else
-      " Multiple build directories found, create popup menu to select one.
+      " Multiple build directories found, select one.
-      " Set the callback to this function on completion, handled below.
+      if exists('*popup_menu')
-      call popup_menu(s:dirs, #{
+        " Create popup menu to select the build directory. Callback to this
-      \   filter: 'popup_filter_menu',
+        " function on completion, handled in the else branch below.
-      \   callback: 'build#dir',
+        call popup_menu(s:dirs, #{
-      \ })
+        \   filter: 'popup_filter_menu',
+        \   callback: 'build#dir',
+        \ })
+      else
+        " Fallback to inputlist when popup_menu is not available.
+        let l:choices = []
+        let l:index = 1
+        for l:dir in s:dirs
+          call add(l:choices, string(l:index).': '.l:dir)
+          let l:index += 1
+        endfor
+        let l:index = inputlist(l:choices)
+        let l:dir = s:dirs[l:index - 1]
+        echomsg ' '.l:dir
+      endif
     endif
   else
     if a:0 == 1
@@ -35,17 +49,30 @@ function! build#dir(...) abort
     endif
   endif
   if exists('l:dir')
-    " Set build directory and restart YouCompleteMe.
+    " Set build directory.
-    let $BUILD_DIR = getcwd().'/'.substitute(l:dir, '\/$', '', '')
+    let l:cwd = substitute(getcwd(), '\\', '\/', 'g')
+    let $BUILD_DIR = l:cwd.'/'.substitute(l:dir, '\/$', '', '')
+    if executable('compdb')
+      " Post-process compile_commands.json with compdb, adds header files to
+      " missing compile_commands.json for more accurate diagnostics.
+      let l:database_dir = l:cwd.'/.vim'
+      let l:compile_commands = l:database_dir.'/compile_commands.json'
+      call systemlist('compdb -p '.$BUILD_DIR.' list > '.l:compile_commands)
+    else
+      let l:database_dir = $BUILD_DIR
+    endif
+    " Read/create .vim/coc-settings.json
     let l:coc_settings = {}
     if isdirectory('.vim')
       let l:coc_settings = json_decode(join(readfile('.vim/coc-settings.json'), ''))
     else
       call mkdir('.vim')
     endif
-    let l:coc_settings['clangd.compilationDatabasePath'] = $BUILD_DIR
+    " Update .vim/coc-settings.json with new build directory.
+    let l:coc_settings['clangd.compilationDatabasePath'] = l:database_dir
     let l:coc_settings['cmake.lsp.buildDirectory'] = $BUILD_DIR
     call writefile([json_encode(l:coc_settings)], '.vim/coc-settings.json')
+    " Finally restart coc.nvim with new config.
     CocRestart
   endif
 endfunction

autoload/tmux.vim

@@ -16,6 +16,6 @@ function! tmux#isOption(option, value) abort
   if !tmux#inSession()
     return 0
   endif
-  let l:set_clipboard = trim(system('tmux show-options -g '.a:option))
+  let l:option = trim(system('tmux show-options -g '.a:option))
-  return l:set_clipboard ==# 'set-clipboard '.a:value
+  return l:option ==# a:option.' '.a:value
 endfunction

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": "▸",
+  "powershell.integratedConsole.showOnStartup": false,
-  "diagnostic.enableHighlightLineNumber": 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

@@ -126,7 +126,9 @@ if has('gui_running') || &t_Co == 256
   call s:hi('SpellLocal', '5', '', '')
   call s:hi('SpellRare', '3', '', '')
   call s:hi('StatusLine', '15', '233', '')
+  call s:hi('StatusLineTerm', '15', '233', '')
   call s:hi('StatusLineNC', '', '235', '')
+  call s:hi('StatusLineTermNC', '', '235', '')
   call s:hi('TabLine', '246', '235', 'bold')
   call s:hi('TabLineFill', '', '235', '')
   call s:hi('TabLineSel', '248', '', 'bold')
@@ -213,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')

ftplugin/c.vim

@@ -1,3 +1,3 @@
 if has('pythonx')
-  set formatexpr=format#clang_format()
+  setlocal formatexpr=format#clang_format()
 endif

ftplugin/cpp.vim

@@ -1,3 +1,6 @@
+" Add <> to % matches
+setlocal matchpairs+=<:>
+
 if has('pythonx')
-  set formatexpr=format#clang_format()
+  setlocal formatexpr=format#clang_format()
 endif

ftplugin/java.vim

@@ -1,3 +1,3 @@
 if has('pythonx')
-  set formatexpr=format#clang_format()
+  setlocal formatexpr=format#clang_format()
 endif

ftplugin/javascript.vim

@@ -1,3 +1,3 @@
 if has('pythonx')
-  set formatexpr=format#clang_format()
+  setlocal formatexpr=format#clang_format()
 endif

ftplugin/objc.vim

@@ -1,3 +1,3 @@
 if has('pythonx')
-  set formatexpr=format#clang_format()
+  setlocal formatexpr=format#clang_format()
 endif

ftplugin/objcpp.vim

@@ -1,3 +1,3 @@
 if has('pythonx')
-  set formatexpr=format#clang_format()
+  setlocal formatexpr=format#clang_format()
 endif

ftplugin/proto.vim

@@ -1,3 +1,3 @@
 if has('pythonx')
-  set formatexpr=format#clang_format()
+  setlocal formatexpr=format#clang_format()
 endif

ftplugin/python.vim

@@ -1,3 +1,3 @@
 if has('pythonx')
-  set formatexpr=format#yapf()
+  setlocal formatexpr=format#yapf()
 endif

ftplugin/requirements.vim

@@ -1,2 +1 @@
-set nospell
 set commentstring=#%s

ginit.vim

@@ -1,7 +1,12 @@
 if exists(':GuiFont')
   if platform#is_windows()
-    GuiFont Consolas:h9
+    GuiFont! Source\ Code\ Pro:h10
   else
     GuiFont Source\ Code\ Pro:h9
   endif
 endif
+
+if exists(':GuiTabline')
+  " Don't use GUI tabline, matches terminal tabline.
+  GuiTabline 0
+endif

gvimrc

@@ -6,7 +6,7 @@
 set guioptions=aegi
 
 if platform#is_windows()
-  set guifont=Consolas:h10:cDEFAULT
+  set guifont=Source\ Code\ Pro:h10
 else
   " Set default font
   set guifont=Source\ Code\ Pro\ Medium\ 9

nodejs-linux.yaml

@@ -0,0 +1,28 @@
+---
+- name: nodejs get json containing latest version
+  uri:
+    url: https://nodejs.org/dist/index.json
+  register: latest
+
+- name: nodejs create directory for downloaded package
+  file:
+    state: directory
+    dest: ~/.local/src
+
+- name: nodejs download latest package
+  get_url:
+    url: 'https://nodejs.org/dist/{{latest.json[0].version}}/node-{{latest.json[0].version}}-linux-x64.tar.gz'
+    dest: ~/.local/src/node.tar.gz
+
+- name: nodejs extract downloaded package
+  unarchive:
+    src: ~/.local/src/node.tar.gz
+    dest: ~/.local/src
+    remote_src: true
+
+- name: nodejs create symlink links
+  file:
+    state: link
+    src: '~/.local/src/node-{{latest.json[0].version}}-linux-x64/bin/{{item}}'
+    dest: '~/.local/bin/{{item}}'
+  with_items: [corepack, node, npm, npx]

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/mappings.vim

@@ -115,6 +115,10 @@ else
   noremap <leader>p "+p
   noremap <leader>P "+P
 endif
+if has('nvim-0.5.2')
+  " Undo neovim's default mapping of Y to y$
+  unmap Y
+endif
 
 " Quickly access spelling menu
 inoremap <C-s> <C-g>u<C-X>s

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"

plugin/statusline.vim

@@ -49,7 +49,7 @@ function! statusline#special(group, name, title)
 endfunction
 
 " Construct a statusline for generic buffer types.
-function! statusline#generic(group, mode)
+function! statusline#generic(group, mode, coc)
   " Display current mode with dynamic highlights.
   let l:mode = '%#'.a:group.'# '.a:mode.' '
   " Display spell or paste if set with dusk highlights in a group to swallow
@@ -64,7 +64,7 @@ function! statusline#generic(group, mode)
   let l:state = '%#StatusLineDark#'
         \.'%{&readonly ? " 🔒" : ""}'
         \.'%{&modifiable ? "" : " ⛔"}'
-  if exists('*coc#status')
+  if a:coc && exists('*coc#status')
     " Display coc.nvim status.
     let l:coc = '%#StatusLineDuskFade#%( %{coc#status()}%)'
   else
@@ -108,11 +108,11 @@ function! statusline#active()
     if l:mode ==# 'Normal'
       let l:mode = 'Preview'
     endif
-    return statusline#generic('StatusLineLight', l:mode)
+    return statusline#generic('StatusLineLight', l:mode, v:false)
   elseif &filetype ==# 'man'
     return statusline#special('StatusLineDusk', 'Manual', '%f')
   endif
-  return statusline#generic('StatusLineLight', l:mode)
+  return statusline#generic('StatusLineLight', l:mode, v:true)
 endfunction
 
 " Define inactive statusline, this remains static until the buffer gains
@@ -130,11 +130,11 @@ function! statusline#inactive()
   elseif &buftype ==# 'terminal'
     let l:statusline = statusline#special('StatusLineDusk', 'Terminal', '%f')
   elseif &previewwindow
-    let l:statusline = statusline#generic('StatusLineDusk', 'Preview')
+    let l:statusline = statusline#generic('StatusLineDusk', 'Preview', v:false)
   elseif &filetype ==# 'man'
     let l:statusline = statusline#special('StatusLineDusk', 'Manual', '%f')
   else
-    let l:statusline = statusline#generic('StatusLineDusk', 'Idle')
+    let l:statusline = statusline#generic('StatusLineDusk', 'Idle', v:false)
   endif
   " Escape spaces and double quotes for use in setlocal.
   let l:statusline = substitute(l:statusline, '\([ "]\)', '\\\0', 'g')

tasks.yaml

@@ -0,0 +1,17 @@
+---
+- include_vars: ~/.config/nvim/vars.yaml
+
+- name: clone plugin repos
+  when: ansible_os_family != "Windows"
+  git:
+    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: clone plugin repos
+  when: ansible_os_family == "Windows"
+  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,12 +18,13 @@ 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',
 \   'coc-cmake',
 \   'coc-css',
+\   'coc-docker',
 \   'coc-html',
 \   'coc-jedi',
 \   'coc-json',
@@ -41,6 +34,12 @@ 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
 Pack 'SirVer/ultisnips'
@@ -57,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'
@@ -95,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'
@@ -160,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