vim: big update; move lots of things to lua

24 files changed, 936 insertions, 2856 deletions

diff --git a/.vim/after/plugin/clap.vim b/.vim/after/plugin/clap.vim
deleted file mode 100644
index b5d48db..0000000
--- a/.vim/after/plugin/clap.vim
+++ /dev/null
@@ -1,8 +0,0 @@
-if !exists('g:loaded_clap')
-  finish
-endif
-
-let g:clap_selected_sign = { 'text': '* ', 'texthl': "WarningMsg", "linehl": "ClapSelected" }
-
-nnoremap <leader>cc :Clap<CR>
-nmap <leader>cg :Clap grep<CR>
diff --git a/.vim/after/plugin/neomake.vim b/.vim/after/plugin/neomake.vim
index 84af8c6..1e30a72 100644
--- a/.vim/after/plugin/neomake.vim
+++ b/.vim/after/plugin/neomake.vim
@@ -1,3 +1,4 @@
+finish
 if !exists('g:loaded_neomake')
   finish
 endif
@@ -12,6 +13,13 @@ let g:neomake_error_sign = {'text': '✘', 'texthl': 'NeomakeErrorSign'}
 let g:neomake_warning_sign = {'text': '‼', 'texthl': 'NeomakeWarningSign'}
 let g:neomake_message_sign = {'text': '☛', 'texthl': 'NeomakeMessageSign'}
 let g:neomake_info_sign = {'text': 'i', 'texthl': 'NeomakeInfoSign'}
+
+" make diagnosis-nvim match
+call sign_define("LspDiagnosticsErrorSign", {"text" : copy(g:neomake_error_sign.text), "texthl" : copy(g:neomake_error_sign.texthl)})
+call sign_define("LspDiagnosticsWarningSign", {"text" : copy(g:neomake_warning_sign.text), "texthl" : copy(g:neomake_warning_sign.texthl)})
+call sign_define("LspDiagnosticsHintSign", {"text" : copy(g:neomake_message_sign.text), "texthl" : copy(g:neomake_message_sign.texthl)})
+call sign_define("LspDiagnosticsInformationSign", {"text" : copy(g:neomake_info_sign.text), "texthl" : copy(g:neomake_info_sign.texthl)})
+
 " let g:neomake_serialize = 1
 
 let g:neomake_highlight_columns = 1
@@ -36,24 +44,30 @@ let g:neomake_make_maker = { 'exe': 'make', 'errorformat': '%f:%l:%c: %m' }
 
 nmap <leader>nm :Neomake<space>
 
-let g:lightline.component_function.neomake = 'LightLineNeomake'
-function! LightLineNeomake()
-  let l:msg = neomake#statusline#get(bufnr('%'), {
-    \ 'format_status_disabled': '{{disabled_info}} %s',
-    \ 'format_status_enabled': '%s',
-    \ 'format_running': '… {{running_job_names}}',
-    \ 'format_loclist_ok': ' ✔',
-    \ 'format_loclist_issues': '%s',
-    \ 'format_loclist_unknown': '',
-    \ 'format_loclist_type_E': ' ✘ {{count}}',
-    \ 'format_loclist_type_W': ' ‼ {{count}}',
-    \ 'format_loclist_type_I': ' i {{count}}',
-    \ 'format_quickfix_type_E': '✘ {{count}}',
-    \ 'format_quickfix_type_W': '‼ {{count}}',
-    \ 'format_quickfix_type_I': 'i {{count}}',
-  \ })
-  return l:msg ? 'nm:'.l:msg : ''
-endfunction
+if exists('g:loaded_lightline')
+    if exists('g:lightline')
+        let g:lightline.component_function.neomake = 'LightLineNeomake'
+    else
+        let g:lightline = {'component_function': {'neomake': 'LightLineNeomake'}}
+    endif
+    function! LightLineNeomake()
+    let l:msg = neomake#statusline#get(bufnr('%'), {
+        \ 'format_status_disabled': '{{disabled_info}} %s',
+        \ 'format_status_enabled': '%s',
+        \ 'format_running': '… {{running_job_names}}',
+        \ 'format_loclist_ok': ' ✔',
+        \ 'format_loclist_issues': '%s',
+        \ 'format_loclist_unknown': '',
+        \ 'format_loclist_type_E': ' ✘ {{count}}',
+        \ 'format_loclist_type_W': ' ‼ {{count}}',
+        \ 'format_loclist_type_I': ' i {{count}}',
+        \ 'format_quickfix_type_E': '✘ {{count}}',
+        \ 'format_quickfix_type_W': '‼ {{count}}',
+        \ 'format_quickfix_type_I': 'i {{count}}',
+    \ })
+    return l:msg ? 'nm:'.l:msg : ''
+    endfunction
+endif
 
 " hightlights {{{
 hi SpellBad ctermfg=red guifg=red
diff --git a/.vim/after/plugin/writing.vim b/.vim/after/plugin/writing.vim
index a016316..f84cc48 100644
--- a/.vim/after/plugin/writing.vim
+++ b/.vim/after/plugin/writing.vim
@@ -72,13 +72,15 @@ function! s:writing_mode_enter()
     set textwidth=120
     " ALEToggle
     " Grammarous keymaps
-    nmap <Leader>c :GrammarousCheck --lang=de
-    nmap <Leader>gi <Plug>(grammarous-move-to-info-window)
-    nmap <Leader>gr <Plug>(grammarous-remove-error)
-    nmap <Leader>gd <Plug>(grammarous-disable-rule)
-    nmap <Leader>gf <Plug>(grammarous-fixit)
-    nmap <Leader>gn <Plug>(grammarous-move-to-next-error)
-    nmap <Leader>gp <Plug>(grammarous-move-to-previous-error)
+    if exists('g:loaded_grammarous')
+        nmap <leader>l :GrammarousCheck --lang=de
+        nmap <leader>gi <Plug>(grammarous-move-to-info-window)
+        nmap <leader>gr <Plug>(grammarous-remove-error)
+        nmap <leader>gd <Plug>(grammarous-disable-rule)
+        nmap <leader>gf <Plug>(grammarous-fixit)
+        nmap <leader>gn <Plug>(grammarous-move-to-next-error)
+        nmap <leader>gp <Plug>(grammarous-move-to-previous-error)
+    endif
 endfunction
 
 augroup Writing
@@ -88,28 +90,3 @@ augroup Writing
     au User GoyoEnter nested call <SID>goyo_enter()
     au User GoyoLeave nested call <SID>goyo_leave()
 augroup END
-
-" LaTeX
-" let g:vimtex_view_general_viewer
-"             \ = '/Applications/Skim.app/Contents/SharedSupport/displayline'
-" let g:vimtex_view_general_options = '-r @line @pdf @tex'
-
-" " This adds a callback hook that updates Skim after compilation
-" let g:vimtex_latexmk_callback_hooks = ['UpdateSkim']
-" function! UpdateSkim(status)
-"     if !a:status | return | endif
-
-"     let l:out = b:vimtex.out()
-"     let l:tex = expand('%:p')
-"     let l:cmd = [g:vimtex_view_general_viewer, '-r']
-"     if !empty(system('pgrep Skim'))
-"         call extend(l:cmd, ['-g'])
-"     endif
-"     if has('nvim')
-"         call jobstart(l:cmd + [line('.'), l:out, l:tex])
-"     elseif has('job')
-"         call job_start(l:cmd + [line('.'), l:out, l:tex])
-"     else
-"         call system(join(l:cmd + [line('.'), shellescape(l:out), shellescape(l:tex)], ' '))
-"     endif
-" endfunction
diff --git a/.vim/autoload/balena_diagnostics_fold.vim b/.vim/autoload/balena_diagnostics_fold.vim
new file mode 100644
index 0000000..4513f6b
--- /dev/null
+++ b/.vim/autoload/balena_diagnostics_fold.vim
@@ -0,0 +1,25 @@
+"
+" manually:
+"   setlocal foldexpr=balena_diagnostics_fold#expr(v:lnum)
+"   setlocal foldmethod=expr
+"   setlocal foldlevel=1
+" or as command:
+"   command! BalenaDiagnosticsFold call balena_diagnostics_fold#apply()
+"
+
+function! s:foldexpr(lnum)
+    return getline(a:lnum)=~'^===\s.*\s===$'?'>1':getline(a:lnum)=~'^---\s.*\s---$'?'>2':'='
+endfunction
+
+function! balena_diagnostics_fold#expr(lnum) abort
+    return s:foldexpr(a:lnum)
+endfunction
+
+function! balena_diagnostics_fold#apply() abort
+    setlocal
+        \ foldmethod=expr
+        \ foldexpr=balena_diagnostics_fold#expr(v:lnum)
+        \ foldcolumn=auto:9
+        \ foldlevel=1
+        \ foldenable
+endfunction
diff --git a/.vim/autoload/daymode.vim b/.vim/autoload/daymode.vim
index 40fb5a0..b2c8cdb 100644
--- a/.vim/autoload/daymode.vim
+++ b/.vim/autoload/daymode.vim
@@ -1,14 +1,13 @@
 function! s:lightline_update(colors)
-    if !exists('g:loaded_lightline')
-        return
+    if exists('g:loaded_lightline')
+        try
+            let g:lightline.colorscheme = a:colors
+            call lightline#init()
+            call lightline#colorscheme()
+            call lightline#update()
+        catch
+        endtry
     endif
-    try
-        let g:lightline.colorscheme = a:colors
-        call lightline#init()
-        call lightline#colorscheme()
-        call lightline#update()
-    catch
-    endtry
 endfunction
 
 function! daymode#switch(bang)
@@ -22,7 +21,7 @@ function! daymode#switch(bang)
         call s:lightline_update(get(g:, 'daymode_lightline_colorscheme_day', 'PaperColor'))
     endif
 
-    if exists("syntax_on")
-        syntax reset
-    endif
+    " if exists("syntax_on")
+    "     syntax reset
+    " endif
 endfunction
