config/vim/init.vim

@@ -20,22 +20,29 @@ if !isdirectory($XDG_CACHE_HOME .. '/vim/pack')
   PackUpdate
 endif
 
+augroup transparent_term
+  autocmd!
+  autocmd ColorScheme * highlight Normal ctermbg=NONE guibg=NONE
+augroup END
+
+set background=dark
+g:gruvbox_italic = 1
+g:gruvbox_improved_strings = 1
+g:gruvbox_improved_warnings = 1
+
 if has('gui_running') || has('termguicolors')
   if $COLORTERM == 'truecolor'
     &t_8f = "\<Esc>[38:2:%lu:%lu:%lum"
     &t_8b = "\<Esc>[48:2:%lu:%lu:%lum"
   endif
   set termguicolors
+  silent! packadd gruvbox
+  g:airline_theme = 'gruvbox'
+  colorscheme gruvbox
+else
+  colorscheme inkpot
 endif
 
-set background=dark
-g:gruvbox_transp_bg = 1
-g:gruvbox_italicize_strings = 0
-g:gruvbox_filetype_hi_groups = 1
-g:gruvbox_plugin_hi_groups = 1
-g:airline_theme = 'gruvbox8'
-colorscheme gruvbox8
-
 inoremap jj <Esc>
 nnoremap <C-t> :Files<CR>
 

config/vim/lsp.vim

@@ -6,7 +6,7 @@ const lspServers = [
     filetype: 'dockerfile',
     path: expand('~/.local/bin/docker-langserver'),
     args: ['--stdio'],
-    install: 'npm install -g dockerfile-language-server-nodejs',
+    install: ['npm', 'install', '-g', 'dockerfile-language-server-nodejs'],
   },
 
   {
@@ -14,7 +14,7 @@ const lspServers = [
     filetype: 'lua',
     path: '/usr/local/bin/lua-language-server',
     args: [],
-    install: 'brew install lua-language-server',
+    install: ['brew', 'install', 'lua-language-server'],
   },
 
   {
@@ -22,7 +22,7 @@ const lspServers = [
     filetype: 'bzl',
     path: '/usr/local/bin/tilt',
     args: ['lsp', 'start'],
-    install: 'brew install tilt',
+    install: ['brew', 'install', 'tilt'],
   },
 
   {
@@ -30,7 +30,7 @@ const lspServers = [
     filetype: ['javascript', 'typescript'],
     path: '/usr/local/bin/typescript-language-server',
     args: ['--stdio'],
-    install: 'brew install typescript-language-server',
+    install: ['brew', 'install', 'typescript-language-server'],
   },
 
   {
@@ -41,7 +41,7 @@ const lspServers = [
     initializationOptions: {
       'language_server_configuration.auto_config': false,
     },
-    install: 'curl -Lo phpactor https://github.com/phpactor/phpactor/releases/latest/download/phpactor.phar && chmod u+x phpactor && mv phpactor ~/bin',
+    install: ['bash', '-c', 'curl -Lo phpactor https://github.com/phpactor/phpactor/releases/latest/download/phpactor.phar && chmod u+x phpactor && mv phpactor ~/bin'],
   },
 
   {
@@ -49,7 +49,7 @@ const lspServers = [
     filetype: 'python',
     path: '/usr/local/bin/pylsp',
     args: [],
-    install: 'brew install python-lsp-server',
+    install: ['brew', 'install', 'python-lsp-server'],
   },
 
   {
@@ -57,7 +57,7 @@ const lspServers = [
     filetype: 'ruby',
     path: '/usr/local/bin/solargraph',
     args: ['stdio'],
-    install: 'brew install solargraph',
+    install: ['brew', 'install', 'solargraph'],
   },
 
   {
@@ -65,7 +65,7 @@ const lspServers = [
     filetype: 'vim',
     path: expand('~/.local/bin/vim-language-server'),
     args: ['--stdio'],
-    install: 'npm install -g vim-language-server',
+    install: ['npm', 'install', '-g', 'vim-language-server'],
   },
 ]
 
@@ -75,54 +75,27 @@ const lspOptions = {
 
 command! -nargs=0 -bar LspInstall Install()
 
-def InstalledServers(): list<dict<any>>
-  return lspServers->deepcopy()->filter((_, server): bool => executable(server.path) == 1)
-enddef
-
-def MissingServers(): list<dict<any>>
-  return lspServers->deepcopy()->filter((_, server): bool => executable(server.path) == 0)
-enddef
-
 export def LazyConfigure(): void
   autocmd VimEnter * ++once Configure()
 enddef
 
 export def Configure(): void
-  final installedServers = InstalledServers()
+  final installedServers = lspServers->deepcopy()->filter((_, server) => executable(server.path) == 1)
   if len(lspServers) != len(installedServers)
-    echo $'{len(lspServers) - len(installedServers)} language servers are configured, but not installed. You may want to run :LspInstall.'
+    echo (len(lspServers) - len(installedServers)) "language servers are configured, but not installed. You may want to run :LspInstall."
   endif
   g:LspAddServer(installedServers)
   g:LspOptionsSet(lspOptions)
 enddef
 
 export def Install(): void
-  const missingServers = MissingServers()
-  if empty(missingServers)
-    echo $"All {len(lspServers)} configured language servers are already installed."
-    return
-  endif
-
-  # The installScript runs every missing server's install command, regardless
-  # of whether any fail in the process. The script's exit status is the number
-  # of failed installations.
-  const installScript = "failed=0\n" .. missingServers->copy()
-    ->map((_, server): string => $"\{ {server.install}; \} || failed=$((failed + 1))")
-    ->join("\n") ..  "\nexit $failed\n"
-
-  const term = term_start('sh', {exit_cb: (job: job, status: number): void => {
-    # If any installations failed, keep the terminal window open so we can
-    # troubleshoot. If they all worked fine, close the terminal and reload the
-    # LSP configuration.
-    if status == 0
-      execute 'bdelete' job->ch_getbufnr('out')
-      Configure()
-    endif
-  }})
-
-  # We prefer term_sendkeys() over sh -c because that will display each
-  # command in the terminal as it's being executed, making it easier to
-  # understand exactly what the install script is doing.
-  term->term_sendkeys(installScript)
+  # TODO: running all installations in parallel doesn't work super well,
+  # because some package managers use an exclusive lock while they're running.
+  # Plus you don't get feedback on installation progress. Perhaps use
+  # term_start() instead, so installs run in series and are visible on screen?
+  const missing = lspServers->copy()
+    ->filter((_, server) => executable(server.path) == 0)
+  const jobs = missing->copy()
+    ->mapnew((_, server) => async#job#start(server.install, {normalize: 'raw'}))
+  async#job#wait(jobs)
 enddef
-

config/vim/plugins.vim

@@ -14,7 +14,8 @@ minpac#add('k-takata/minpac', {type: 'opt'})
 minpac#add('tpope/vim-sensible')
 minpac#add('prabirshrestha/async.vim')
 
-minpac#add('lifepillar/vim-gruvbox8')
+minpac#add('ciaranm/inkpot', {type: 'opt', do: 'colorscheme inkpot'})
+minpac#add('morhetz/gruvbox', {type: 'opt'})
 
 minpac#add('direnv/direnv.vim')
 minpac#add('editorconfig/editorconfig-vim')