diff --git a/.vim/autoload/plug.vim b/.vim/autoload/plug.vim
deleted file mode 100644
index 4e05630..0000000
--- a/.vim/autoload/plug.vim
+++ /dev/null
@@ -1,2526 +0,0 @@
-" vim-plug: Vim plugin manager
-" ============================
-"
-" Download plug.vim and put it in ~/.vim/autoload
-"
-"   curl -fLo ~/.vim/autoload/plug.vim --create-dirs \
-"     https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
-"
-" Edit your .vimrc
-"
-"   call plug#begin('~/.vim/plugged')
-"
-"   " Make sure you use single quotes
-"
-"   " Shorthand notation; fetches https://github.com/junegunn/vim-easy-align
-"   Plug 'junegunn/vim-easy-align'
-"
-"   " Any valid git URL is allowed
-"   Plug 'https://github.com/junegunn/vim-github-dashboard.git'
-"
-"   " Multiple Plug commands can be written in a single line using | separators
-"   Plug 'SirVer/ultisnips' | Plug 'honza/vim-snippets'
-"
-"   " On-demand loading
-"   Plug 'scrooloose/nerdtree', { 'on':  'NERDTreeToggle' }
-"   Plug 'tpope/vim-fireplace', { 'for': 'clojure' }
-"
-"   " Using a non-master branch
-"   Plug 'rdnetto/YCM-Generator', { 'branch': 'stable' }
-"
-"   " Using a tagged release; wildcard allowed (requires git 1.9.2 or above)
-"   Plug 'fatih/vim-go', { 'tag': '*' }
-"
-"   " Plugin options
-"   Plug 'nsf/gocode', { 'tag': 'v.20150303', 'rtp': 'vim' }
-"
-"   " Plugin outside ~/.vim/plugged with post-update hook
-"   Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' }
-"
-"   " Unmanaged plugin (manually installed and updated)
-"   Plug '~/my-prototype-plugin'
-"
-"   " Initialize plugin system
-"   call plug#end()
-"
-" Then reload .vimrc and :PlugInstall to install plugins.
-"
-" Plug options:
-"
-"| Option                  | Description                                      |
-"| ----------------------- | ------------------------------------------------ |
-"| `branch`/`tag`/`commit` | Branch/tag/commit of the repository to use       |
-"| `rtp`                   | Subdirectory that contains Vim plugin            |
-"| `dir`                   | Custom directory for the plugin                  |
-"| `as`                    | Use different name for the plugin                |
-"| `do`                    | Post-update hook (string or funcref)             |
-"| `on`                    | On-demand loading: Commands or `<Plug>`-mappings |
-"| `for`                   | On-demand loading: File types                    |
-"| `frozen`                | Do not update unless explicitly specified        |
-"
-" More information: https://github.com/junegunn/vim-plug
-"
-"
-" Copyright (c) 2017 Junegunn Choi
-"
-" MIT License
-"
-" Permission is hereby granted, free of charge, to any person obtaining
-" a copy of this software and associated documentation files (the
-" "Software"), to deal in the Software without restriction, including
-" without limitation the rights to use, copy, modify, merge, publish,
-" distribute, sublicense, and/or sell copies of the Software, and to
-" permit persons to whom the Software is furnished to do so, subject to
-" the following conditions:
-"
-" The above copyright notice and this permission notice shall be
-" included in all copies or substantial portions of the Software.
-"
-" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-" EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-" NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-" LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-" OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-" WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-if exists('g:loaded_plug')
-  finish
-endif
-let g:loaded_plug = 1
-
-let s:cpo_save = &cpo
-set cpo&vim
-
-let s:plug_src = 'https://github.com/junegunn/vim-plug.git'
-let s:plug_tab = get(s:, 'plug_tab', -1)
-let s:plug_buf = get(s:, 'plug_buf', -1)
-let s:mac_gui = has('gui_macvim') && has('gui_running')
-let s:is_win = has('win32')
-let s:nvim = has('nvim-0.2') || (has('nvim') && exists('*jobwait') && !s:is_win)
-let s:vim8 = has('patch-8.0.0039') && exists('*job_start')
-let s:me = resolve(expand('<sfile>:p'))
-let s:base_spec = { 'branch': 'master', 'frozen': 0 }
-let s:TYPE = {
-\   'string':  type(''),
-\   'list':    type([]),
-\   'dict':    type({}),
-\   'funcref': type(function('call'))
-\ }
-let s:loaded = get(s:, 'loaded', {})
-let s:triggers = get(s:, 'triggers', {})
-
-function! plug#begin(...)
-  if a:0 > 0
-    let s:plug_home_org = a:1
-    let home = s:path(fnamemodify(expand(a:1), ':p'))
-  elseif exists('g:plug_home')
-    let home = s:path(g:plug_home)
-  elseif !empty(&rtp)
-    let home = s:path(split(&rtp, ',')[0]) . '/plugged'
-  else
-    return s:err('Unable to determine plug home. Try calling plug#begin() with a path argument.')
-  endif
-  if fnamemodify(home, ':t') ==# 'plugin' && fnamemodify(home, ':h') ==# s:first_rtp
-    return s:err('Invalid plug home. '.home.' is a standard Vim runtime path and is not allowed.')
-  endif
-
-  let g:plug_home = home
-  let g:plugs = {}
-  let g:plugs_order = []
-  let s:triggers = {}
-
-  call s:define_commands()
-  return 1
-endfunction
-
-function! s:define_commands()
-  command! -nargs=+ -bar Plug call plug#(<args>)
-  if !executable('git')
-    return s:err('`git` executable not found. Most commands will not be available. To suppress this message, prepend `silent!` to `call plug#begin(...)`.')
-  endif
-  command! -nargs=* -bar -bang -complete=customlist,s:names PlugInstall call s:install(<bang>0, [<f-args>])
-  command! -nargs=* -bar -bang -complete=customlist,s:names PlugUpdate  call s:update(<bang>0, [<f-args>])
-  command! -nargs=0 -bar -bang PlugClean call s:clean(<bang>0)
-  command! -nargs=0 -bar PlugUpgrade if s:upgrade() | execute 'source' s:esc(s:me) | endif
-  command! -nargs=0 -bar PlugStatus  call s:status()
-  command! -nargs=0 -bar PlugDiff    call s:diff()
-  command! -nargs=? -bar -bang -complete=file PlugSnapshot call s:snapshot(<bang>0, <f-args>)
-endfunction
-
-function! s:to_a(v)
-  return type(a:v) == s:TYPE.list ? a:v : [a:v]
-endfunction
-
-function! s:to_s(v)
-  return type(a:v) == s:TYPE.string ? a:v : join(a:v, "\n") . "\n"
-endfunction
-
-function! s:glob(from, pattern)
-  return s:lines(globpath(a:from, a:pattern))
-endfunction
-
-function! s:source(from, ...)
-  let found = 0
-  for pattern in a:000
-    for vim in s:glob(a:from, pattern)
-      execute 'source' s:esc(vim)
-      let found = 1
-    endfor
-  endfor
-  return found
-endfunction
-
-function! s:assoc(dict, key, val)
-  let a:dict[a:key] = add(get(a:dict, a:key, []), a:val)
-endfunction
-
-function! s:ask(message, ...)
-  call inputsave()
-  echohl WarningMsg
-  let answer = input(a:message.(a:0 ? ' (y/N/a) ' : ' (y/N) '))
-  echohl None
-  call inputrestore()
-  echo "\r"
-  return (a:0 && answer =~? '^a') ? 2 : (answer =~? '^y') ? 1 : 0
-endfunction
-
-function! s:ask_no_interrupt(...)
-  try
-    return call('s:ask', a:000)
-  catch
-    return 0
-  endtry
-endfunction
-
-function! s:lazy(plug, opt)
-  return has_key(a:plug, a:opt) &&
-        \ (empty(s:to_a(a:plug[a:opt]))         ||
-        \  !isdirectory(a:plug.dir)             ||
-        \  len(s:glob(s:rtp(a:plug), 'plugin')) ||
-        \  len(s:glob(s:rtp(a:plug), 'after/plugin')))
-endfunction
-
-function! plug#end()
-  if !exists('g:plugs')
-    return s:err('Call plug#begin() first')
-  endif
-
-  if exists('#PlugLOD')
-    augroup PlugLOD
-      autocmd!
-    augroup END
-    augroup! PlugLOD
-  endif
-  let lod = { 'ft': {}, 'map': {}, 'cmd': {} }
-
-  if exists('g:did_load_filetypes')
-    filetype off
-  endif
-  for name in g:plugs_order
-    if !has_key(g:plugs, name)
-      continue
-    endif
-    let plug = g:plugs[name]
-    if get(s:loaded, name, 0) || !s:lazy(plug, 'on') && !s:lazy(plug, 'for')
-      let s:loaded[name] = 1
-      continue
-    endif
-
-    if has_key(plug, 'on')
-      let s:triggers[name] = { 'map': [], 'cmd': [] }
-      for cmd in s:to_a(plug.on)
-        if cmd =~? '^<Plug>.\+'
-          if empty(mapcheck(cmd)) && empty(mapcheck(cmd, 'i'))
-            call s:assoc(lod.map, cmd, name)
-          endif
-          call add(s:triggers[name].map, cmd)
-        elseif cmd =~# '^[A-Z]'
-          let cmd = substitute(cmd, '!*$', '', '')
-          if exists(':'.cmd) != 2
-            call s:assoc(lod.cmd, cmd, name)
-          endif
-          call add(s:triggers[name].cmd, cmd)
-        else
-          call s:err('Invalid `on` option: '.cmd.
-          \ '. Should start with an uppercase letter or `<Plug>`.')
-        endif
-      endfor
-    endif
-
-    if has_key(plug, 'for')
-      let types = s:to_a(plug.for)
-      if !empty(types)
-        augroup filetypedetect
-        call s:source(s:rtp(plug), 'ftdetect/**/*.vim', 'after/ftdetect/**/*.vim')
-        augroup END
-      endif
-      for type in types
-        call s:assoc(lod.ft, type, name)
-      endfor
-    endif
-  endfor
-
-  for [cmd, names] in items(lod.cmd)
-    execute printf(
-    \ 'command! -nargs=* -range -bang -complete=file %s call s:lod_cmd(%s, "<bang>", <line1>, <line2>, <q-args>, %s)',
-    \ cmd, string(cmd), string(names))
-  endfor
-
-  for [map, names] in items(lod.map)
-    for [mode, map_prefix, key_prefix] in
-          \ [['i', '<C-O>', ''], ['n', '', ''], ['v', '', 'gv'], ['o', '', '']]
-      execute printf(
-      \ '%snoremap <silent> %s %s:<C-U>call <SID>lod_map(%s, %s, %s, "%s")<CR>',
-      \ mode, map, map_prefix, string(map), string(names), mode != 'i', key_prefix)
-    endfor
-  endfor
-
-  for [ft, names] in items(lod.ft)
-    augroup PlugLOD
-      execute printf('autocmd FileType %s call <SID>lod_ft(%s, %s)',
-            \ ft, string(ft), string(names))
-    augroup END
-  endfor
-
-  call s:reorg_rtp()
-  filetype plugin indent on
-  if has('vim_starting')
-    if has('syntax') && !exists('g:syntax_on')
-      syntax enable
-    end
-  else
-    call s:reload_plugins()
-  endif
-endfunction
-
-function! s:loaded_names()
-  return filter(copy(g:plugs_order), 'get(s:loaded, v:val, 0)')
-endfunction
-
-function! s:load_plugin(spec)
-  call s:source(s:rtp(a:spec), 'plugin/**/*.vim', 'after/plugin/**/*.vim')
-endfunction
-
-function! s:reload_plugins()
-  for name in s:loaded_names()
-    call s:load_plugin(g:plugs[name])
-  endfor
-endfunction
-
-function! s:trim(str)
-  return substitute(a:str, '[\/]\+$', '', '')
-endfunction
-
-function! s:version_requirement(val, min)
-  for idx in range(0, len(a:min) - 1)
-    let v = get(a:val, idx, 0)
-    if     v < a:min[idx] | return 0
-    elseif v > a:min[idx] | return 1
-    endif
-  endfor
-  return 1
-endfunction
-
-function! s:git_version_requirement(...)
-  if !exists('s:git_version')
-    let s:git_version = map(split(split(s:system('git --version'))[2], '\.'), 'str2nr(v:val)')
-  endif
-  return s:version_requirement(s:git_version, a:000)
-endfunction
-
-function! s:progress_opt(base)
-  return a:base && !s:is_win &&
-        \ s:git_version_requirement(1, 7, 1) ? '--progress' : ''
-endfunction
-
-if s:is_win
-  function! s:rtp(spec)
-    return s:path(a:spec.dir . get(a:spec, 'rtp', ''))
-  endfunction
-
-  function! s:path(path)
-    return s:trim(substitute(a:path, '/', '\', 'g'))
-  endfunction
-
-  function! s:dirpath(path)
-    return s:path(a:path) . '\'
-  endfunction
-
-  function! s:is_local_plug(repo)
-    return a:repo =~? '^[a-z]:\|^[%~]'
-  endfunction
-else
-  function! s:rtp(spec)
-    return s:dirpath(a:spec.dir . get(a:spec, 'rtp', ''))
-  endfunction
-
-  function! s:path(path)
-    return s:trim(a:path)
-  endfunction
-
-  function! s:dirpath(path)
-    return substitute(a:path, '[/\\]*$', '/', '')
-  endfunction
-
-  function! s:is_local_plug(repo)
-    return a:repo[0] =~ '[/$~]'
-  endfunction
-endif
-
-function! s:err(msg)
-  echohl ErrorMsg
-  echom '[vim-plug] '.a:msg
-  echohl None
-endfunction
-
-function! s:warn(cmd, msg)
-  echohl WarningMsg
-  execute a:cmd 'a:msg'
-  echohl None
-endfunction
-
-function! s:esc(path)
-  return escape(a:path, ' ')
-endfunction
-
-function! s:escrtp(path)
-  return escape(a:path, ' ,')
-endfunction
-
-function! s:remove_rtp()
-  for name in s:loaded_names()
-    let rtp = s:rtp(g:plugs[name])
-    execute 'set rtp-='.s:escrtp(rtp)
-    let after = globpath(rtp, 'after')
-    if isdirectory(after)
-      execute 'set rtp-='.s:escrtp(after)
-    endif
-  endfor
-endfunction
-
-function! s:reorg_rtp()
-  if !empty(s:first_rtp)
-    execute 'set rtp-='.s:first_rtp
-    execute 'set rtp-='.s:last_rtp
-  endif
-
-  " &rtp is modified from outside
-  if exists('s:prtp') && s:prtp !=# &rtp
-    call s:remove_rtp()
-    unlet! s:middle
-  endif
-
-  let s:middle = get(s:, 'middle', &rtp)
-  let rtps     = map(s:loaded_names(), 's:rtp(g:plugs[v:val])')
-  let afters   = filter(map(copy(rtps), 'globpath(v:val, "after")'), '!empty(v:val)')
-  let rtp      = join(map(rtps, 'escape(v:val, ",")'), ',')
-                 \ . ','.s:middle.','
-                 \ . join(map(afters, 'escape(v:val, ",")'), ',')
-  let &rtp     = substitute(substitute(rtp, ',,*', ',', 'g'), '^,\|,$', '', 'g')
-  let s:prtp   = &rtp
-
-  if !empty(s:first_rtp)
-    execute 'set rtp^='.s:first_rtp
-    execute 'set rtp+='.s:last_rtp
-  endif
-endfunction
-
-function! s:doautocmd(...)
-  if exists('#'.join(a:000, '#'))
-    execute 'doautocmd' ((v:version > 703 || has('patch442')) ? '<nomodeline>' : '') join(a:000)
-  endif
-endfunction
-
-function! s:dobufread(names)
-  for name in a:names
-    let path = s:rtp(g:plugs[name]).'/**'
-    for dir in ['ftdetect', 'ftplugin']
-      if len(finddir(dir, path))
-        if exists('#BufRead')
-          doautocmd BufRead
-        endif
-        return
-      endif
-    endfor
-  endfor
-endfunction
-
-function! plug#load(...)
-  if a:0 == 0
-    return s:err('Argument missing: plugin name(s) required')
-  endif
-  if !exists('g:plugs')
-    return s:err('plug#begin was not called')
-  endif
-  let names = a:0 == 1 && type(a:1) == s:TYPE.list ? a:1 : a:000
-  let unknowns = filter(copy(names), '!has_key(g:plugs, v:val)')
-  if !empty(unknowns)
-    let s = len(unknowns) > 1 ? 's' : ''
-    return s:err(printf('Unknown plugin%s: %s', s, join(unknowns, ', ')))
-  end
-  let unloaded = filter(copy(names), '!get(s:loaded, v:val, 0)')
-  if !empty(unloaded)
-    for name in unloaded
-      call s:lod([name], ['ftdetect', 'after/ftdetect', 'plugin', 'after/plugin'])
-    endfor
-    call s:dobufread(unloaded)
-    return 1
-  end
-  return 0
-endfunction
-
-function! s:remove_triggers(name)
-  if !has_key(s:triggers, a:name)
-    return
-  endif
-  for cmd in s:triggers[a:name].cmd
-    execute 'silent! delc' cmd
-  endfor
-  for map in s:triggers[a:name].map
-    execute 'silent! unmap' map
-    execute 'silent! iunmap' map
-  endfor
-  call remove(s:triggers, a:name)
-endfunction
-
-function! s:lod(names, types, ...)
-  for name in a:names
-    call s:remove_triggers(name)
-    let s:loaded[name] = 1
-  endfor
-  call s:reorg_rtp()
-
-  for name in a:names
-    let rtp = s:rtp(g:plugs[name])
-    for dir in a:types
-      call s:source(rtp, dir.'/**/*.vim')
-    endfor
-    if a:0
-      if !s:source(rtp, a:1) && !empty(s:glob(rtp, a:2))
-        execute 'runtime' a:1
-      endif
-      call s:source(rtp, a:2)
-    endif
-    call s:doautocmd('User', name)
-  endfor
-endfunction
-
-function! s:lod_ft(pat, names)
-  let syn = 'syntax/'.a:pat.'.vim'
-  call s:lod(a:names, ['plugin', 'after/plugin'], syn, 'after/'.syn)
-  execute 'autocmd! PlugLOD FileType' a:pat
-  call s:doautocmd('filetypeplugin', 'FileType')
-  call s:doautocmd('filetypeindent', 'FileType')
-endfunction
-
-function! s:lod_cmd(cmd, bang, l1, l2, args, names)
-  call s:lod(a:names, ['ftdetect', 'after/ftdetect', 'plugin', 'after/plugin'])
-  call s:dobufread(a:names)
-  execute printf('%s%s%s %s', (a:l1 == a:l2 ? '' : (a:l1.','.a:l2)), a:cmd, a:bang, a:args)
-endfunction
-
-function! s:lod_map(map, names, with_prefix, prefix)
-  call s:lod(a:names, ['ftdetect', 'after/ftdetect', 'plugin', 'after/plugin'])
-  call s:dobufread(a:names)
-  let extra = ''
-  while 1
-    let c = getchar(0)
-    if c == 0
-      break
-    endif
-    let extra .= nr2char(c)
-  endwhile
-
-  if a:with_prefix
-    let prefix = v:count ? v:count : ''
-    let prefix .= '"'.v:register.a:prefix
-    if mode(1) == 'no'
-      if v:operator == 'c'
-        let prefix = "\<esc>" . prefix
-      endif
-      let prefix .= v:operator
-    endif
-    call feedkeys(prefix, 'n')
-  endif
-  call feedkeys(substitute(a:map, '^<Plug>', "\<Plug>", '') . extra)
-endfunction
-
-function! plug#(repo, ...)
-  if a:0 > 1
-    return s:err('Invalid number of arguments (1..2)')
-  endif
-
-  try
-    let repo = s:trim(a:repo)
-    let opts = a:0 == 1 ? s:parse_options(a:1) : s:base_spec
-    let name = get(opts, 'as', fnamemodify(repo, ':t:s?\.git$??'))
-    let spec = extend(s:infer_properties(name, repo), opts)
-    if !has_key(g:plugs, name)
-      call add(g:plugs_order, name)
-    endif
-    let g:plugs[name] = spec
-    let s:loaded[name] = get(s:loaded, name, 0)
-  catch
-    return s:err(v:exception)
-  endtry
-endfunction
-
-function! s:parse_options(arg)
-  let opts = copy(s:base_spec)
-  let type = type(a:arg)
-  if type == s:TYPE.string
-    let opts.tag = a:arg
-  elseif type == s:TYPE.dict
-    call extend(opts, a:arg)
-    if has_key(opts, 'dir')
-      let opts.dir = s:dirpath(expand(opts.dir))
-    endif
-  else
-    throw 'Invalid argument type (expected: string or dictionary)'
-  endif
-  return opts
-endfunction
-
-function! s:infer_properties(name, repo)
-  let repo = a:repo
-  if s:is_local_plug(repo)
-    return { 'dir': s:dirpath(expand(repo)) }
-  else
-    if repo =~ ':'
-      let uri = repo
-    else
-      if repo !~ '/'
-        throw printf('Invalid argument: %s (implicit `vim-scripts'' expansion is deprecated)', repo)
-      endif
-      let fmt = get(g:, 'plug_url_format', 'https://git::@github.com/%s.git')
-      let uri = printf(fmt, repo)
-    endif
-    return { 'dir': s:dirpath(g:plug_home.'/'.a:name), 'uri': uri }
-  endif
-endfunction
-
-function! s:install(force, names)
-  call s:update_impl(0, a:force, a:names)
-endfunction
-
-function! s:update(force, names)
-  call s:update_impl(1, a:force, a:names)
-endfunction
-
-function! plug#helptags()
-  if !exists('g:plugs')
-    return s:err('plug#begin was not called')
-  endif
-  for spec in values(g:plugs)
-    let docd = join([s:rtp(spec), 'doc'], '/')
-    if isdirectory(docd)
-      silent! execute 'helptags' s:esc(docd)
-    endif
-  endfor
-  return 1
-endfunction
-
-function! s:syntax()
-  syntax clear
-  syntax region plug1 start=/\%1l/ end=/\%2l/ contains=plugNumber
-  syntax region plug2 start=/\%2l/ end=/\%3l/ contains=plugBracket,plugX
-  syn match plugNumber /[0-9]\+[0-9.]*/ contained
-  syn match plugBracket /[[\]]/ contained
-  syn match plugX /x/ contained
-  syn match plugDash /^-/
-  syn match plugPlus /^+/
-  syn match plugStar /^*/
-  syn match plugMessage /\(^- \)\@<=.*/
-  syn match plugName /\(^- \)\@<=[^ ]*:/
-  syn match plugSha /\%(: \)\@<=[0-9a-f]\{4,}$/
-  syn match plugTag /(tag: [^)]\+)/
-  syn match plugInstall /\(^+ \)\@<=[^:]*/
-  syn match plugUpdate /\(^* \)\@<=[^:]*/
-  syn match plugCommit /^  \X*[0-9a-f]\{7,9} .*/ contains=plugRelDate,plugEdge,plugTag
-  syn match plugEdge /^  \X\+$/
-  syn match plugEdge /^  \X*/ contained nextgroup=plugSha
-  syn match plugSha /[0-9a-f]\{7,9}/ contained
-  syn match plugRelDate /([^)]*)$/ contained
-  syn match plugNotLoaded /(not loaded)$/
-  syn match plugError /^x.*/
-  syn region plugDeleted start=/^\~ .*/ end=/^\ze\S/
-  syn match plugH2 /^.*:\n-\+$/
-  syn keyword Function PlugInstall PlugStatus PlugUpdate PlugClean
-  hi def link plug1       Title
-  hi def link plug2       Repeat
-  hi def link plugH2      Type
-  hi def link plugX       Exception
-  hi def link plugBracket Structure
-  hi def link plugNumber  Number
-
-  hi def link plugDash    Special
-  hi def link plugPlus    Constant
-  hi def link plugStar    Boolean
-
-  hi def link plugMessage Function
-  hi def link plugName    Label
-  hi def link plugInstall Function
-  hi def link plugUpdate  Type
-
-  hi def link plugError   Error
-  hi def link plugDeleted Ignore
-  hi def link plugRelDate Comment
-  hi def link plugEdge    PreProc
-  hi def link plugSha     Identifier
-  hi def link plugTag     Constant
-
-  hi def link plugNotLoaded Comment
-endfunction
-
-function! s:lpad(str, len)
-  return a:str . repeat(' ', a:len - len(a:str))
-endfunction
-
-function! s:lines(msg)
-  return split(a:msg, "[\r\n]")
-endfunction
-
-function! s:lastline(msg)
-  return get(s:lines(a:msg), -1, '')
-endfunction
-
-function! s:new_window()
-  execute get(g:, 'plug_window', 'vertical topleft new')
-endfunction
-
-function! s:plug_window_exists()
-  let buflist = tabpagebuflist(s:plug_tab)
-  return !empty(buflist) && index(buflist, s:plug_buf) >= 0
-endfunction
-
-function! s:switch_in()
-  if !s:plug_window_exists()
-    return 0
-  endif
-
-  if winbufnr(0) != s:plug_buf
-    let s:pos = [tabpagenr(), winnr(), winsaveview()]
-    execute 'normal!' s:plug_tab.'gt'
-    let winnr = bufwinnr(s:plug_buf)
-    execute winnr.'wincmd w'
-    call add(s:pos, winsaveview())
-  else
-    let s:pos = [winsaveview()]
-  endif
-
-  setlocal modifiable
-  return 1
-endfunction
-
-function! s:switch_out(...)
-  call winrestview(s:pos[-1])
-  setlocal nomodifiable
-  if a:0 > 0
-    execute a:1
-  endif
-
-  if len(s:pos) > 1
-    execute 'normal!' s:pos[0].'gt'
-    execute s:pos[1] 'wincmd w'
-    call winrestview(s:pos[2])
-  endif
-endfunction
-
-function! s:finish_bindings()
-  nnoremap <silent> <buffer> R  :call <SID>retry()<cr>
-  nnoremap <silent> <buffer> D  :PlugDiff<cr>
-  nnoremap <silent> <buffer> S  :PlugStatus<cr>
-  nnoremap <silent> <buffer> U  :call <SID>status_update()<cr>
-  xnoremap <silent> <buffer> U  :call <SID>status_update()<cr>
-  nnoremap <silent> <buffer> ]] :silent! call <SID>section('')<cr>
-  nnoremap <silent> <buffer> [[ :silent! call <SID>section('b')<cr>
-endfunction
-
-function! s:prepare(...)
-  if empty(getcwd())
-    throw 'Invalid current working directory. Cannot proceed.'
-  endif
-
-  for evar in ['$GIT_DIR', '$GIT_WORK_TREE']
-    if exists(evar)
-      throw evar.' detected. Cannot proceed.'
-    endif
-  endfor
-
-  call s:job_abort()
-  if s:switch_in()
-    if b:plug_preview == 1
-      pc
-    endif
-    enew
-  else
-    call s:new_window()
-  endif
-
-  nnoremap <silent> <buffer> q  :if b:plug_preview==1<bar>pc<bar>endif<bar>bd<cr>
-  if a:0 == 0
-    call s:finish_bindings()
-  endif
-  let b:plug_preview = -1
-  let s:plug_tab = tabpagenr()
-  let s:plug_buf = winbufnr(0)
-  call s:assign_name()
-
-  for k in ['<cr>', 'L', 'o', 'X', 'd', 'dd']
-    execute 'silent! unmap <buffer>' k
-  endfor
-  setlocal buftype=nofile bufhidden=wipe nobuflisted nolist noswapfile nowrap cursorline modifiable nospell
-  if exists('+colorcolumn')
-    setlocal colorcolumn=
-  endif
-  setf vim-plug
-  if exists('g:syntax_on')
-    call s:syntax()
-  endif
-endfunction
-
-function! s:assign_name()
-  " Assign buffer name
-  let prefix = '[Plugins]'
-  let name   = prefix
-  let idx    = 2
-  while bufexists(name)
-    let name = printf('%s (%s)', prefix, idx)
-    let idx = idx + 1
-  endwhile
-  silent! execute 'f' fnameescape(name)
-endfunction
-
-function! s:chsh(swap)
-  let prev = [&shell, &shellcmdflag, &shellredir]
-  if s:is_win
-    set shell=cmd.exe shellcmdflag=/c shellredir=>%s\ 2>&1
-  elseif a:swap
-    set shell=sh shellredir=>%s\ 2>&1
-  endif
-  return prev
-endfunction
-
-function! s:bang(cmd, ...)
-  try
-    let [sh, shellcmdflag, shrd] = s:chsh(a:0)
-    " FIXME: Escaping is incomplete. We could use shellescape with eval,
-    "        but it won't work on Windows.
-    let cmd = a:0 ? s:with_cd(a:cmd, a:1) : a:cmd
-    if s:is_win
-      let batchfile = tempname().'.bat'
-      call writefile(["@echo off\r", cmd . "\r"], batchfile)
-      let cmd = batchfile
-    endif
-    let g:_plug_bang = (s:is_win && has('gui_running') ? 'silent ' : '').'!'.escape(cmd, '#!%')
-    execute "normal! :execute g:_plug_bang\<cr>\<cr>"
-  finally
-    unlet g:_plug_bang
-    let [&shell, &shellcmdflag, &shellredir] = [sh, shellcmdflag, shrd]
-    if s:is_win
-      call delete(batchfile)
-    endif
-  endtry
-  return v:shell_error ? 'Exit status: ' . v:shell_error : ''
-endfunction
-
-function! s:regress_bar()
-  let bar = substitute(getline(2)[1:-2], '.*\zs=', 'x', '')
-  call s:progress_bar(2, bar, len(bar))
-endfunction
-
-function! s:is_updated(dir)
-  return !empty(s:system_chomp('git log --pretty=format:"%h" "HEAD...HEAD@{1}"', a:dir))
-endfunction
-
-function! s:do(pull, force, todo)
-  for [name, spec] in items(a:todo)
-    if !isdirectory(spec.dir)
-      continue
-    endif
-    let installed = has_key(s:update.new, name)
-    let updated = installed ? 0 :
-      \ (a:pull && index(s:update.errors, name) < 0 && s:is_updated(spec.dir))
-    if a:force || installed || updated
-      execute 'cd' s:esc(spec.dir)
-      call append(3, '- Post-update hook for '. name .' ... ')
-      let error = ''
-      let type = type(spec.do)
-      if type == s:TYPE.string
-        if spec.do[0] == ':'
-          if !get(s:loaded, name, 0)
-            let s:loaded[name] = 1
-            call s:reorg_rtp()
-          endif
-          call s:load_plugin(spec)
-          try
-            execute spec.do[1:]
-          catch
-            let error = v:exception
-          endtry
-          if !s:plug_window_exists()
-            cd -
-            throw 'Warning: vim-plug was terminated by the post-update hook of '.name
-          endif
-        else
-          let error = s:bang(spec.do)
-        endif
-      elseif type == s:TYPE.funcref
-        try
-          let status = installed ? 'installed' : (updated ? 'updated' : 'unchanged')
-          call spec.do({ 'name': name, 'status': status, 'force': a:force })
-        catch
-          let error = v:exception
-        endtry
-      else
-        let error = 'Invalid hook type'
-      endif
-      call s:switch_in()
-      call setline(4, empty(error) ? (getline(4) . 'OK')
-                                 \ : ('x' . getline(4)[1:] . error))
-      if !empty(error)
-        call add(s:update.errors, name)
-        call s:regress_bar()
-      endif
-      cd -
-    endif
-  endfor
-endfunction
-
-function! s:hash_match(a, b)
-  return stridx(a:a, a:b) == 0 || stridx(a:b, a:a) == 0
-endfunction
-
-function! s:checkout(spec)
-  let sha = a:spec.commit
-  let output = s:system('git rev-parse HEAD', a:spec.dir)
-  if !v:shell_error && !s:hash_match(sha, s:lines(output)[0])
-    let output = s:system(
-          \ 'git fetch --depth 999999 && git checkout '.s:esc(sha).' --', a:spec.dir)
-  endif
-  return output
-endfunction
-
-function! s:finish(pull)
-  let new_frozen = len(filter(keys(s:update.new), 'g:plugs[v:val].frozen'))
-  if new_frozen
-    let s = new_frozen > 1 ? 's' : ''
-    call append(3, printf('- Installed %d frozen plugin%s', new_frozen, s))
-  endif
-  call append(3, '- Finishing ... ') | 4
-  redraw
-  call plug#helptags()
-  call plug#end()
-  call setline(4, getline(4) . 'Done!')
-  redraw
-  let msgs = []
-  if !empty(s:update.errors)
-    call add(msgs, "Press 'R' to retry.")
-  endif
-  if a:pull && len(s:update.new) < len(filter(getline(5, '$'),
-                \ "v:val =~ '^- ' && v:val !~# 'Already up.to.date'"))
-    call add(msgs, "Press 'D' to see the updated changes.")
-  endif
-  echo join(msgs, ' ')
-  call s:finish_bindings()
-endfunction
-
-function! s:retry()
-  if empty(s:update.errors)
-    return
-  endif
-  echo
-  call s:update_impl(s:update.pull, s:update.force,
-        \ extend(copy(s:update.errors), [s:update.threads]))
-endfunction
-
-function! s:is_managed(name)
-  return has_key(g:plugs[a:name], 'uri')
-endfunction
-
-function! s:names(...)
-  return sort(filter(keys(g:plugs), 'stridx(v:val, a:1) == 0 && s:is_managed(v:val)'))
-endfunction
-
-function! s:check_ruby()
-  silent! ruby require 'thread'; VIM::command("let g:plug_ruby = '#{RUBY_VERSION}'")
-  if !exists('g:plug_ruby')
-    redraw!
-    return s:warn('echom', 'Warning: Ruby interface is broken')
-  endif
-  let ruby_version = split(g:plug_ruby, '\.')
-  unlet g:plug_ruby
-  return s:version_requirement(ruby_version, [1, 8, 7])
-endfunction
-
-function! s:update_impl(pull, force, args) abort
-  let sync = index(a:args, '--sync') >= 0 || has('vim_starting')
-  let args = filter(copy(a:args), 'v:val != "--sync"')
-  let threads = (len(args) > 0 && args[-1] =~ '^[1-9][0-9]*$') ?
-                  \ remove(args, -1) : get(g:, 'plug_threads', 16)
-
-  let managed = filter(copy(g:plugs), 's:is_managed(v:key)')
-  let todo = empty(args) ? filter(managed, '!v:val.frozen || !isdirectory(v:val.dir)') :
-                         \ filter(managed, 'index(args, v:key) >= 0')
-
-  if empty(todo)
-    return s:warn('echo', 'No plugin to '. (a:pull ? 'update' : 'install'))
-  endif
-
-  if !s:is_win && s:git_version_requirement(2, 3)
-    let s:git_terminal_prompt = exists('$GIT_TERMINAL_PROMPT') ? $GIT_TERMINAL_PROMPT : ''
-    let $GIT_TERMINAL_PROMPT = 0
-    for plug in values(todo)
-      let plug.uri = substitute(plug.uri,
-            \ '^https://git::@github\.com', 'https://github.com', '')
-    endfor
-  endif
-
-  if !isdirectory(g:plug_home)
-    try
-      call mkdir(g:plug_home, 'p')
-    catch
-      return s:err(printf('Invalid plug directory: %s. '.
-              \ 'Try to call plug#begin with a valid directory', g:plug_home))
-    endtry
-  endif
-
-  if has('nvim') && !exists('*jobwait') && threads > 1
-    call s:warn('echom', '[vim-plug] Update Neovim for parallel installer')
-  endif
-
-  let use_job = s:nvim || s:vim8
-  let python = (has('python') || has('python3')) && !use_job
-  let ruby = has('ruby') && !use_job && (v:version >= 703 || v:version == 702 && has('patch374')) && !(s:is_win && has('gui_running')) && threads > 1 && s:check_ruby()
-
-  let s:update = {
-    \ 'start':   reltime(),
-    \ 'all':     todo,
-    \ 'todo':    copy(todo),
-    \ 'errors':  [],
-    \ 'pull':    a:pull,
-    \ 'force':   a:force,
-    \ 'new':     {},
-    \ 'threads': (python || ruby || use_job) ? min([len(todo), threads]) : 1,
-    \ 'bar':     '',
-    \ 'fin':     0
-  \ }
-
-  call s:prepare(1)
-  call append(0, ['', ''])
-  normal! 2G
-  silent! redraw
-
-  let s:clone_opt = get(g:, 'plug_shallow', 1) ?
-        \ '--depth 1' . (s:git_version_requirement(1, 7, 10) ? ' --no-single-branch' : '') : ''
-
-  if has('win32unix')
-    let s:clone_opt .= ' -c core.eol=lf -c core.autocrlf=input'
-  endif
-
-  let s:submodule_opt = s:git_version_requirement(2, 8) ? ' --jobs='.threads : ''
-
-  " Python version requirement (>= 2.7)
-  if python && !has('python3') && !ruby && !use_job && s:update.threads > 1
-    redir => pyv
-    silent python import platform; print platform.python_version()
-    redir END
-    let python = s:version_requirement(
-          \ map(split(split(pyv)[0], '\.'), 'str2nr(v:val)'), [2, 6])
-  endif
-
-  if (python || ruby) && s:update.threads > 1
-    try
-      let imd = &imd
-      if s:mac_gui
-        set noimd
-      endif
-      if ruby
-        call s:update_ruby()
-      else
-        call s:update_python()
-      endif
-    catch
-      let lines = getline(4, '$')
-      let printed = {}
-      silent! 4,$d _
-      for line in lines
-        let name = s:extract_name(line, '.', '')
-        if empty(name) || !has_key(printed, name)
-          call append('$', line)
-          if !empty(name)
-            let printed[name] = 1
-            if line[0] == 'x' && index(s:update.errors, name) < 0
-              call add(s:update.errors, name)
-            end
-          endif
-        endif
-      endfor
-    finally
-      let &imd = imd
-      call s:update_finish()
-    endtry
-  else
-    call s:update_vim()
-    while use_job && sync
-      sleep 100m
-      if s:update.fin
-        break
-      endif
-    endwhile
-  endif
-endfunction
-
-function! s:log4(name, msg)
-  call setline(4, printf('- %s (%s)', a:msg, a:name))
-  redraw
-endfunction
-
-function! s:update_finish()
-  if exists('s:git_terminal_prompt')
-    let $GIT_TERMINAL_PROMPT = s:git_terminal_prompt
-  endif
-  if s:switch_in()
-    call append(3, '- Updating ...') | 4
-    for [name, spec] in items(filter(copy(s:update.all), 'index(s:update.errors, v:key) < 0 && (s:update.force || s:update.pull || has_key(s:update.new, v:key))'))
-      let [pos, _] = s:logpos(name)
-      if !pos
-        continue
-      endif
-      if has_key(spec, 'commit')
-        call s:log4(name, 'Checking out '.spec.commit)
-        let out = s:checkout(spec)
-      elseif has_key(spec, 'tag')
-        let tag = spec.tag
-        if tag =~ '\*'
-          let tags = s:lines(s:system('git tag --list '.s:shellesc(tag).' --sort -version:refname 2>&1', spec.dir))
-          if !v:shell_error && !empty(tags)
-            let tag = tags[0]
-            call s:log4(name, printf('Latest tag for %s -> %s', spec.tag, tag))
-            call append(3, '')
-          endif
-        endif
-        call s:log4(name, 'Checking out '.tag)
-        let out = s:system('git checkout -q '.s:esc(tag).' -- 2>&1', spec.dir)
-      else
-        let branch = s:esc(get(spec, 'branch', 'master'))
-        call s:log4(name, 'Merging origin/'.branch)
-        let out = s:system('git checkout -q '.branch.' -- 2>&1'
-              \. (has_key(s:update.new, name) ? '' : ('&& git merge --ff-only origin/'.branch.' 2>&1')), spec.dir)
-      endif
-      if !v:shell_error && filereadable(spec.dir.'/.gitmodules') &&
-            \ (s:update.force || has_key(s:update.new, name) || s:is_updated(spec.dir))
-        call s:log4(name, 'Updating submodules. This may take a while.')
-        let out .= s:bang('git submodule update --init --recursive'.s:submodule_opt.' 2>&1', spec.dir)
-      endif
-      let msg = s:format_message(v:shell_error ? 'x': '-', name, out)
-      if v:shell_error
-        call add(s:update.errors, name)
-        call s:regress_bar()
-        silent execute pos 'd _'
-        call append(4, msg) | 4
-      elseif !empty(out)
-        call setline(pos, msg[0])
-      endif
-      redraw
-    endfor
-    silent 4 d _
-    try
-      call s:do(s:update.pull, s:update.force, filter(copy(s:update.all), 'index(s:update.errors, v:key) < 0 && has_key(v:val, "do")'))
-    catch
-      call s:warn('echom', v:exception)
-      call s:warn('echo', '')
-      return
-    endtry
-    call s:finish(s:update.pull)
-    call setline(1, 'Updated. Elapsed time: ' . split(reltimestr(reltime(s:update.start)))[0] . ' sec.')
-    call s:switch_out('normal! gg')
-  endif
-endfunction
-
-function! s:job_abort()
-  if (!s:nvim && !s:vim8) || !exists('s:jobs')
-    return
-  endif
-
-  for [name, j] in items(s:jobs)
-    if s:nvim
-      silent! call jobstop(j.jobid)
-    elseif s:vim8
-      silent! call job_stop(j.jobid)
-    endif
-    if j.new
-      call s:system('rm -rf ' . s:shellesc(g:plugs[name].dir))
-    endif
-  endfor
-  let s:jobs = {}
-endfunction
-
-function! s:last_non_empty_line(lines)
-  let len = len(a:lines)
-  for idx in range(len)
-    let line = a:lines[len-idx-1]
-    if !empty(line)
-      return line
-    endif
-  endfor
-  return ''
-endfunction
-
-function! s:job_out_cb(self, data) abort
-  let self = a:self
-  let data = remove(self.lines, -1) . a:data
-  let lines = map(split(data, "\n", 1), 'split(v:val, "\r", 1)[-1]')
-  call extend(self.lines, lines)
-  " To reduce the number of buffer updates
-  let self.tick = get(self, 'tick', -1) + 1
-  if !self.running || self.tick % len(s:jobs) == 0
-    let bullet = self.running ? (self.new ? '+' : '*') : (self.error ? 'x' : '-')
-    let result = self.error ? join(self.lines, "\n") : s:last_non_empty_line(self.lines)
-    call s:log(bullet, self.name, result)
-  endif
-endfunction
-
-function! s:job_exit_cb(self, data) abort
-  let a:self.running = 0
-  let a:self.error = a:data != 0
-  call s:reap(a:self.name)
-  call s:tick()
-endfunction
-
-function! s:job_cb(fn, job, ch, data)
-  if !s:plug_window_exists() " plug window closed
-    return s:job_abort()
-  endif
-  call call(a:fn, [a:job, a:data])
-endfunction
-
-function! s:nvim_cb(job_id, data, event) dict abort
-  return a:event == 'stdout' ?
-    \ s:job_cb('s:job_out_cb',  self, 0, join(a:data, "\n")) :
-    \ s:job_cb('s:job_exit_cb', self, 0, a:data)
-endfunction
-
-function! s:spawn(name, cmd, opts)
-  let job = { 'name': a:name, 'running': 1, 'error': 0, 'lines': [''],
-            \ 'batchfile': (s:is_win && (s:nvim || s:vim8)) ? tempname().'.bat' : '',
-            \ 'new': get(a:opts, 'new', 0) }
-  let s:jobs[a:name] = job
-  let cmd = has_key(a:opts, 'dir') ? s:with_cd(a:cmd, a:opts.dir) : a:cmd
-  if !empty(job.batchfile)
-    call writefile(["@echo off\r", cmd . "\r"], job.batchfile)
-    let cmd = job.batchfile
-  endif
-  let argv = add(s:is_win ? ['cmd', '/c'] : ['sh', '-c'], cmd)
-
-  if s:nvim
-    call extend(job, {
-    \ 'on_stdout': function('s:nvim_cb'),
-    \ 'on_exit':   function('s:nvim_cb'),
-    \ })
-    let jid = jobstart(argv, job)
-    if jid > 0
-      let job.jobid = jid
-    else
-      let job.running = 0
-      let job.error   = 1
-      let job.lines   = [jid < 0 ? argv[0].' is not executable' :
-            \ 'Invalid arguments (or job table is full)']
-    endif
-  elseif s:vim8
-    let jid = job_start(s:is_win ? join(argv, ' ') : argv, {
-    \ 'out_cb':   function('s:job_cb', ['s:job_out_cb',  job]),
-    \ 'exit_cb':  function('s:job_cb', ['s:job_exit_cb', job]),
-    \ 'out_mode': 'raw'
-    \})
-    if job_status(jid) == 'run'
-      let job.jobid = jid
-    else
-      let job.running = 0
-      let job.error   = 1
-      let job.lines   = ['Failed to start job']
-    endif
-  else
-    let job.lines = s:lines(call('s:system', [cmd]))
-    let job.error = v:shell_error != 0
-    let job.running = 0
-  endif
-endfunction
-
-function! s:reap(name)
-  let job = s:jobs[a:name]
-  if job.error
-    call add(s:update.errors, a:name)
-  elseif get(job, 'new', 0)
-    let s:update.new[a:name] = 1
-  endif
-  let s:update.bar .= job.error ? 'x' : '='
-
-  let bullet = job.error ? 'x' : '-'
-  let result = job.error ? join(job.lines, "\n") : s:last_non_empty_line(job.lines)
-  call s:log(bullet, a:name, empty(result) ? 'OK' : result)
-  call s:bar()
-
-  if has_key(job, 'batchfile') && !empty(job.batchfile)
-    call delete(job.batchfile)
-  endif
-  call remove(s:jobs, a:name)
-endfunction
-
-function! s:bar()
-  if s:switch_in()
-    let total = len(s:update.all)
-    call setline(1, (s:update.pull ? 'Updating' : 'Installing').
-          \ ' plugins ('.len(s:update.bar).'/'.total.')')
-    call s:progress_bar(2, s:update.bar, total)
-    call s:switch_out()
-  endif
-endfunction
-
-function! s:logpos(name)
-  for i in range(4, line('$'))
-    if getline(i) =~# '^[-+x*] '.a:name.':'
-      for j in range(i + 1, line('$'))
-        if getline(j) !~ '^ '
-          return [i, j - 1]
-        endif
-      endfor
-      return [i, i]
-    endif
-  endfor
-  return [0, 0]
-endfunction
-
-function! s:log(bullet, name, lines)
-  if s:switch_in()
-    let [b, e] = s:logpos(a:name)
-    if b > 0
-      silent execute printf('%d,%d d _', b, e)
-      if b > winheight('.')
-        let b = 4
-      endif
-    else
-      let b = 4
-    endif
-    " FIXME For some reason, nomodifiable is set after :d in vim8
-    setlocal modifiable
-    call append(b - 1, s:format_message(a:bullet, a:name, a:lines))
-    call s:switch_out()
-  endif
-endfunction
-
-function! s:update_vim()
-  let s:jobs = {}
-
-  call s:bar()
-  call s:tick()
-endfunction
-
-function! s:tick()
-  let pull = s:update.pull
-  let prog = s:progress_opt(s:nvim || s:vim8)
-while 1 " Without TCO, Vim stack is bound to explode
-  if empty(s:update.todo)
-    if empty(s:jobs) && !s:update.fin
-      call s:update_finish()
-      let s:update.fin = 1
-    endif
-    return
-  endif
-
-  let name = keys(s:update.todo)[0]
-  let spec = remove(s:update.todo, name)
-  let new  = empty(globpath(spec.dir, '.git', 1))
-
-  call s:log(new ? '+' : '*', name, pull ? 'Updating ...' : 'Installing ...')
-  redraw
-
-  let has_tag = has_key(spec, 'tag')
-  if !new
-    let [error, _] = s:git_validate(spec, 0)
-    if empty(error)
-      if pull
-        let fetch_opt = (has_tag && !empty(globpath(spec.dir, '.git/shallow'))) ? '--depth 99999999' : ''
-        call s:spawn(name, printf('git fetch %s %s 2>&1', fetch_opt, prog), { 'dir': spec.dir })
-      else
-        let s:jobs[name] = { 'running': 0, 'lines': ['Already installed'], 'error': 0 }
-      endif
-    else
-      let s:jobs[name] = { 'running': 0, 'lines': s:lines(error), 'error': 1 }
-    endif
-  else
-    call s:spawn(name,
-          \ printf('git clone %s %s %s %s 2>&1',
-          \ has_tag ? '' : s:clone_opt,
-          \ prog,
-          \ s:shellesc(spec.uri),
-          \ s:shellesc(s:trim(spec.dir))), { 'new': 1 })
-  endif
-
-  if !s:jobs[name].running
-    call s:reap(name)
-  endif
-  if len(s:jobs) >= s:update.threads
-    break
-  endif
-endwhile
-endfunction
-
-function! s:update_python()
-let py_exe = has('python') ? 'python' : 'python3'
-execute py_exe "<< EOF"
-import datetime
-import functools
-import os
-try:
-  import queue
-except ImportError:
-  import Queue as queue
-import random
-import re
-import shutil
-import signal
-import subprocess
-import tempfile
-import threading as thr
-import time
-import traceback
-import vim
-
-G_NVIM = vim.eval("has('nvim')") == '1'
-G_PULL = vim.eval('s:update.pull') == '1'
-G_RETRIES = int(vim.eval('get(g:, "plug_retries", 2)')) + 1
-G_TIMEOUT = int(vim.eval('get(g:, "plug_timeout", 60)'))
-G_CLONE_OPT = vim.eval('s:clone_opt')
-G_PROGRESS = vim.eval('s:progress_opt(1)')
-G_LOG_PROB = 1.0 / int(vim.eval('s:update.threads'))
-G_STOP = thr.Event()
-G_IS_WIN = vim.eval('s:is_win') == '1'
-
-class PlugError(Exception):
-  def __init__(self, msg):
-    self.msg = msg
-class CmdTimedOut(PlugError):
-  pass
-class CmdFailed(PlugError):
-  pass
-class InvalidURI(PlugError):
-  pass
-class Action(object):
-  INSTALL, UPDATE, ERROR, DONE = ['+', '*', 'x', '-']
-
-class Buffer(object):
-  def __init__(self, lock, num_plugs, is_pull):
-    self.bar = ''
-    self.event = 'Updating' if is_pull else 'Installing'
-    self.lock = lock
-    self.maxy = int(vim.eval('winheight(".")'))
-    self.num_plugs = num_plugs
-
-  def __where(self, name):
-    """ Find first line with name in current buffer. Return line num. """
-    found, lnum = False, 0
-    matcher = re.compile('^[-+x*] {0}:'.format(name))
-    for line in vim.current.buffer:
-      if matcher.search(line) is not None:
-        found = True
-        break
-      lnum += 1
-
-    if not found:
-      lnum = -1
-    return lnum
-
-  def header(self):
-    curbuf = vim.current.buffer
-    curbuf[0] = self.event + ' plugins ({0}/{1})'.format(len(self.bar), self.num_plugs)
-
-    num_spaces = self.num_plugs - len(self.bar)
-    curbuf[1] = '[{0}{1}]'.format(self.bar, num_spaces * ' ')
-
-    with self.lock:
-      vim.command('normal! 2G')
-      vim.command('redraw')
-
-  def write(self, action, name, lines):
-    first, rest = lines[0], lines[1:]
-    msg = ['{0} {1}{2}{3}'.format(action, name, ': ' if first else '', first)]
-    msg.extend(['    ' + line for line in rest])
-
-    try:
-      if action == Action.ERROR:
-        self.bar += 'x'
-        vim.command("call add(s:update.errors, '{0}')".format(name))
-      elif action == Action.DONE:
-        self.bar += '='
-
-      curbuf = vim.current.buffer
-      lnum = self.__where(name)
-      if lnum != -1: # Found matching line num
-        del curbuf[lnum]
-        if lnum > self.maxy and action in set([Action.INSTALL, Action.UPDATE]):
-          lnum = 3
-      else:
-        lnum = 3
-      curbuf.append(msg, lnum)
-
-      self.header()
-    except vim.error:
-      pass
-
-class Command(object):
-  CD = 'cd /d' if G_IS_WIN else 'cd'
-
-  def __init__(self, cmd, cmd_dir=None, timeout=60, cb=None, clean=None):
-    self.cmd = cmd
-    if cmd_dir:
-      self.cmd = '{0} {1} && {2}'.format(Command.CD, cmd_dir, self.cmd)
-    self.timeout = timeout
-    self.callback = cb if cb else (lambda msg: None)
-    self.clean = clean if clean else (lambda: None)
-    self.proc = None
-
-  @property
-  def alive(self):
-    """ Returns true only if command still running. """
-    return self.proc and self.proc.poll() is None
-
-  def execute(self, ntries=3):
-    """ Execute the command with ntries if CmdTimedOut.
-        Returns the output of the command if no Exception.
-    """
-    attempt, finished, limit = 0, False, self.timeout
-
-    while not finished:
-      try:
-        attempt += 1
-        result = self.try_command()
-        finished = True
-        return result
-      except CmdTimedOut:
-        if attempt != ntries:
-          self.notify_retry()
-          self.timeout += limit
-        else:
-          raise
-
-  def notify_retry(self):
-    """ Retry required for command, notify user. """
-    for count in range(3, 0, -1):
-      if G_STOP.is_set():
-        raise KeyboardInterrupt
-      msg = 'Timeout. Will retry in {0} second{1} ...'.format(
-            count, 's' if count != 1 else '')
-      self.callback([msg])
-      time.sleep(1)
-    self.callback(['Retrying ...'])
-
-  def try_command(self):
-    """ Execute a cmd & poll for callback. Returns list of output.
-        Raises CmdFailed   -> return code for Popen isn't 0
-        Raises CmdTimedOut -> command exceeded timeout without new output
-    """
-    first_line = True
-
-    try:
-      tfile = tempfile.NamedTemporaryFile(mode='w+b')
-      preexec_fn = not G_IS_WIN and os.setsid or None
-      self.proc = subprocess.Popen(self.cmd, stdout=tfile,
-                                   stderr=subprocess.STDOUT,
-                                   stdin=subprocess.PIPE, shell=True,
-                                   preexec_fn=preexec_fn)
-      thrd = thr.Thread(target=(lambda proc: proc.wait()), args=(self.proc,))
-      thrd.start()
-
-      thread_not_started = True
-      while thread_not_started:
-        try:
-          thrd.join(0.1)
-          thread_not_started = False
-        except RuntimeError:
-          pass
-
-      while self.alive:
-        if G_STOP.is_set():
-          raise KeyboardInterrupt
-
-        if first_line or random.random() < G_LOG_PROB:
-          first_line = False
-          line = '' if G_IS_WIN else nonblock_read(tfile.name)
-          if line:
-            self.callback([line])
-
-        time_diff = time.time() - os.path.getmtime(tfile.name)
-        if time_diff > self.timeout:
-          raise CmdTimedOut(['Timeout!'])
-
-        thrd.join(0.5)
-
-      tfile.seek(0)
-      result = [line.decode('utf-8', 'replace').rstrip() for line in tfile]
-
-      if self.proc.returncode != 0:
-        raise CmdFailed([''] + result)
-
-      return result
-    except:
-      self.terminate()
-      raise
-
-  def terminate(self):
-    """ Terminate process and cleanup. """
-    if self.alive:
-      if G_IS_WIN:
-        os.kill(self.proc.pid, signal.SIGINT)
-      else:
-        os.killpg(self.proc.pid, signal.SIGTERM)
-    self.clean()
-
-class Plugin(object):
-  def __init__(self, name, args, buf_q, lock):
-    self.name = name
-    self.args = args
-    self.buf_q = buf_q
-    self.lock = lock
-    self.tag = args.get('tag', 0)
-
-  def manage(self):
-    try:
-      if os.path.exists(self.args['dir']):
-        self.update()
-      else:
-        self.install()
-        with self.lock:
-          thread_vim_command("let s:update.new['{0}'] = 1".format(self.name))
-    except PlugError as exc:
-      self.write(Action.ERROR, self.name, exc.msg)
-    except KeyboardInterrupt:
-      G_STOP.set()
-      self.write(Action.ERROR, self.name, ['Interrupted!'])
-    except:
-      # Any exception except those above print stack trace
-      msg = 'Trace:\n{0}'.format(traceback.format_exc().rstrip())
-      self.write(Action.ERROR, self.name, msg.split('\n'))
-      raise
-
-  def install(self):
-    target = self.args['dir']
-    if target[-1] == '\\':
-      target = target[0:-1]
-
-    def clean(target):
-      def _clean():
-        try:
-          shutil.rmtree(target)
-        except OSError:
-          pass
-      return _clean
-
-    self.write(Action.INSTALL, self.name, ['Installing ...'])
-    callback = functools.partial(self.write, Action.INSTALL, self.name)
-    cmd = 'git clone {0} {1} {2} {3} 2>&1'.format(
-          '' if self.tag else G_CLONE_OPT, G_PROGRESS, self.args['uri'],
-          esc(target))
-    com = Command(cmd, None, G_TIMEOUT, callback, clean(target))
-    result = com.execute(G_RETRIES)
-    self.write(Action.DONE, self.name, result[-1:])
-
-  def repo_uri(self):
-    cmd = 'git rev-parse --abbrev-ref HEAD 2>&1 && git config -f .git/config remote.origin.url'
-    command = Command(cmd, self.args['dir'], G_TIMEOUT,)
-    result = command.execute(G_RETRIES)
-    return result[-1]
-
-  def update(self):
-    actual_uri = self.repo_uri()
-    expect_uri = self.args['uri']
-    regex = re.compile(r'^(?:\w+://)?(?:[^@/]*@)?([^:/]*(?::[0-9]*)?)[:/](.*?)(?:\.git)?/?$')
-    ma = regex.match(actual_uri)
-    mb = regex.match(expect_uri)
-    if ma is None or mb is None or ma.groups() != mb.groups():
-      msg = ['',
-             'Invalid URI: {0}'.format(actual_uri),
-             'Expected     {0}'.format(expect_uri),
-             'PlugClean required.']
-      raise InvalidURI(msg)
-
-    if G_PULL:
-      self.write(Action.UPDATE, self.name, ['Updating ...'])
-      callback = functools.partial(self.write, Action.UPDATE, self.name)
-      fetch_opt = '--depth 99999999' if self.tag and os.path.isfile(os.path.join(self.args['dir'], '.git/shallow')) else ''
-      cmd = 'git fetch {0} {1} 2>&1'.format(fetch_opt, G_PROGRESS)
-      com = Command(cmd, self.args['dir'], G_TIMEOUT, callback)
-      result = com.execute(G_RETRIES)
-      self.write(Action.DONE, self.name, result[-1:])
-    else:
-      self.write(Action.DONE, self.name, ['Already installed'])
-
-  def write(self, action, name, msg):
-    self.buf_q.put((action, name, msg))
-
-class PlugThread(thr.Thread):
-  def __init__(self, tname, args):
-    super(PlugThread, self).__init__()
-    self.tname = tname
-    self.args = args
-
-  def run(self):
-    thr.current_thread().name = self.tname
-    buf_q, work_q, lock = self.args
-
-    try:
-      while not G_STOP.is_set():
-        name, args = work_q.get_nowait()
-        plug = Plugin(name, args, buf_q, lock)
-        plug.manage()
-        work_q.task_done()
-    except queue.Empty:
-      pass
-
-class RefreshThread(thr.Thread):
-  def __init__(self, lock):
-    super(RefreshThread, self).__init__()
-    self.lock = lock
-    self.running = True
-
-  def run(self):
-    while self.running:
-      with self.lock:
-        thread_vim_command('noautocmd normal! a')
-      time.sleep(0.33)
-
-  def stop(self):
-    self.running = False
-
-if G_NVIM:
-  def thread_vim_command(cmd):
-    vim.session.threadsafe_call(lambda: vim.command(cmd))
-else:
-  def thread_vim_command(cmd):
-    vim.command(cmd)
-
-def esc(name):
-  return '"' + name.replace('"', '\"') + '"'
-
-def nonblock_read(fname):
-  """ Read a file with nonblock flag. Return the last line. """
-  fread = os.open(fname, os.O_RDONLY | os.O_NONBLOCK)
-  buf = os.read(fread, 100000).decode('utf-8', 'replace')
-  os.close(fread)
-
-  line = buf.rstrip('\r\n')
-  left = max(line.rfind('\r'), line.rfind('\n'))
-  if left != -1:
-    left += 1
-    line = line[left:]
-
-  return line
-
-def main():
-  thr.current_thread().name = 'main'
-  nthreads = int(vim.eval('s:update.threads'))
-  plugs = vim.eval('s:update.todo')
-  mac_gui = vim.eval('s:mac_gui') == '1'
-
-  lock = thr.Lock()
-  buf = Buffer(lock, len(plugs), G_PULL)
-  buf_q, work_q = queue.Queue(), queue.Queue()
-  for work in plugs.items():
-    work_q.put(work)
-
-  start_cnt = thr.active_count()
-  for num in range(nthreads):
-    tname = 'PlugT-{0:02}'.format(num)
-    thread = PlugThread(tname, (buf_q, work_q, lock))
-    thread.start()
-  if mac_gui:
-    rthread = RefreshThread(lock)
-    rthread.start()
-
-  while not buf_q.empty() or thr.active_count() != start_cnt:
-    try:
-      action, name, msg = buf_q.get(True, 0.25)
-      buf.write(action, name, ['OK'] if not msg else msg)
-      buf_q.task_done()
-    except queue.Empty:
-      pass
-    except KeyboardInterrupt:
-      G_STOP.set()
-
-  if mac_gui:
-    rthread.stop()
-    rthread.join()
-
-main()
-EOF
-endfunction
-
-function! s:update_ruby()
-  ruby << EOF
-  module PlugStream
-    SEP = ["\r", "\n", nil]
-    def get_line
-      buffer = ''
-      loop do
-        char = readchar rescue return
-        if SEP.include? char.chr
-          buffer << $/
-          break
-        else
-          buffer << char
-        end
-      end
-      buffer
-    end
-  end unless defined?(PlugStream)
-
-  def esc arg
-    %["#{arg.gsub('"', '\"')}"]
-  end
-
-  def killall pid
-    pids = [pid]
-    if /mswin|mingw|bccwin/ =~ RUBY_PLATFORM
-      pids.each { |pid| Process.kill 'INT', pid.to_i rescue nil }
-    else
-      unless `which pgrep 2> /dev/null`.empty?
-        children = pids
-        until children.empty?
-          children = children.map { |pid|
-            `pgrep -P #{pid}`.lines.map { |l| l.chomp }
-          }.flatten
-          pids += children
-        end
-      end
-      pids.each { |pid| Process.kill 'TERM', pid.to_i rescue nil }
-    end
-  end
-
-  def compare_git_uri a, b
-    regex = %r{^(?:\w+://)?(?:[^@/]*@)?([^:/]*(?::[0-9]*)?)[:/](.*?)(?:\.git)?/?$}
-    regex.match(a).to_a.drop(1) == regex.match(b).to_a.drop(1)
-  end
-
-  require 'thread'
-  require 'fileutils'
-  require 'timeout'
-  running = true
-  iswin = VIM::evaluate('s:is_win').to_i == 1
-  pull  = VIM::evaluate('s:update.pull').to_i == 1
-  base  = VIM::evaluate('g:plug_home')
-  all   = VIM::evaluate('s:update.todo')
-  limit = VIM::evaluate('get(g:, "plug_timeout", 60)')
-  tries = VIM::evaluate('get(g:, "plug_retries", 2)') + 1
-  nthr  = VIM::evaluate('s:update.threads').to_i
-  maxy  = VIM::evaluate('winheight(".")').to_i
-  vim7  = VIM::evaluate('v:version').to_i <= 703 && RUBY_PLATFORM =~ /darwin/
-  cd    = iswin ? 'cd /d' : 'cd'
-  tot   = VIM::evaluate('len(s:update.todo)') || 0
-  bar   = ''
-  skip  = 'Already installed'
-  mtx   = Mutex.new
-  take1 = proc { mtx.synchronize { running && all.shift } }
-  logh  = proc {
-    cnt = bar.length
-    $curbuf[1] = "#{pull ? 'Updating' : 'Installing'} plugins (#{cnt}/#{tot})"
-    $curbuf[2] = '[' + bar.ljust(tot) + ']'
-    VIM::command('normal! 2G')
-    VIM::command('redraw')
-  }
-  where = proc { |name| (1..($curbuf.length)).find { |l| $curbuf[l] =~ /^[-+x*] #{name}:/ } }
-  log   = proc { |name, result, type|
-    mtx.synchronize do
-      ing  = ![true, false].include?(type)
-      bar += type ? '=' : 'x' unless ing
-      b = case type
-          when :install  then '+' when :update then '*'
-          when true, nil then '-' else
-            VIM::command("call add(s:update.errors, '#{name}')")
-            'x'
-          end
-      result =
-        if type || type.nil?
-          ["#{b} #{name}: #{result.lines.to_a.last || 'OK'}"]
-        elsif result =~ /^Interrupted|^Timeout/
-          ["#{b} #{name}: #{result}"]
-        else
-          ["#{b} #{name}"] + result.lines.map { |l| "    " << l }
-        end
-      if lnum = where.call(name)
-        $curbuf.delete lnum
-        lnum = 4 if ing && lnum > maxy
-      end
-      result.each_with_index do |line, offset|
-        $curbuf.append((lnum || 4) - 1 + offset, line.gsub(/\e\[./, '').chomp)
-      end
-      logh.call
-    end
-  }
-  bt = proc { |cmd, name, type, cleanup|
-    tried = timeout = 0
-    begin
-      tried += 1
-      timeout += limit
-      fd = nil
-      data = ''
-      if iswin
-        Timeout::timeout(timeout) do
-          tmp = VIM::evaluate('tempname()')
-          system("(#{cmd}) > #{tmp}")
-          data = File.read(tmp).chomp
-          File.unlink tmp rescue nil
-        end
-      else
-        fd = IO.popen(cmd).extend(PlugStream)
-        first_line = true
-        log_prob = 1.0 / nthr
-        while line = Timeout::timeout(timeout) { fd.get_line }
-          data << line
-          log.call name, line.chomp, type if name && (first_line || rand < log_prob)
-          first_line = false
-        end
-        fd.close
-      end
-      [$? == 0, data.chomp]
-    rescue Timeout::Error, Interrupt => e
-      if fd && !fd.closed?
-        killall fd.pid
-        fd.close
-      end
-      cleanup.call if cleanup
-      if e.is_a?(Timeout::Error) && tried < tries
-        3.downto(1) do |countdown|
-          s = countdown > 1 ? 's' : ''
-          log.call name, "Timeout. Will retry in #{countdown} second#{s} ...", type
-          sleep 1
-        end
-        log.call name, 'Retrying ...', type
-        retry
-      end
-      [false, e.is_a?(Interrupt) ? "Interrupted!" : "Timeout!"]
-    end
-  }
-  main = Thread.current
-  threads = []
-  watcher = Thread.new {
-    if vim7
-      while VIM::evaluate('getchar(1)')
-        sleep 0.1
-      end
-    else
-      require 'io/console' # >= Ruby 1.9
-      nil until IO.console.getch == 3.chr
-    end
-    mtx.synchronize do
-      running = false
-      threads.each { |t| t.raise Interrupt } unless vim7
-    end
-    threads.each { |t| t.join rescue nil }
-    main.kill
-  }
-  refresh = Thread.new {
-    while true
-      mtx.synchronize do
-        break unless running
-        VIM::command('noautocmd normal! a')
-      end
-      sleep 0.2
-    end
-  } if VIM::evaluate('s:mac_gui') == 1
-
-  clone_opt = VIM::evaluate('s:clone_opt')
-  progress = VIM::evaluate('s:progress_opt(1)')
-  nthr.times do
-    mtx.synchronize do
-      threads << Thread.new {
-        while pair = take1.call
-          name = pair.first
-          dir, uri, tag = pair.last.values_at *%w[dir uri tag]
-          exists = File.directory? dir
-          ok, result =
-            if exists
-              chdir = "#{cd} #{iswin ? dir : esc(dir)}"
-              ret, data = bt.call "#{chdir} && git rev-parse --abbrev-ref HEAD 2>&1 && git config -f .git/config remote.origin.url", nil, nil, nil
-              current_uri = data.lines.to_a.last
-              if !ret
-                if data =~ /^Interrupted|^Timeout/
-                  [false, data]
-                else
-                  [false, [data.chomp, "PlugClean required."].join($/)]
-                end
-              elsif !compare_git_uri(current_uri, uri)
-                [false, ["Invalid URI: #{current_uri}",
-                         "Expected:    #{uri}",
-                         "PlugClean required."].join($/)]
-              else
-                if pull
-                  log.call name, 'Updating ...', :update
-                  fetch_opt = (tag && File.exist?(File.join(dir, '.git/shallow'))) ? '--depth 99999999' : ''
-                  bt.call "#{chdir} && git fetch #{fetch_opt} #{progress} 2>&1", name, :update, nil
-                else
-                  [true, skip]
-                end
-              end
-            else
-              d = esc dir.sub(%r{[\\/]+$}, '')
-              log.call name, 'Installing ...', :install
-              bt.call "git clone #{clone_opt unless tag} #{progress} #{uri} #{d} 2>&1", name, :install, proc {
-                FileUtils.rm_rf dir
-              }
-            end
-          mtx.synchronize { VIM::command("let s:update.new['#{name}'] = 1") } if !exists && ok
-          log.call name, result, ok
-        end
-      } if running
-    end
-  end
-  threads.each { |t| t.join rescue nil }
-  logh.call
-  refresh.kill if refresh
-  watcher.kill
-EOF
-endfunction
-
-function! s:shellesc_cmd(arg)
-  let escaped = substitute(a:arg, '[&|<>()@^]', '^&', 'g')
-  let escaped = substitute(escaped, '%', '%%', 'g')
-  let escaped = substitute(escaped, '"', '\\^&', 'g')
-  let escaped = substitute(escaped, '\(\\\+\)\(\\^\)', '\1\1\2', 'g')
-  return '^"'.substitute(escaped, '\(\\\+\)$', '\1\1', '').'^"'
-endfunction
-
-function! s:shellesc(arg)
-  if &shell =~# 'cmd.exe$'
-    return s:shellesc_cmd(a:arg)
-  endif
-  return shellescape(a:arg)
-endfunction
-
-function! s:glob_dir(path)
-  return map(filter(s:glob(a:path, '**'), 'isdirectory(v:val)'), 's:dirpath(v:val)')
-endfunction
-
-function! s:progress_bar(line, bar, total)
-  call setline(a:line, '[' . s:lpad(a:bar, a:total) . ']')
-endfunction
-
-function! s:compare_git_uri(a, b)
-  " See `git help clone'
-  " https:// [user@] github.com[:port] / junegunn/vim-plug [.git]
-  "          [git@]  github.com[:port] : junegunn/vim-plug [.git]
-  " file://                            / junegunn/vim-plug        [/]
-  "                                    / junegunn/vim-plug        [/]
-  let pat = '^\%(\w\+://\)\='.'\%([^@/]*@\)\='.'\([^:/]*\%(:[0-9]*\)\=\)'.'[:/]'.'\(.\{-}\)'.'\%(\.git\)\=/\?$'
-  let ma = matchlist(a:a, pat)
-  let mb = matchlist(a:b, pat)
-  return ma[1:2] ==# mb[1:2]
-endfunction
-
-function! s:format_message(bullet, name, message)
-  if a:bullet != 'x'
-    return [printf('%s %s: %s', a:bullet, a:name, s:lastline(a:message))]
-  else
-    let lines = map(s:lines(a:message), '"    ".v:val')
-    return extend([printf('x %s:', a:name)], lines)
-  endif
-endfunction
-
-function! s:with_cd(cmd, dir)
-  return printf('cd%s %s && %s', s:is_win ? ' /d' : '', s:shellesc(a:dir), a:cmd)
-endfunction
-
-function! s:system(cmd, ...)
-  try
-    let [sh, shellcmdflag, shrd] = s:chsh(1)
-    let cmd = a:0 > 0 ? s:with_cd(a:cmd, a:1) : a:cmd
-    if s:is_win
-      let batchfile = tempname().'.bat'
-      call writefile(["@echo off\r", cmd . "\r"], batchfile)
-      let cmd = batchfile
-    endif
-    return system(s:is_win ? '('.cmd.')' : cmd)
-  finally
-    let [&shell, &shellcmdflag, &shellredir] = [sh, shellcmdflag, shrd]
-    if s:is_win
-      call delete(batchfile)
-    endif
-  endtry
-endfunction
-
-function! s:system_chomp(...)
-  let ret = call('s:system', a:000)
-  return v:shell_error ? '' : substitute(ret, '\n$', '', '')
-endfunction
-
-function! s:git_validate(spec, check_branch)
-  let err = ''
-  if isdirectory(a:spec.dir)
-    let result = s:lines(s:system('git rev-parse --abbrev-ref HEAD 2>&1 && git config -f .git/config remote.origin.url', a:spec.dir))
-    let remote = result[-1]
-    if v:shell_error
-      let err = join([remote, 'PlugClean required.'], "\n")
-    elseif !s:compare_git_uri(remote, a:spec.uri)
-      let err = join(['Invalid URI: '.remote,
-                    \ 'Expected:    '.a:spec.uri,
-                    \ 'PlugClean required.'], "\n")
-    elseif a:check_branch && has_key(a:spec, 'commit')
-      let result = s:lines(s:system('git rev-parse HEAD 2>&1', a:spec.dir))
-      let sha = result[-1]
-      if v:shell_error
-        let err = join(add(result, 'PlugClean required.'), "\n")
-      elseif !s:hash_match(sha, a:spec.commit)
-        let err = join([printf('Invalid HEAD (expected: %s, actual: %s)',
-                              \ a:spec.commit[:6], sha[:6]),
-                      \ 'PlugUpdate required.'], "\n")
-      endif
-    elseif a:check_branch
-      let branch = result[0]
-      " Check tag
-      if has_key(a:spec, 'tag')
-        let tag = s:system_chomp('git describe --exact-match --tags HEAD 2>&1', a:spec.dir)
-        if a:spec.tag !=# tag && a:spec.tag !~ '\*'
-          let err = printf('Invalid tag: %s (expected: %s). Try PlugUpdate.',
-                \ (empty(tag) ? 'N/A' : tag), a:spec.tag)
-        endif
-      " Check branch
-      elseif a:spec.branch !=# branch
-        let err = printf('Invalid branch: %s (expected: %s). Try PlugUpdate.',
-              \ branch, a:spec.branch)
-      endif
-      if empty(err)
-        let [ahead, behind] = split(s:lastline(s:system(printf(
-              \ 'git rev-list --count --left-right HEAD...origin/%s',
-              \ a:spec.branch), a:spec.dir)), '\t')
-        if !v:shell_error && ahead
-          if behind
-            " Only mention PlugClean if diverged, otherwise it's likely to be
-            " pushable (and probably not that messed up).
-            let err = printf(
-                  \ "Diverged from origin/%s (%d commit(s) ahead and %d commit(s) behind!\n"
-                  \ .'Backup local changes and run PlugClean and PlugUpdate to reinstall it.', a:spec.branch, ahead, behind)
-          else
-            let err = printf("Ahead of origin/%s by %d commit(s).\n"
-                  \ .'Cannot update until local changes are pushed.',
-                  \ a:spec.branch, ahead)
-          endif
-        endif
-      endif
-    endif
-  else
-    let err = 'Not found'
-  endif
-  return [err, err =~# 'PlugClean']
-endfunction
-
-function! s:rm_rf(dir)
-  if isdirectory(a:dir)
-    call s:system((s:is_win ? 'rmdir /S /Q ' : 'rm -rf ') . s:shellesc(a:dir))
-  endif
-endfunction
-
-function! s:clean(force)
-  call s:prepare()
-  call append(0, 'Searching for invalid plugins in '.g:plug_home)
-  call append(1, '')
-
-  " List of valid directories
-  let dirs = []
-  let errs = {}
-  let [cnt, total] = [0, len(g:plugs)]
-  for [name, spec] in items(g:plugs)
-    if !s:is_managed(name)
-      call add(dirs, spec.dir)
-    else
-      let [err, clean] = s:git_validate(spec, 1)
-      if clean
-        let errs[spec.dir] = s:lines(err)[0]
-      else
-        call add(dirs, spec.dir)
-      endif
-    endif
-    let cnt += 1
-    call s:progress_bar(2, repeat('=', cnt), total)
-    normal! 2G
-    redraw
-  endfor
-
-  let allowed = {}
-  for dir in dirs
-    let allowed[s:dirpath(fnamemodify(dir, ':h:h'))] = 1
-    let allowed[dir] = 1
-    for child in s:glob_dir(dir)
-      let allowed[child] = 1
-    endfor
-  endfor
-
-  let todo = []
-  let found = sort(s:glob_dir(g:plug_home))
-  while !empty(found)
-    let f = remove(found, 0)
-    if !has_key(allowed, f) && isdirectory(f)
-      call add(todo, f)
-      call append(line('$'), '- ' . f)
-      if has_key(errs, f)
-        call append(line('$'), '    ' . errs[f])
-      endif
-      let found = filter(found, 'stridx(v:val, f) != 0')
-    end
-  endwhile
-
-  4
-  redraw
-  if empty(todo)
-    call append(line('$'), 'Already clean.')
-  else
-    let s:clean_count = 0
-    call append(3, ['Directories to delete:', ''])
-    redraw!
-    if a:force || s:ask_no_interrupt('Delete all directories?')
-      call s:delete([6, line('$')], 1)
-    else
-      call setline(4, 'Cancelled.')
-      nnoremap <silent> <buffer> d :set opfunc=<sid>delete_op<cr>g@
-      nmap     <silent> <buffer> dd d_
-      xnoremap <silent> <buffer> d :<c-u>call <sid>delete_op(visualmode(), 1)<cr>
-      echo 'Delete the lines (d{motion}) to delete the corresponding directories'
-    endif
-  endif
-  4
-  setlocal nomodifiable
-endfunction
-
-function! s:delete_op(type, ...)
-  call s:delete(a:0 ? [line("'<"), line("'>")] : [line("'["), line("']")], 0)
-endfunction
-
-function! s:delete(range, force)
-  let [l1, l2] = a:range
-  let force = a:force
-  while l1 <= l2
-    let line = getline(l1)
-    if line =~ '^- ' && isdirectory(line[2:])
-      execute l1
-      redraw!
-      let answer = force ? 1 : s:ask('Delete '.line[2:].'?', 1)
-      let force = force || answer > 1
-      if answer
-        call s:rm_rf(line[2:])
-        setlocal modifiable
-        call setline(l1, '~'.line[1:])
-        let s:clean_count += 1
-        call setline(4, printf('Removed %d directories.', s:clean_count))
-        setlocal nomodifiable
-      endif
-    endif
-    let l1 += 1
-  endwhile
-endfunction
-
-function! s:upgrade()
-  echo 'Downloading the latest version of vim-plug'
-  redraw
-  let tmp = tempname()
-  let new = tmp . '/plug.vim'
-
-  try
-    let out = s:system(printf('git clone --depth 1 %s %s', s:plug_src, tmp))
-    if v:shell_error
-      return s:err('Error upgrading vim-plug: '. out)
-    endif
-
-    if readfile(s:me) ==# readfile(new)
-      echo 'vim-plug is already up-to-date'
-      return 0
-    else
-      call rename(s:me, s:me . '.old')
-      call rename(new, s:me)
-      unlet g:loaded_plug
-      echo 'vim-plug has been upgraded'
-      return 1
-    endif
-  finally
-    silent! call s:rm_rf(tmp)
-  endtry
-endfunction
-
-function! s:upgrade_specs()
-  for spec in values(g:plugs)
-    let spec.frozen = get(spec, 'frozen', 0)
-  endfor
-endfunction
-
-function! s:status()
-  call s:prepare()
-  call append(0, 'Checking plugins')
-  call append(1, '')
-
-  let ecnt = 0
-  let unloaded = 0
-  let [cnt, total] = [0, len(g:plugs)]
-  for [name, spec] in items(g:plugs)
-    let is_dir = isdirectory(spec.dir)
-    if has_key(spec, 'uri')
-      if is_dir
-        let [err, _] = s:git_validate(spec, 1)
-        let [valid, msg] = [empty(err), empty(err) ? 'OK' : err]
-      else
-        let [valid, msg] = [0, 'Not found. Try PlugInstall.']
-      endif
-    else
-      if is_dir
-        let [valid, msg] = [1, 'OK']
-      else
-        let [valid, msg] = [0, 'Not found.']
-      endif
-    endif
-    let cnt += 1
-    let ecnt += !valid
-    " `s:loaded` entry can be missing if PlugUpgraded
-    if is_dir && get(s:loaded, name, -1) == 0
-      let unloaded = 1
-      let msg .= ' (not loaded)'
-    endif
-    call s:progress_bar(2, repeat('=', cnt), total)
-    call append(3, s:format_message(valid ? '-' : 'x', name, msg))
-    normal! 2G
-    redraw
-  endfor
-  call setline(1, 'Finished. '.ecnt.' error(s).')
-  normal! gg
-  setlocal nomodifiable
-  if unloaded
-    echo "Press 'L' on each line to load plugin, or 'U' to update"
-    nnoremap <silent> <buffer> L :call <SID>status_load(line('.'))<cr>
-    xnoremap <silent> <buffer> L :call <SID>status_load(line('.'))<cr>
-  end
-endfunction
-
-function! s:extract_name(str, prefix, suffix)
-  return matchstr(a:str, '^'.a:prefix.' \zs[^:]\+\ze:.*'.a:suffix.'$')
-endfunction
-
-function! s:status_load(lnum)
-  let line = getline(a:lnum)
-  let name = s:extract_name(line, '-', '(not loaded)')
-  if !empty(name)
-    call plug#load(name)
-    setlocal modifiable
-    call setline(a:lnum, substitute(line, ' (not loaded)$', '', ''))
-    setlocal nomodifiable
-  endif
-endfunction
-
-function! s:status_update() range
-  let lines = getline(a:firstline, a:lastline)
-  let names = filter(map(lines, 's:extract_name(v:val, "[x-]", "")'), '!empty(v:val)')
-  if !empty(names)
-    echo
-    execute 'PlugUpdate' join(names)
-  endif
-endfunction
-
-function! s:is_preview_window_open()
-  silent! wincmd P
-  if &previewwindow
-    wincmd p
-    return 1
-  endif
-endfunction
-
-function! s:find_name(lnum)
-  for lnum in reverse(range(1, a:lnum))
-    let line = getline(lnum)
-    if empty(line)
-      return ''
-    endif
-    let name = s:extract_name(line, '-', '')
-    if !empty(name)
-      return name
-    endif
-  endfor
-  return ''
-endfunction
-
-function! s:preview_commit()
-  if b:plug_preview < 0
-    let b:plug_preview = !s:is_preview_window_open()
-  endif
-
-  let sha = matchstr(getline('.'), '^  \X*\zs[0-9a-f]\{7,9}')
-  if empty(sha)
-    return
-  endif
-
-  let name = s:find_name(line('.'))
-  if empty(name) || !has_key(g:plugs, name) || !isdirectory(g:plugs[name].dir)
-    return
-  endif
-
-  if exists('g:plug_pwindow') && !s:is_preview_window_open()
-    execute g:plug_pwindow
-    execute 'e' sha
-  else
-    execute 'pedit' sha
-    wincmd P
-  endif
-  setlocal previewwindow filetype=git buftype=nofile nobuflisted modifiable
-  try
-    let [sh, shellcmdflag, shrd] = s:chsh(1)
-    let cmd = 'cd '.s:shellesc(g:plugs[name].dir).' && git show --no-color --pretty=medium '.sha
-    if s:is_win
-      let batchfile = tempname().'.bat'
-      call writefile(["@echo off\r", cmd . "\r"], batchfile)
-      let cmd = batchfile
-    endif
-    execute 'silent %!' cmd
-  finally
-    let [&shell, &shellcmdflag, &shellredir] = [sh, shellcmdflag, shrd]
-    if s:is_win
-      call delete(batchfile)
-    endif
-  endtry
-  setlocal nomodifiable
-  nnoremap <silent> <buffer> q :q<cr>
-  wincmd p
-endfunction
-
-function! s:section(flags)
-  call search('\(^[x-] \)\@<=[^:]\+:', a:flags)
-endfunction
-
-function! s:format_git_log(line)
-  let indent = '  '
-  let tokens = split(a:line, nr2char(1))
-  if len(tokens) != 5
-    return indent.substitute(a:line, '\s*$', '', '')
-  endif
-  let [graph, sha, refs, subject, date] = tokens
-  let tag = matchstr(refs, 'tag: [^,)]\+')
-  let tag = empty(tag) ? ' ' : ' ('.tag.') '
-  return printf('%s%s%s%s%s (%s)', indent, graph, sha, tag, subject, date)
-endfunction
-
-function! s:append_ul(lnum, text)
-  call append(a:lnum, ['', a:text, repeat('-', len(a:text))])
-endfunction
-
-function! s:diff()
-  call s:prepare()
-  call append(0, ['Collecting changes ...', ''])
-  let cnts = [0, 0]
-  let bar = ''
-  let total = filter(copy(g:plugs), 's:is_managed(v:key) && isdirectory(v:val.dir)')
-  call s:progress_bar(2, bar, len(total))
-  for origin in [1, 0]
-    let plugs = reverse(sort(items(filter(copy(total), (origin ? '' : '!').'(has_key(v:val, "commit") || has_key(v:val, "tag"))'))))
-    if empty(plugs)
-      continue
-    endif
-    call s:append_ul(2, origin ? 'Pending updates:' : 'Last update:')
-    for [k, v] in plugs
-      let range = origin ? '..origin/'.v.branch : 'HEAD@{1}..'
-      let cmd = 'git log --graph --color=never '.join(map(['--pretty=format:%x01%h%x01%d%x01%s%x01%cr', range], 's:shellesc(v:val)'))
-      if has_key(v, 'rtp')
-        let cmd .= ' -- '.s:shellesc(v.rtp)
-      endif
-      let diff = s:system_chomp(cmd, v.dir)
-      if !empty(diff)
-        let ref = has_key(v, 'tag') ? (' (tag: '.v.tag.')') : has_key(v, 'commit') ? (' '.v.commit) : ''
-        call append(5, extend(['', '- '.k.':'.ref], map(s:lines(diff), 's:format_git_log(v:val)')))
-        let cnts[origin] += 1
-      endif
-      let bar .= '='
-      call s:progress_bar(2, bar, len(total))
-      normal! 2G
-      redraw
-    endfor
-    if !cnts[origin]
-      call append(5, ['', 'N/A'])
-    endif
-  endfor
-  call setline(1, printf('%d plugin(s) updated.', cnts[0])
-        \ . (cnts[1] ? printf(' %d plugin(s) have pending updates.', cnts[1]) : ''))
-
-  if cnts[0] || cnts[1]
-    nnoremap <silent> <buffer> <plug>(plug-preview) :silent! call <SID>preview_commit()<cr>
-    if empty(maparg("\<cr>", 'n'))
-      nmap <buffer> <cr> <plug>(plug-preview)
-    endif
-    if empty(maparg('o', 'n'))
-      nmap <buffer> o <plug>(plug-preview)
-    endif
-  endif
-  if cnts[0]
-    nnoremap <silent> <buffer> X :call <SID>revert()<cr>
-    echo "Press 'X' on each block to revert the update"
-  endif
-  normal! gg
-  setlocal nomodifiable
-endfunction
-
-function! s:revert()
-  if search('^Pending updates', 'bnW')
-    return
-  endif
-
-  let name = s:find_name(line('.'))
-  if empty(name) || !has_key(g:plugs, name) ||
-    \ input(printf('Revert the update of %s? (y/N) ', name)) !~? '^y'
-    return
-  endif
-
-  call s:system('git reset --hard HEAD@{1} && git checkout '.s:esc(g:plugs[name].branch).' --', g:plugs[name].dir)
-  setlocal modifiable
-  normal! "_dap
-  setlocal nomodifiable
-  echo 'Reverted'
-endfunction
-
-function! s:snapshot(force, ...) abort
-  call s:prepare()
-  setf vim
-  call append(0, ['" Generated by vim-plug',
-                \ '" '.strftime("%c"),
-                \ '" :source this file in vim to restore the snapshot',
-                \ '" or execute: vim -S snapshot.vim',
-                \ '', '', 'PlugUpdate!'])
-  1
-  let anchor = line('$') - 3
-  let names = sort(keys(filter(copy(g:plugs),
-        \'has_key(v:val, "uri") && !has_key(v:val, "commit") && isdirectory(v:val.dir)')))
-  for name in reverse(names)
-    let sha = s:system_chomp('git rev-parse --short HEAD', g:plugs[name].dir)
-    if !empty(sha)
-      call append(anchor, printf("silent! let g:plugs['%s'].commit = '%s'", name, sha))
-      redraw
-    endif
-  endfor
-
-  if a:0 > 0
-    let fn = expand(a:1)
-    if filereadable(fn) && !(a:force || s:ask(a:1.' already exists. Overwrite?'))
-      return
-    endif
-    call writefile(getline(1, '$'), fn)
-    echo 'Saved as '.a:1
-    silent execute 'e' s:esc(fn)
-    setf vim
-  endif
-endfunction
-
-function! s:split_rtp()
-  return split(&rtp, '\\\@<!,')
-endfunction
-
-let s:first_rtp = s:escrtp(get(s:split_rtp(), 0, ''))
-let s:last_rtp  = s:escrtp(get(s:split_rtp(), -1, ''))
-
-if exists('g:plugs')
-  let g:plugs_order = get(g:, 'plugs_order', keys(g:plugs))
-  call s:upgrade_specs()
-  call s:define_commands()
-endif
-
-let &cpo = s:cpo_save
-unlet s:cpo_save
diff --git a/.vim/autoload/retab.vim b/.vim/autoload/retab.vim
deleted file mode 100644
index 8cb8759..0000000
--- a/.vim/autoload/retab.vim
+++ /dev/null
@@ -1,7 +0,0 @@
-
-func! retab#do()
-    for lineno in range(a:firstline, a:lastline)
-        normal! <<
-        normal! >>
-    endfor
-endfunc
diff --git a/.vim/autoload/split_term.vim b/.vim/autoload/split_term.vim
deleted file mode 100644
index e34fe59..0000000
--- a/.vim/autoload/split_term.vim
+++ /dev/null
@@ -1,69 +0,0 @@
-let s:spt = {}
-
-function! s:spt_open() dict abort
-    botright new
-    exec "resize " . self.opts.height
-    try
-        exec "buffer " . self.bufnr
-    catch
-        call termopen(self.opts.exec, {"detach": 0})
-        let self.bufnr = bufnr('%')
-        " term style
-        set nonumber
-        set norelativenumber
-        set signcolumn=no
-        " garbage collect after closing
-        let b:__split_term = self
-        execute 'autocmd BufWipeout <buffer> call getbufvar(' . self.bufnr . ', "__split_term").close()'
-    endtry
-    startinsert!
-    let self.winid = win_getid()
-endfunction
-let s:spt.open = funcref('s:spt_open')
-
-function! s:spt_hide() dict abort
-    if win_gotoid(self.winid)
-        hide
-    else
-        echoerr 'split term window not found'
-    endif
-endfunction
-let s:spt.hide = funcref('s:spt_hide')
-
-function! s:spt_close() dict abort
-    if win_gotoid(self.winid)
-        close
-    endif
-    unlet self.bufnr
-    unlet self.winid
-endfunction
-let s:spt.close = funcref('s:spt_close')
-
-function! split_term#new(opts) abort
-    let spt = deepcopy(s:spt)
-    let opts = { 
-    \ 'exec': $SHELL,
-    \ 'height': 20,
-    \ }
-    let spt.opts = extend(opts, a:opts)
-    return spt
-endfunction
-
-function! s:split_term_new(args) abort
-    if len(a:args) > 0
-        let opts = {'exec': join(a:args, ' ')}
-    endif
-    let g:split_term = split_term#new(exists('opts') ? opts : {})
-endfunction
-function! s:split_term_toggle(bang, ...) abort
-    if !a:bang
-        if !exists('g:split_term')
-            call s:split_term_new(a:000)
-        endif
-        call g:split_term.open()
-    else
-        if exists('g:split_term')
-            call g:split_term.hide()
-        endif
-    endif
-endfunction
diff --git a/.vim/general.vim b/.vim/general.vim
index a0d416c..84bafbf 100644
--- a/.vim/general.vim
+++ b/.vim/general.vim
@@ -8,7 +8,9 @@ set inccommand=split
 set noshowcmd
 " set autochdir " automatically sets cwd to the dir containing the file in the current buffer
 set hidden
-set nolist listchars+=space:•,trail:¬
+set notimeout
+set list
+set listchars+=trail:¬ " ,space:•
 set iskeyword-=-
 
 set encoding=utf-8 nobomb
@@ -32,6 +34,9 @@ set cursorline
 " set cursorcolumn
 set colorcolumn=80
 set updatetime=300
+set splitbelow
+set foldlevel=1
+set nofoldenable
 
 " For conceal markers.
 if has('conceal')
@@ -39,11 +44,10 @@ if has('conceal')
     set conceallevel=1 concealcursor=
 endif
 
-" centralize vimfiles
-set backupdir=/tmp
-set directory=/tmp
+set backupdir=$XDG_CACHE_HOME
+set directory=$XDG_CACHE_HOME
 if exists('&undodir')
-    set undodir=~/.vim/undo
+    set undodir=$XDG_CACHE_HOME
 endif
 
 " pane divider chars
diff --git a/.vim/init.vim b/.vim/init.vim
index d6fb3dc..23c94c5 100644
--- a/.vim/init.vim
+++ b/.vim/init.vim
@@ -4,7 +4,8 @@ let g:mapleader = ' ' " <leader> key to <space>
 let g:maplocalleader = '\'
 
 runtime general.vim
-runtime plug.vim
+" runtime plug.vim
+lua require'init'
 
 " hi CursorLine cterm=NONE ctermbg=darkred ctermfg=white guibg=darkred guifg=white
 " hi CursorLine cterm=NONE ctermbg=darkred ctermfg=white guibg=darkred guifg=white
@@ -15,8 +16,8 @@ runtime plug.vim
 let g:daymode = 0
 let g:daymode_colorscheme_day = 'ayu'
 let g:daymode_colorscheme_night = 'PaperColor'
-let g:daymode_lightline_colorscheme_day = 'ayu_light'
-let g:daymode_lightline_colorscheme_night = 'papercolor_dim'
+" let g:daymode_lightline_colorscheme_day = 'ayu_light'
+" let g:daymode_lightline_colorscheme_night = 'papercolor_dim'
 
 let g:ayucolor="light"
 let g:PaperColor_Theme_Options = {
@@ -24,16 +25,25 @@ let g:PaperColor_Theme_Options = {
 \     'default.dark': {
 \       'allow_bold': 1,
 \       'allow_italic': 1,
-\       'transparent_background': 0,
+\       'transparent_background': 1,
 \     }
 \   }
 \ }
+colorscheme PaperColor
 
-au VimEnter * if exists('g:daymode') && g:daymode
-  \ | call daymode#switch(0)
-  \ | else
-  \ | call daymode#switch(1)
-  \ | endif
+augroup Colors
+  au!
+  au ColorScheme * runtime colors/PaperColor_ext.vim
+  " NOTE: this is necessary for to fix the guibg when transparent_background
+  " is enabled
+  au ColorScheme * hi! clear SignColumn
+  " TODO: this breaks colorizer highlighting
+  " au VimEnter * if exists('g:daymode') && g:daymode
+    " \ | call daymode#switch(0)
+    " \ | else
+    " \ | call daymode#switch(1)
+    " \ | endif
+augroup END
 
 " Make comments italic, no matter what the colorscheme does
 hi Comment gui=italic
@@ -46,23 +56,22 @@ hi SignColumn guibg=none ctermbg=none
 noremap j gj
 noremap k gk
 " because this is annoying
-cnoreabbrev W w
+noreabbrev W w
 cnoreabbrev E e
 cnoreabbrev Q q
+nnoremap Q :q
 " Buffer commands
 nmap <silent> gb :bnext<CR>
 nmap <silent> gB :bprevious<CR>
-nmap <silent> <leader>cb :Clap buffers<CR>
-nmap <silent> <leader>cg :Clap grep2<CR>
-nmap <silent> <leader>cl :Clap blines<CR>
+
 " quickfix jumping
 " nnoremap <leader>cn :cnext<CR>
 " nnoremap <leader>cp :cprevious<CR>
-nnoremap <leader>cl :Clap quickfix<CR>
+
 " loclist jumping
 " nnoremap <leader>ln :lnext<CR>
 " nnoremap <leader>lp :lprevious<CR>
-nnoremap <leader>ll :Clap loclist<CR>
+
 " escape terminal mode with <esc>
 tnoremap <esc> <C-\><C-n>
 tnoremap <leader>qq <C-\><C-n>:bdelete!<CR>
@@ -70,16 +79,23 @@ tnoremap <leader>qq <C-\><C-n>:bdelete!<CR>
 " nnoremap s "_d
 " nnoremap ss "_dd
 " vnoremap s "_d
+
 " replace word under cursor
 nmap <silent> riw :%s/\<<C-r><C-w>\>/
 
-nmap <silent> ga <Plug>(EasyAlign)
-vmap <silent> <Enter> <Plug>(EasyAlign)
-nmap <leader>gm <Plug>(git-messenger)
+nmap <silent> ga <cmd>EasyAlign<cr>
+vmap <silent> <Enter> <cmd>EasyAlign<cr>
+" nmap <leader>gm <cmd>GitMessenger<cr>
+nmap <silent> gm <cmd>GitMessenger<cr>
 nmap <silent> <leader>v :Vista!!<CR>
 nmap <silent> <leader>nt :call numbertoggle#switch()<CR>
 nmap <silent> <leader>tn :rightbelow Tnew<CR>
-vmap rt :call retab#do()<CR>
+nmap <silent> gF :lua require'misc'.open_under_cursor()<CR>
+noremap <silent> gx :lua require'misc'.open_under_cursor('url-launcher')<CR>
+augroup netrw_maps
+  au!
+  au BufEnter * nnoremap <silent><buffer> gx :lua require'misc'.open_under_cursor('url-launcher')<CR>
+augroup END
 " }}}
 
 " alternate        -> plugin/alternate.vim
@@ -93,7 +109,7 @@ vmap rt :call retab#do()<CR>
 " neomake          -> after/plugin/neomake.vim
 " lightline        -> plugin/line.vim
 
-let g:netrw_browsex_viewer = 'url-launcher'
+" let g:netrw_browsex_viewer = 'url-launcher'
 
 " plugin config {{{
 "
@@ -143,11 +159,10 @@ hi SignifySignChange guibg=NONE ctermbg=NONE
 hi SignifySignAdd guibg=NONE ctermbg=NONE
 hi SignifySignDelete guibg=NONE ctermbg=NONE
 
-nmap <silent> ]h <Plug>(signify-next-hunk)
-nmap <silent> [h <Plug>(signify-prev-hunk)
+nmap <silent> ]h <cmd>SignifyJumpToNextHunk<cr>
+nmap <silent> [h <cmd>SignifyJumpToPrevHunk<cr>
 " }}}2
 
-let g:polyglot_disabled = ['markdown', 'org', 'latex', 'tex', 'vue']
 let g:vue_disable_pre_processors = 1
 let g:vim_json_syntax_conceal = 1
 
@@ -205,9 +220,6 @@ let g:vista#renderer#icons = {
 \ }
 " }}}2
 
-" Enable color highlighting for all filetypes
-let g:Hexokinase_ftAutoload = ['*']
-
 " vim-markdown {{{2
 let g:vim_markdown_folding_disabled = 1
 let g:vim_markdown_math = 1
@@ -231,20 +243,29 @@ let g:neoformat_basic_format_trim = 0
 let g:neoformat_only_msg_on_error = 1
 " }}}2
 
-" let g:clap_insert_mode_only = v:true
-let g:clap_popup_border  = 'sharp'
-let g:clap_layout          = {}
-" let g:clap_layout.relative = 'editor'
-" let g:clap_layout.row      = '5%'
-" let g:clap_layout.col      = '0%'
-" let g:clap_layout.width    = '100%'
-" let g:clap_layout.height   = '33%'
-let g:clap_multi_selection_warning_silent = 1
+" Clap {{{2
+" " let g:clap_insert_mode_only = v:true
+" let g:clap_popup_border  = 'sharp'
+" let g:clap_layout          = {}
+" " let g:clap_layout.relative = 'editor'
+" " let g:clap_layout.row      = '5%'
+" " let g:clap_layout.col      = '0%'
+" " let g:clap_layout.width    = '100%'
+" " let g:clap_layout.height   = '33%'
+" let g:clap_multi_selection_warning_silent = 1
+" let g:clap_selected_sign = { 'text': '* ', 'texthl': "WarningMsg", "linehl": "ClapSelected" }
+" nnoremap <silent> <leader>cc :Clap<CR>
+" nnoremap <silent> <leader>cg :Clap grep2<CR>
+" nnoremap <silent> <leader>cb :Clap buffers<CR>
+" nnoremap <silent> <leader>cf :Clap files<CR>
+" nnoremap <silent> <leader>cl :Clap quickfix<CR>
+" nnoremap <silent> <leader>ll :Clap loclist<CR>
+" }}}2
 
 let g:neoterm_size = 20
 let g:neoterm_autoinsert = 1
 
-let g:UltiSnipsExpandTrigger = "<tab>"
+let g:UltiSnipsExpandTrigger = "<cr>"
 " let g:UltiSnipsListSnippets = "<c-tab>"
 let g:UltiSnipsJumpForwardTrigger = "<c-n>"
 let g:UltiSnipsJumpBackwardTrigger = "<c-p>"
@@ -257,38 +278,20 @@ let g:vimwiki_main.name = 'wiki'
 let g:vimwiki_main.index = '_index'
 let g:vimwiki_list = [vimwiki_main]
 let g:vimwiki_folding = 'list'
-" }}}1
 
-" lsp + compl {{{1
-if has('nvim-0.5.0')
-lua << EOF
-local lsp   = require 'nvim_lsp'
-local util  = require 'nvim_lsp/util'
-local compl = require 'completion'
-
-lsp.gopls.setup{
-  on_attach = compl.on_attach;
-  root_dir = util.root_pattern("go.mod");
-}
-lsp.rust_analyzer.setup{
-  on_attach = compl.on_attach;
-}
-EOF
-  " autocmd Filetype bash,shell,css,go,python,rust,tex,latex setl omnifunc=lsp#omnifunc
-  " au Filetype lua setl omnifunc=v:lua.vim.lsp.omnifunc
-  nnoremap <silent> gD <cmd> lua vim.lsp.buf.declaration()<CR>
-  nnoremap <silent> gd <cmd> lua vim.lsp.buf.definition()<CR>
-  nnoremap <silent> gT <cmd> lua vim.lsp.buf.type_definition()<CR>
-  nnoremap <silent> gI <cmd> lua vim.lsp.buf.implementation()<CR>
-  nnoremap <silent> gr <cmd> lua vim.lsp.buf.references()<CR>
-  nnoremap <silent> g0 <cmd> lua vim.lsp.buf.document_symbol()<CR>
-  nnoremap <silent> gW <cmd> lua vim.lsp.buf.workspace_symbol()<CR>
-  nnoremap <silent> ;h <cmd> lua vim.lsp.buf.hover()<CR>
-  nnoremap <silent> ;s <cmd> lua vim.lsp.buf.signature_help()<CR>
-else
-  echoerr 'nvim_lsp only works with neovim>=0.5.0'
-endif
+let g:tex_flavor = 'latex'
+let g:vimtex_compiler_enabled = 1
+let g:vimtex_compiler_method = 'tectonic'
+let g:vimtex_compiler_tectonic = {
+\ 'executable': 'tectonic',
+\ }
+let g:vimtex_view_method = 'zathura'
+" let g:vimtex_view_zathura_check_libsynctex = 0
+" let g:vimtex_view_use_temp_files = 1
+" let g:vimtex_view_forward_search_on_start = 0
+" }}}1
 
+" lua stuff {{{1
 set complete=.,w,b,u
 set completeopt=menuone,noinsert,noselect
 " set completeopt-=preview
@@ -297,17 +300,30 @@ set shortmess+=c
 let g:completion_enable_auto_popup = 1
 let g:completion_enable_auto_signature = 1
 let g:completion_enable_auto_paren = 0
-let g:completion_confirm_key = "\<tab>"
+let g:completion_confirm_key = "\<cr>"
 let g:completion_enable_snippet = 'UltiSnips'
 let g:completion_auto_change_source = 1
 let g:completion_chain_complete_list = [
-  \ {'complete_items': ['lsp', 'snippet']},
-  \ {'mode': '<c-p>'},
-  \ {'mode': '<c-n>'}
+  \	  {'complete_items': ['lsp']},
+  \	  {'complete_items': ['snippet']},
+  \	  {'complete_items': ['buffers']},
+  \	  {'complete_items': ['path']},
+  \   {'complete_items': ['wiki']},
+  \   {'complete_items': ['ts']},
+  \ 	{'mode': 'file'},
   \ ]
 
 inoremap <silent><expr> <c-n>
   \ pumvisible() ? "\<c-n>" : completion#trigger_completion()
+inoremap <silent><expr> <c-p>
+  \ pumvisible() ? "\<c-p>" : completion#trigger_completion()
+imap <c-j> <cmd> lua require'completion.source'.nextCompletion()<CR>
+imap <c-k> <cmd> lua require'completion.source'.prevCompletion()<CR>
+
+augroup Compl
+  au!
+  au BufEnter * lua require'completion'.on_attach()
+augroup END
 " }}}1
 
 " gui extra config {{{
@@ -323,7 +339,13 @@ function! s:fmt() abort
   if exists('g:nofmt') || exists('b:nofmt')
     return
   endif
-  try | undojoin | Neoformat | catch /^Vim\%((\a\+)\)\=:E790/ | finally | silent Neoformat | endtry
+  try
+    undojoin
+    Neoformat
+  catch
+    " hmm
+    echo 'not formatted'
+  endtry
 endfunction
 
 augroup DoFmt
@@ -337,7 +359,7 @@ augroup SpecialBuffers
   " au  FileType vista,fzf,skim set laststatus=0 noshowmode noruler
         " \| au BufLeave <buffer> set laststatus=2 ruler
   au FileType fzf,skim tnoremap <buffer><esc> <c-c>
-  au FileType gitmessengerpopup nmap <buffer><esc> <Plug>(git-messenger-close)
+  au FileType gitmessengerpopup nmap <buffer><esc> <cmd>GitMessengerClose<cr>
   au FileType vista nmap <buffer><space> :wincmd p<CR>
   au FileType help,qf,vista nmap <silent><buffer>q <c-w><c-q>
   " au FileType vimwiki call vista#sidebar#ToggleFocus()
@@ -365,20 +387,30 @@ augroup Init
 	\ | endif
 augroup END
 
-augroup ClapFix
+augroup YankHighlight
   au!
-  " see https://github.com/liuchengxu/vim-clap/issues/374#issuecomment-608272245
-  au User ClapOnExit call lightline#update()
+  au TextYankPost * silent! lua require'vim.highlight'.on_yank()
 augroup END
 
-augroup YankHighlight
+augroup Diagnostic
   au!
-  au TextYankPost * silent! lua require'vim.highlight'.on_yank()
+  " au CursorHold * lua vim.lsp.util.show_line_diagnostics()
 augroup END
 " }}}
 
+command! SortLine call setline('.', join(sort(split(getline('.'), ' ')), " "))
 command! -bang DayMode call daymode#switch(<bang>0)
-command! -range Retab <line1>,<line2>call retab#do()
 command! NumberToggle call numbertoggle#switch()
 command! Alternate call alternate#alternate()
 command! InsertTS r!now
+command! BalenaDiagnosticsFold call balena_diagnostics_fold#apply()
+
+command! -range=% -nargs=0 Tab2Space execute '<line1>,<line2>s#^\t\+#\=repeat(" ", len(submatch(0))*' . &ts . ')'
+command! -range=% -nargs=0 Space2Tab execute '<line1>,<line2>s#^\( \{'.&ts.'\}\)\+#\=repeat("\t", len(submatch(0))/' . &ts . ')'
+
+" WARNING! roadwork ahead
+" lua << EOF
+" if vim.env.SNIPPETS then
+"   vim.snippet = require 'snippet'
+" end
+" EOF
diff --git a/.vim/lua/conf/colors.lua b/.vim/lua/conf/colors.lua
new file mode 100644
index 0000000..65d1fb1
--- /dev/null
+++ b/.vim/lua/conf/colors.lua
@@ -0,0 +1,9 @@
+
+local lush = require('lush')
+local hsl = lush.hsl
+
+return lush(function()
+	return {
+		Normal { bg = hsl}
+	}
+end)
diff --git a/.vim/lua/conf/diagnostic.lua b/.vim/lua/conf/diagnostic.lua
new file mode 100644
index 0000000..4fd5047
--- /dev/null
+++ b/.vim/lua/conf/diagnostic.lua
@@ -0,0 +1,17 @@
+
+vim.g.diagnostic_enable_virtual_text = 1
+vim.g.diagnostic_trimmed_virtual_text = '40'
+vim.g.diagnostic_insert_delay = 1
+vim.api.nvim_command('nnoremap <silent> c[ <cmd>PrevDiagnosticCycle<cr>')
+vim.api.nvim_command('nnoremap <silent> c] <cmd>NextDiagnosticCycle<cr>')
+
+
+vim.fn.sign_define("LspDiagnosticsErrorSign", {text="✘", texthl="LspDiagnosticsError"})
+vim.fn.sign_define("LspDiagnosticsWarningSign", {text="‼", texthl="LspDiagnosticsWarning"})
+vim.fn.sign_define("LspDiagnosticsInformationSign", {text="i", texthl="LspDiagnosticsInformation"})
+vim.fn.sign_define("LspDiagnosticsHintSign", {text="☛",texthl="LspDiagnosticsHint"})
+
+vim.api.nvim_command('highlight link LspDiagnosticsError Error')
+vim.api.nvim_command('highlight link LspDiagnosticsWarning WarningMsg')
+vim.api.nvim_command('highlight link LspDiagnosticsInformation Todo')
+vim.api.nvim_command('highlight link LspDiagnosticsHint Question')
diff --git a/.vim/lua/conf/lsp.lua b/.vim/lua/conf/lsp.lua
new file mode 100644
index 0000000..4249de5
--- /dev/null
+++ b/.vim/lua/conf/lsp.lua
@@ -0,0 +1,51 @@
+-- lsp config
+
+local lsp     = require 'lspconfig'
+local util    = require 'lspconfig.util'
+
+local function my_attach(client)
+	-- attach completion
+	require 'completion'.on_attach(client)
+
+	-- do lsp mappings
+	vim.fn.nvim_buf_set_keymap(0, 'n', 'K', '<cmd>lua vim.lsp.buf.hover()<cr>',
+		{noremap=true, silent=true})
+	vim.fn.nvim_buf_set_keymap(0, 'n', '<c-]>', '<cmd>lua vim.lsp.buf.definition()<cr>',
+		{noremap=true, silent=true})
+	vim.fn.nvim_buf_set_keymap(0, 'n', 'grr', '<cmd>lua vim.lsp.buf.rename()<cr>',
+		{noremap=true, silent=true})
+	vim.fn.nvim_buf_set_keymap(0, 'i', '<c-h>', '<cmd>lua vim.lsp.buf.signature_help()<cr>',
+		{noremap=true, silent=true})
+
+	-- nnoremap <silent> gD <cmd> lua vim.lsp.buf.declaration()<CR>
+	-- nnoremap <silent> gd <cmd> lua vim.lsp.buf.definition()<CR>
+	-- nnoremap <silent> gT <cmd> lua vim.lsp.buf.type_definition()<CR>
+	-- nnoremap <silent> gI <cmd> lua vim.lsp.buf.implementation()<CR>
+	-- nnoremap <silent> gr <cmd> lua vim.lsp.buf.references()<CR>
+	-- nnoremap <silent> g0 <cmd> lua vim.lsp.buf.document_symbol()<CR>
+	-- nnoremap <silent> gW <cmd> lua vim.lsp.buf.workspace_symbol()<CR>
+	-- nnoremap <silent> ;h <cmd> lua vim.lsp.buf.hover()<CR>
+	-- nnoremap <silent> ;s <cmd> lua vim.lsp.buf.signature_help()<CR>
+end
+
+-- lsp.ccls.setup{
+-- 	on_attach = my_attach,
+-- }
+
+lsp.gopls.setup{
+	on_attach = my_attach,
+	root_dir = util.root_pattern('go.mod', '.git'),
+	-- NOTE: this is done to avoid the gopls warning about being outside gopath
+	-- message_level = vim.lsp.protocol.MessageType.Error,
+}
+
+lsp.sumneko_lua.setup{
+	cmd = { 'lua-language-server' };
+	on_attach = my_attach;
+}
+
+lsp.rust_analyzer.setup{
+	cmd = { 'env', 'CARGO_TARGET_DIR=/tmp', 'rust-analyzer' },
+	on_attach = my_attach,
+
+}
diff --git a/.vim/lua/conf/telescope.lua b/.vim/lua/conf/telescope.lua
new file mode 100644
index 0000000..e1145c2
--- /dev/null
+++ b/.vim/lua/conf/telescope.lua
@@ -0,0 +1,75 @@
+-- config for telescope.nvim
+local telescope  = require('telescope')
+local finders    = require('telescope.finders')
+local pickers    = require('telescope.pickers')
+local previewers = require('telescope.previewers')
+local make_entry = require('telescope.make_entry')
+local sorters    = require('telescope.sorters')
+
+telescope.setup{
+	defaults = {
+		borderchars = {'─', '│', '─', '│', '┌', '┐', '┘', '└'},
+		winblend = 3,
+		layout_strategy = 'flex',
+	}
+}
+
+vim.api.nvim_set_keymap('n', ';f', "<cmd>lua require'telescope.builtin'.find_files{}<cr>",
+	{noremap=true, silent=true})
+vim.api.nvim_set_keymap('n', ';g', "<cmd>lua require'telescope.builtin'.live_grep{}<cr>",
+	{noremap=true, silent=true})
+vim.api.nvim_set_keymap('n', ';r', "<cmd>lua require'telescope.builtin'.lsp_references{}<cr>",
+	{noremap=true, silent=true})
+vim.api.nvim_set_keymap('n', ';q', "<cmd>lua require'telescope.builtin'.quickfix{}<cr>",
+	{noremap=true, silent=true})
+vim.api.nvim_set_keymap('n', ';l', "<cmd>lua require'telescope.builtin'.loclist{}<cr>",
+	{noremap=true, silent=true})
+vim.api.nvim_set_keymap('n', ';b', "<cmd>lua require'telescope.builtin'.buffers{}<cr>",
+	{noremap=true, silent=true})
+-- vim.api.nvim_set_keymap('n', ';h', "<cmd>lua require'conf.telescope'.home{}<cr>",
+-- 	{noremap=true, silent=true})
+vim.api.nvim_set_keymap('n', ';w', "<cmd>lua require'conf.telescope'.wiki{}<cr>",
+	{noremap=true, silent=true})
+
+local M = {}
+M.fzf = function(opts)
+	opts = opts or {}
+	if opts.cwd then
+		opts.cwd = vim.fn.expand(opts.cwd)
+	end
+	local cmd = {'fd', '--type', 'f', '--no-ignore', '--absolute-path'}
+	if opts.extensions then
+		for _, ext in ipairs(opts.extensions) do
+			table.insert(cmd, '--extension')
+			table.insert(cmd, ext)
+		end
+	end
+	if opts.exclude then
+		for _, excl in ipairs(opts.exclude) do
+			table.insert(cmd, '--exclude')
+			table.insert(cmd, excl)
+		end
+	end
+	pickers.new(opts, {
+		prompt = opts.prompt or "FZF",
+		finder = finders.new_oneshot_job(cmd, opts),
+		previewer = previewers.cat.new(opts),
+		sorter = sorters.get_fuzzy_file(),
+	}):find()
+end
+
+M.wiki = function()
+	return M.fzf {
+		prompt = 'WIKI',
+		cwd = '~/wiki',
+		extensions = {'md'},
+		exclude = {'_templates/*'}
+	}
+end
+-- M.home = function()
+-- 	return M.fzf {
+-- 		prompt = 'HOME',
+-- 		cwd = '~',
+-- 	}
+-- end
+return M
diff --git a/.vim/lua/conf/treesitter.lua b/.vim/lua/conf/treesitter.lua
new file mode 100644
index 0000000..79763b8
--- /dev/null
+++ b/.vim/lua/conf/treesitter.lua
@@ -0,0 +1,21 @@
+
+require 'nvim-treesitter.configs'.setup {
+	ensure_installed = { "c", "c_sharp", "lua", "bash" },
+	highlight = {
+		enable = false,
+	},
+	refactor = {
+		navigation = {
+			enable = true,
+			keymaps = {
+				goto_definition = "<c-]>",
+			},
+		},
+		smart_rename = {
+			enable = true,
+			keymaps = {
+				smart_rename = "grr",
+			},
+		},
+	},
+}
diff --git a/.vim/lua/init.lua b/.vim/lua/init.lua
new file mode 100644
index 0000000..0397b28
--- /dev/null
+++ b/.vim/lua/init.lua
@@ -0,0 +1,4 @@
+-- init lua
+
+require 'plugins'
+require 'conf.diagnostic'
diff --git a/.vim/lua/line.lua b/.vim/lua/line.lua
new file mode 100644
index 0000000..278782f
--- /dev/null
+++ b/.vim/lua/line.lua
@@ -0,0 +1,146 @@
+-- statusline
+
+local gl  = require('galaxyline')
+local gls = gl.section
+local gcolors = require('galaxyline.colors')
+
+local colors = {
+  blue = '#5fafd7',
+  orange = '#d7875f',
+  purple = '#af87d7',
+  yellow = '#d7af5f',
+
+  black = '#1c1c1c',
+  grey_dim = '#3a3a3a',
+  grey_dimmer = '#262626',
+  white = '#d0d0d0',
+  white_dim = '#bdc0ba',
+}
+
+local style = {
+  left = {
+    sep = ' ',
+    sep_hl = {colors.white, colors.black},
+  },
+  right = {
+    hl = {colors.white,colors.grey_dimmer},
+    sep = ' ',
+    sep_hl = {colors.grey_dim, colors.grey_dimmer},
+  }
+}
+
+local empty_buffer = function()
+  if vim.fn.empty(vim.fn.expand('%:t')) ~= 1 then
+    return true
+  end
+    return false
+end
+
+local space = function() return ' ' end
+
+gls.left[1] = {
+  ViMode = {
+    provider = function()
+      local m = vim.fn.mode()
+      if m == 'n' then
+        gcolors.set_highlight('GalaxyViMode', {colors.white, colors.grey_dim, 'bold'})
+      elseif m == 'i' then
+        gcolors.set_highlight('GalaxyViMode', {colors.black, colors.blue, 'bold'})
+      elseif m == 'v' or m == 'V' or m == 'CTRL-V' then
+        gcolors.set_highlight('GalaxyViMode', {colors.black, colors.purple, 'bold'})
+      elseif m == 's' or m == 'S' or m == 'CTRL-S' then
+        gcolors.set_highlight('GalaxyViMode', {colors.black, '#ff0000', 'bold'})
+      elseif m == 'R' or m == 'Rc' or m == 'Rv' or m == 'Rx' then
+        gcolors.set_highlight('GalaxyViMode', {colors.black, colors.orange, 'bold'})
+      elseif m == 'c' then
+        gcolors.set_highlight('GalaxyViMode', {colors.yellow, colors.grey_dim, 'bold,italic'})
+      end
+      return '  ' .. m:gsub("^%l*$", string.upper) .. ' '
+    end,
+    separator = style.left.sep,
+    separator_highlight = style.left.sep_hl,
+  },
+}
+
+gls.left[2] = {
+  FileName = {
+    provider = function()
+      local file = vim.fn.expand('%:t')
+      if vim.fn.empty(file) == 1 then return '' end
+      if vim.bo.readonly then
+        return file .. ' '
+      end
+      if vim.o.modifiable then
+        if vim.bo.modified then
+          return file .. ' +'
+        end
+      end
+      return file .. ' '
+    end,
+    condition = empty_buffer,
+    highlight = {colors.white,colors.grey_dimmer},
+    separator = style.left.sep,
+    separator_highlight = style.left.sep_hl,
+  }
+}
+
+-- ########################################################## --
+
+gls.right[1] = {
+  Indent = {
+    provider = function()
+      local res = vim.o.expandtab and '→' or '␣'
+      return res
+        .. ' '
+        .. 'ts=' .. vim.o.tabstop
+        .. ' '
+        .. 'sw=' .. vim.o.shiftwidth
+    end,
+    highlight = style.right.hl,
+  },
+}
+
+gls.right[2] = {
+  BufNum = {
+    icon = '% ',
+    provider = function()
+      local nbufs = #vim.fn.getbufinfo({buflisted = 1})
+      local res = vim.fn.bufnr('%') .. '(' .. nbufs .. ')'
+      if vim.fn.tabpagenr() > 1 then
+        res = res .. ':' .. vim.fn.tabpagenr()
+      end
+      return res
+    end,
+    highlight = style.right.hl,
+    separator = style.right.sep,
+    separator_highlight = style.right.sep_hl,
+  },
+}
+
+gls.right[3] = {
+  LineColumn = {
+    icon = ' ',
+    provider = 'LineColumn',
+    highlight = style.right.hl,
+    separator = style.right.sep,
+    separator_highlight = style.right.sep_hl,
+  },
+}
+
+gls.right[4] = {
+  LinePercent = {
+    provider = 'LinePercent',
+    highlight = style.right.hl,
+    separator = style.right.sep,
+    separator_highlight = style.right.sep_hl,
+  }
+}
+
+gls.right[5] = {
+  BufferType = {
+    provider = function() return '  ' .. vim.bo.filetype .. ' ' end,
+    highlight = {colors.white,colors.grey_dim,'bold'},
+    -- separator = style.right.sep,
+    -- separator_highlight = style.right.sep_hl,
+  }
+}
diff --git a/.vim/lua/misc.lua b/.vim/lua/misc.lua
new file mode 100644
index 0000000..8b26ed1
--- /dev/null
+++ b/.vim/lua/misc.lua
@@ -0,0 +1,18 @@
+-- misc stuff implemented in lua
+
+local M = {}
+
+function M.open_under_cursor(cmd)
+  local txt = vim.fn.expand('<cfile>')
+  local txt = vim.fn.expand(txt)
+  if not cmd then
+    vim.fn.inputsave()
+    cmd = vim.fn.input('open with: ')
+    vim.fn.inputrestore()
+  end
+  if cmd then
+    c = vim.loop.spawn(cmd, { args = {txt} }, function() c:close() end)
+  end
+end
+
+return M
diff --git a/.vim/lua/plugins.lua b/.vim/lua/plugins.lua
new file mode 100644
index 0000000..1a66299
--- /dev/null
+++ b/.vim/lua/plugins.lua
@@ -0,0 +1,142 @@
+-- load by calling `lua require('plugins')` from your init.vim
+
+function disable_distribution_plugins()
+  vim.g.loaded_gzip              = 1
+  vim.g.loaded_tar               = 1
+  vim.g.loaded_tarPlugin         = 1
+  vim.g.loaded_zip               = 1
+  vim.g.loaded_zipPlugin         = 1
+  vim.g.loaded_getscript         = 1
+  vim.g.loaded_getscriptPlugin   = 1
+  vim.g.loaded_vimball           = 1
+  vim.g.loaded_vimballPlugin     = 1
+  vim.g.loaded_matchit           = 1
+  vim.g.loaded_matchparen        = 1
+  vim.g.loaded_2html_plugin      = 1
+  vim.g.loaded_logiPat           = 1
+  vim.g.loaded_rrhelper          = 1
+  vim.g.loaded_netrw             = 1
+  vim.g.loaded_netrwPlugin       = 1
+  vim.g.loaded_netrwSettings     = 1
+  vim.g.loaded_netrwFileHandlers = 1
+end
+
+-- enable to bootstrap packer from ~/.local/share/nvim/site/pack/packer/opt/packer.nvim
+-- vim.cmd [[packadd packer.nvim]]
+
+return require'packer'.startup(function()
+	-- disable built-in plugins
+	disable_distribution_plugins()
+
+	-- manage packer itself
+	use {'wbthomason/packer.nvim'}
+
+	use {'mhinz/vim-signify'}      -- git status in the sign column
+	use {'tpope/vim-commentary'}   -- auto-comment using `gcc`
+	use {'cohama/lexima.vim'}      -- auto-close parens, brackets, etc.
+	use {'tpope/vim-surround'}     -- edit surroundings in pairs
+	-- use {'itchyny/lightline.vim'}  -- lightweight status bar
+	use {'glepnir/galaxyline.nvim',
+		branch = 'main',
+		config=function() require 'line' end}
+	use {'neomake/neomake'}        -- async job runner
+	use {'sbdchd/neoformat'}       -- async code formatter
+	use {'justinmk/vim-dirvish'}   -- folder browser
+	use {'justinmk/vim-sneak'}     -- powerful missing vim motions
+
+	use { 'neovim/nvim-lspconfig',
+		requires = {'nvim-lua/completion-nvim'}, -- , 'nvim-lua/diagnostic-nvim'},
+		config=function() require'conf.lsp' end}
+
+	use { 'steelsojka/completion-buffers' }
+		-- config = function()
+		-- 	vim.api.nvim_command("autocmd BufEnter * require'completion'.on_attach()")
+		-- end}
+
+	use { 'nvim-treesitter/nvim-treesitter',
+		requires = {
+			'nvim-lua/completion-nvim',
+			'nvim-treesitter/completion-treesitter',
+			'nvim-treesitter/nvim-treesitter-refactor',
+		},
+		config=function() require'conf.treesitter' end}
+	
+	use { 'nvim-lua/telescope.nvim',
+		requires = {'nvim-lua/popup.nvim', 'nvim-lua/plenary.nvim'},
+		config=function() require'conf.telescope' end}
+
+	-- snippets
+	use {'SirVer/ultisnips',
+		requires = {'honza/vim-snippets'}}
+
+	-- interactive finder / dispatcher
+	-- use {'liuchengxu/vim-clap',
+	-- 	run = ':Clap install-binary!'}
+
+	use {'junegunn/vim-easy-align',
+		cmd = {'EasyAlign'}}
+
+	-- use {'tpope/vim-sleuth'}                -- detect indentation
+	use {'nathanaelkane/vim-indent-guides'} -- show indentation levels
+	use {'tpope/vim-repeat'}                -- extend '.' to plugins
+	use {'liuchengxu/vista.vim'}            -- sidebar populated by lsp, ctags, etc.
+	use {'sgur/vim-editorconfig'}           -- implements editorconfig in vimscript
+	-- use 'rhysd/conflict-marker.vim'
+	use {'michaeljsmith/vim-indent-object'} -- adds indentation text-objects
+	use {'kshenoy/vim-signature'}           -- toggle, display and navigate marks
+	-- highlight color codes
+	use {'norcalli/nvim-colorizer.lua',
+		config=function()
+			require'colorizer'.setup(nil, {
+					name = true;
+					RRGGBB = true;
+					RRGGBBAA = false;
+					rgb_fn = true;
+					hsl_fn = true;
+					mode = 'background';
+				})
+		end}
+	use {'rhysd/git-messenger.vim'}         -- git-blame in a popup
+	use {'kassio/neoterm'}
+
+	-- languages
+	-- NOTE: these should only be loaded when they are required...
+	-- use {'rhysd/vim-grammarous',       ft = {'markdown', 'latex', 'tex'}}
+	use {'lervag/vimtex',                 ft = {'latex', 'tex'}}
+	use {'plasticboy/vim-markdown',       ft = {'markdown'}}
+	use {'masukomi/vim-markdown-folding', ft = {'markdown'}}
+	-- easy html editing
+	use {'mattn/emmet-vim',               ft = {'html'}}
+	-- use {'valloric/matchtagalways',    ft = {'html', 'vue', 'xml'}} -- visually match HTML tags enclosing cursor location
+	-- use {'ledger/vim-ledger',             ft = {'ledger'},
+	-- 	requires = {
+	-- 		'tpope/vim-speeddating',   -- easy time/date incrementing
+	-- 		'vim-scripts/utl.vim'}}    -- follow links/urls
+	
+	use {'gentoo/gentoo-syntax'}
+	use {'jjo/vim-cue'}
+
+	-- multi-language support with lazy loading
+	-- NOTE: put language specific plugs before this to avoid conflicsts
+	use {'sheerun/vim-polyglot'}
+		
+	-- minimal ux
+	use {'junegunn/goyo.vim',         cmd = 'Goyo'}      -- hide ui clutter
+	use {'junegunn/limelight.vim',    cmd = 'Limelight'} -- dims colors
+	-- use 'equalsraf/neovim-gui-shim'
+
+	-- colorschemes
+	use {'NLKNguyen/papercolor-theme'}
+	-- use {'cideM/yui'}
+	use {'ayu-theme/ayu-vim'}
+	-- use {'rktjmp/lush.nvim',
+	-- 	config=function() require'conf.colors' end}
+
+	use {'dstein64/vim-startuptime'}
+
+	-- local
+	-- use {'~/devel/projects/nihon-theme/vim'}
+	-- use {'~/devel/projects/vim-orgdown'}
+	use {'~/.vim/devel/obsidian.nvim'}
+	use {'~/.vim/devel/vim-github-link'}
+end)
diff --git a/.vim/plug.vim b/.vim/plug.vim
deleted file mode 100644
index 012d237..0000000
--- a/.vim/plug.vim
+++ /dev/null
@@ -1,89 +0,0 @@
-" get plug.vim if it's not installed
-if empty(glob('~/.vim/autoload/plug.vim'))
-  silent !curl -fLo ~/.vim/autoload/plug.vim --create-dirs
-    \ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
-  autocmd VimEnter * PlugInstall --sync | source $MYVIMRC
-endif
-
-call plug#begin('~/.vim/plugged')
-
-" Core
-  Plug 'mhinz/vim-signify'      " git status in the sign column
-  Plug 'tpope/vim-commentary'   " auto-comment using `gcc`
-  Plug 'cohama/lexima.vim'      " auto-close parens, brackets, etc.
-  Plug 'tpope/vim-surround'     " edit surroundings in pairs
-  Plug 'itchyny/lightline.vim'  " lightweight status bar
-  Plug 'neomake/neomake'        " async job runner
-  Plug 'sbdchd/neoformat'       " async code formatter
-  Plug 'justinmk/vim-dirvish'   " folder browser
-  Plug 'justinmk/vim-sneak'     " powerful missing vim motions
-
-  if has('nvim-0.5.0')
-    Plug 'neovim/nvim-lsp'
-    Plug 'haorenW1025/completion-nvim'
-  endif
-
-  Plug 'SirVer/ultisnips'
-    \| Plug 'honza/vim-snippets'
-
-  Plug 'vimwiki/vimwiki', { 'for': ['vimwiki'], 'on': ['VimwikiIndex', 'VimwikiGoto'] }
-
-  " search
-  " Plug 'junegunn/fzf',
-  "   \ { 'dir': '~/.fzf', 'do': './install --all'}
-    " \ |Plug 'junegunn/fzf.vim'
-  " Plug 'lotabout/skim',
-  "   \ { 'on': 'SK', 'dir': '~/.skim', 'do': './install'}
-
-  Plug 'liuchengxu/vim-clap', { 'do': ':Clap install-binary!' } " interactive finder / dispatcher
-
-" Misc
-  Plug 'junegunn/vim-easy-align',
-    \ { 'on': ['EasyAlign', '<Plug>(EasyAlign)'] }
-  Plug 'tpope/vim-sleuth'                " auto-set shiftwidth and expandtab options
-  Plug 'nathanaelkane/vim-indent-guides' " show indentation levels
-  Plug 'tpope/vim-repeat'                " extend '.' to plugins
-  Plug 'liuchengxu/vista.vim'            " sidebar populated by lsp, ctags, etc.
-  Plug 'sgur/vim-editorconfig'           " implements editorconfig in vimscript
-  Plug 'rhysd/conflict-marker.vim'
-  Plug 'michaeljsmith/vim-indent-object' " adds indentation text-objects
-  Plug 'kshenoy/vim-signature'           " toggle, display and navigate marks
-  Plug 'RRethy/vim-hexokinase',
-    \ { 'do': 'make hexokinase' }        " highlights color codes
-  Plug 'rhysd/git-messenger.vim'         " git-blame in a popup
-  Plug 'bling/vim-bufferline'            " needed to put buffers into tabline
-
-  Plug 'kassio/neoterm'
-
-" Languages
-  " NOTE: these should only be loaded when they are required...
-  " Plug 'rhysd/vim-grammarous',    { 'for': ['markdown', 'latex', 'tex'] }
-  Plug 'lervag/vimtex',           { 'for': ['latex', 'tex'] }
-  Plug 'plasticboy/vim-markdown', { 'for': ['markdown'] }
-  Plug 'masukomi/vim-markdown-folding', { 'for': ['markdown'] }
-  Plug 'mattn/emmet-vim',         { 'for': ['html', 'vue'] }        " super-fast HTML editing
-  " Plug 'valloric/matchtagalways', { 'for': ['html', 'vue', 'xml'] } " visually match HTML tags enclosing cursor location
-  Plug 'ledger/vim-ledger',       { 'for': ['ledger'] }
-    \| Plug 'tpope/vim-speeddating'  " easy time/date incrementing
-    \| Plug 'vim-scripts/utl.vim'    " follow links/urls
-  Plug 'gentoo/gentoo-syntax',    { 'for': ['ebuild'] }
-
-  " multi-language support with lazy loading
-  " NOTE: put language specific plugs before this to avoid conflicsts
-  Plug 'sheerun/vim-polyglot'
-
-" Minimal UX
-  Plug 'junegunn/goyo.vim',         { 'on': 'Goyo' }      " hide ui clutter
-  Plug 'junegunn/limelight.vim',    { 'on': 'Limelight' } " dims colors
-  " Plug 'equalsraf/neovim-gui-shim'
-
-" Colorschemes
-  Plug 'NLKNguyen/papercolor-theme'
-  Plug 'cideM/yui'
-  Plug 'ayu-theme/ayu-vim'
-
-" Local
-  " Plug '~/devel/projects/nihon-theme/vim'
-  " Plug '~/devel/projects/vim-orgdown'
-
-call plug#end()
diff --git a/.vim/plugin/line.vim b/.vim/plugin/line.vim
index ad25cab..eed5224 100644
--- a/.vim/plugin/line.vim
+++ b/.vim/plugin/line.vim
@@ -1,3 +1,5 @@
+finish
+
 let g:lightline = {}
 
 let g:lightline.enable = { 'statusline': 1, 'tabline': 0 }
@@ -20,7 +22,7 @@ let g:lightline.active = {
 \   'left': [
 \       ['mode', 'paste'],
 \       ['filename', 'vista'],
-\       ['neomake', 'coc', 'ctags', 'obsession'],
+\       ['neomake', 'ctags', 'obsession'],
 \   ],
 \   'right': [
 \       ['filetype', 'fileencoding', 'fileformat'],
diff --git a/.vim/plugin/packer_compiled.vim b/.vim/plugin/packer_compiled.vim
new file mode 100644
index 0000000..a40dddd
--- /dev/null
+++ b/.vim/plugin/packer_compiled.vim
@@ -0,0 +1,211 @@
+" Automatically generated packer.nvim plugin loader code
+
+if !has('nvim')
+  finish
+endif
+
+lua << END
+local plugins = {
+  ["emmet-vim"] = {
+    loaded = false,
+    only_sequence = false,
+    only_setup = false,
+    path = "/home/robert/.local/share/nvim/site/pack/packer/opt/emmet-vim"
+  },
+  ["goyo.vim"] = {
+    commands = { "Goyo" },
+    loaded = false,
+    only_sequence = false,
+    only_setup = false,
+    path = "/home/robert/.local/share/nvim/site/pack/packer/opt/goyo.vim"
+  },
+  ["limelight.vim"] = {
+    commands = { "Limelight" },
+    loaded = false,
+    only_sequence = false,
+    only_setup = false,
+    path = "/home/robert/.local/share/nvim/site/pack/packer/opt/limelight.vim"
+  },
+  ["vim-easy-align"] = {
+    commands = { "EasyAlign" },
+    loaded = false,
+    only_sequence = false,
+    only_setup = false,
+    path = "/home/robert/.local/share/nvim/site/pack/packer/opt/vim-easy-align"
+  },
+  ["vim-markdown"] = {
+    loaded = false,
+    only_sequence = false,
+    only_setup = false,
+    path = "/home/robert/.local/share/nvim/site/pack/packer/opt/vim-markdown"
+  },
+  ["vim-markdown-folding"] = {
+    loaded = false,
+    only_sequence = false,
+    only_setup = false,
+    path = "/home/robert/.local/share/nvim/site/pack/packer/opt/vim-markdown-folding"
+  },
+  vimtex = {
+    loaded = false,
+    only_sequence = false,
+    only_setup = false,
+    path = "/home/robert/.local/share/nvim/site/pack/packer/opt/vimtex"
+  }
+}
+
+local function handle_bufread(names)
+  for _, name in ipairs(names) do
+    local path = plugins[name].path
+    for _, dir in ipairs({ 'ftdetect', 'ftplugin', 'after/ftdetect', 'after/ftplugin' }) do
+      if #vim.fn.finddir(dir, path) > 0 then
+        vim.cmd('doautocmd BufRead')
+        return
+      end
+    end
+  end
+end
+
+_packer_load = nil
+
+local function handle_after(name, before)
+  local plugin = plugins[name]
+  plugin.load_after[before] = nil
+  if next(plugin.load_after) == nil then
+    _packer_load({name}, {})
+  end
+end
+
+_packer_load = function(names, cause)
+  local some_unloaded = false
+  for _, name in ipairs(names) do
+    if not plugins[name].loaded then
+      some_unloaded = true
+      break
+    end
+  end
+
+  if not some_unloaded then return end
+
+  local fmt = string.format
+  local del_cmds = {}
+  local del_maps = {}
+  for _, name in ipairs(names) do
+    if plugins[name].commands then
+      for _, cmd in ipairs(plugins[name].commands) do
+        del_cmds[cmd] = true
+      end
+    end
+
+    if plugins[name].keys then
+      for _, key in ipairs(plugins[name].keys) do
+        del_maps[key] = true
+      end
+    end
+  end
+
+  for cmd, _ in pairs(del_cmds) do
+    vim.cmd('silent! delcommand ' .. cmd)
+  end
+
+  for key, _ in pairs(del_maps) do
+    vim.cmd(fmt('silent! %sunmap %s', key[1], key[2]))
+  end
+
+  for _, name in ipairs(names) do
+    if not plugins[name].loaded then
+      vim.cmd('packadd ' .. name)
+      if plugins[name].config then
+        for _i, config_line in ipairs(plugins[name].config) do
+          loadstring(config_line)()
+        end
+      end
+
+      if plugins[name].after then
+        for _, after_name in ipairs(plugins[name].after) do
+          handle_after(after_name, name)
+          vim.cmd('redraw')
+        end
+      end
+
+      plugins[name].loaded = true
+    end
+  end
+
+  handle_bufread(names)
+
+  if cause.cmd then
+    local lines = cause.l1 == cause.l2 and '' or (cause.l1 .. ',' .. cause.l2)
+    vim.cmd(fmt('%s%s%s %s', lines, cause.cmd, cause.bang, cause.args))
+  elseif cause.keys then
+    local keys = cause.keys
+    local extra = ''
+    while true do
+      local c = vim.fn.getchar(0)
+      if c == 0 then break end
+      extra = extra .. vim.fn.nr2char(c)
+    end
+
+    if cause.prefix then
+      local prefix = vim.v.count and vim.v.count or ''
+      prefix = prefix .. '"' .. vim.v.register .. cause.prefix
+      if vim.fn.mode('full') == 'no' then
+        if vim.v.operator == 'c' then
+          prefix = '' .. prefix
+        end
+
+        prefix = prefix .. vim.v.operator
+      end
+
+      vim.fn.feedkeys(prefix, 'n')
+    end
+
+    -- NOTE: I'm not sure if the below substitution is correct; it might correspond to the literal
+    -- characters \<Plug> rather than the special <Plug> key.
+    vim.fn.feedkeys(string.gsub(string.gsub(cause.keys, '^<Plug>', '\\<Plug>') .. extra, '<[cC][rR]>', '\r'))
+  elseif cause.event then
+    vim.cmd(fmt('doautocmd <nomodeline> %s', cause.event))
+  elseif cause.ft then
+    vim.cmd(fmt('doautocmd <nomodeline> %s FileType %s', 'filetypeplugin', cause.ft))
+    vim.cmd(fmt('doautocmd <nomodeline> %s FileType %s', 'filetypeindent', cause.ft))
+  end
+end
+
+-- Runtimepath customization
+
+-- Pre-load configuration
+-- Post-load configuration
+-- Config for: nvim-treesitter
+loadstring("\27LJ\1\2/\0\0\2\0\2\0\0044\0\0\0%\1\1\0>\0\2\1G\0\1\0\20conf.treesitter\frequire\0")()
+-- Config for: nvim-colorizer.lua
+loadstring("\27LJ\1\2z\0\0\3\0\4\0\b4\0\0\0%\1\1\0>\0\2\0027\0\2\0)\1\0\0003\2\3\0>\0\3\1G\0\1\0\1\0\6\vrgb_fn\2\tname\2\rRRGGBBAA\1\vhsl_fn\2\tmode\15background\vRRGGBB\2\nsetup\14colorizer\frequire\0")()
+-- Config for: galaxyline.nvim
+loadstring("\27LJ\1\2$\0\0\2\0\2\0\0044\0\0\0%\1\1\0>\0\2\1G\0\1\0\tline\frequire\0")()
+-- Config for: nvim-lspconfig
+loadstring("\27LJ\1\2(\0\0\2\0\2\0\0044\0\0\0%\1\1\0>\0\2\1G\0\1\0\rconf.lsp\frequire\0")()
+-- Config for: telescope.nvim
+loadstring("\27LJ\1\2.\0\0\2\0\2\0\0044\0\0\0%\1\1\0>\0\2\1G\0\1\0\19conf.telescope\frequire\0")()
+-- Conditional loads
+-- Load plugins in order defined by `after`
+END
+
+function! s:load(names, cause) abort
+call luaeval('_packer_load(_A[1], _A[2])', [a:names, a:cause])
+endfunction
+
+
+" Command lazy-loads
+command! -nargs=* -range -bang -complete=file Goyo call s:load(['goyo.vim'], { "cmd": "Goyo", "l1": <line1>, "l2": <line2>, "bang": <q-bang>, "args": <q-args> })
+command! -nargs=* -range -bang -complete=file Limelight call s:load(['limelight.vim'], { "cmd": "Limelight", "l1": <line1>, "l2": <line2>, "bang": <q-bang>, "args": <q-args> })
+command! -nargs=* -range -bang -complete=file EasyAlign call s:load(['vim-easy-align'], { "cmd": "EasyAlign", "l1": <line1>, "l2": <line2>, "bang": <q-bang>, "args": <q-args> })
+
+" Keymap lazy-loads
+
+augroup packer_load_aucmds
+  au!
+  " Filetype lazy-loads
+  au FileType markdown ++once call s:load(['vim-markdown', 'vim-markdown-folding'], { "ft": "markdown" })
+  au FileType html ++once call s:load(['emmet-vim'], { "ft": "html" })
+  au FileType latex ++once call s:load(['vimtex'], { "ft": "latex" })
+  au FileType tex ++once call s:load(['vimtex'], { "ft": "tex" })
+  " Event lazy-loads
+augroup END
diff --git a/.vim/plugin/split_term.vim b/.vim/plugin/split_term.vim
deleted file mode 100644
index efb9b86..0000000
--- a/.vim/plugin/split_term.vim
+++ /dev/null
@@ -1,11 +0,0 @@
-" SplitTerm: quickly pop out a terminal
-
-" skip this while were testing kassio/neoterm
-finish
-
-" lua require('split_term')
-" command! LuaTerm :lua spt_toggle()<CR>
-
-command! -bang -nargs=* SplitTerm call s:split_term_toggle(<bang>0, <f-args>)
-cnoreabbrev spt SplitTerm
-cnoreabbrev st SplitTerm
diff --git a/.vim/plugin/zettel.vim b/.vim/plugin/zettel.vim
new file mode 100644
index 0000000..948bb91
--- /dev/null
+++ b/.vim/plugin/zettel.vim
@@ -0,0 +1,43 @@
+" markdown extended for bullet journaling and personal wiki-keeping
+
+if exists('g:loaded_zettel')
+	finish
+endif
+let g:loaded_zettel = 1
+
+if !exists('g:zettel_root')
+	let g:zettel_root = expand($HOME.'/wiki')
+endif
+
+if !exists('g:zettel_create_on_empty')
+	let g:zettel_create_on_emtpy = 1
+endif
+
+if v:progname =~ 'vimdiff'
+	let g:zettel_create_on_empty = 0
+endif
+
+function! <SID>make_new_zettel()
+	let l:pastebackup = &paste
+	set nopaste
+
+	0 put ='---'
+	read !yq n date $(date -Iseconds) | yq w - title "%:t:r"
+	put ='---'
+	call feedkeys('Go', 'n')
+
+	if pastebackup == 0
+		set nopaste
+	endif
+endfunction
+
+command! -nargs=0 NewZettel call <SID>make_new_zettel()
+
+augroup NewZettel
+	au!
+	au BufNewFile *.md
+		\ if expand('%:p') =~# fnameescape(g:zettel_root).'/.*.md' |
+		\ 	call <SID>make_new_zettel() |
+		\ endif
+augroup END
+