From e094f94027eec81c0809e68ee99dff4dd6ac497d Mon Sep 17 00:00:00 2001
From: Brian Zalewski <59970525+ProfessorManhattan@users.noreply.github.com>
Date: Thu, 1 Jun 2023 06:35:51 +0000
Subject: [PATCH] Updates to VIM

---
 home/.chezmoidata.yaml                |  3 +++
 home/dot_config/shell/exports.sh.tmpl |  2 ++
 home/dot_config/vim/vimrc             | 10 ----------
 software.yml                          | 27 +++++++++++++++++++++++++++
 4 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/home/.chezmoidata.yaml b/home/.chezmoidata.yaml
index 2cbcad7e..98aa1a3b 100644
--- a/home/.chezmoidata.yaml
+++ b/home/.chezmoidata.yaml
@@ -230,6 +230,7 @@ softwareGroups:
     - curlie
     - delta
     - direnv
+    - docker-langserver
     - dog
     - dua
     - duf
@@ -273,8 +274,10 @@ softwareGroups:
     - rm-improved
     - rsync
     - sd
+    - solargraph
     # Bundled into installer
     # - snapd
+    - sql-language-server
     - task
     - tmux
     - tor
diff --git a/home/dot_config/shell/exports.sh.tmpl b/home/dot_config/shell/exports.sh.tmpl
index 6a3182a9..35fa795f 100644
--- a/home/dot_config/shell/exports.sh.tmpl
+++ b/home/dot_config/shell/exports.sh.tmpl
@@ -308,6 +308,8 @@ export REDISCLI_RCFILE="$XDG_CONFIG_HOME/redis/redisclirc"
 export RIPGREP_CONFIG_PATH="$XDG_CONFIG_HOME/ripgrep/config"
 
 ### Ruby
+# Add Homebrew Ruby install location to PATH (for macOS and tools that require a more recent version than the bundled system version)
+export PATH="/usr/local/opt/ruby/bin:$PATH"
 export GEM_HOME="$XDG_DATA_HOME/gems"
 export PATH="$PATH:$GEM_HOME/bin"
 
diff --git a/home/dot_config/vim/vimrc b/home/dot_config/vim/vimrc
index ad20fbbe..efb7d8c1 100644
--- a/home/dot_config/vim/vimrc
+++ b/home/dot_config/vim/vimrc
@@ -63,16 +63,6 @@ if executable('node')
     \ 'coc-rls',
     \ 'coc-solidity'
     \]
-
-  if !executable('docker-langserver')
-    call system('npm install --prefix $HOME/.local/share/nvim -g dockerfile-language-server-nodejs')
-  endif
-  if !executable('sql-language-server')
-    call system('npm install --prefix $HOME/.local/share/nvim -g sql-language-server')
-  endif
-  if !executable('solargraph')
-    call system('gem install solargraph -n $HOME/.local/share/nvim/bin')
-  endif
 endif
 
 " Settings for coc-css extension
diff --git a/software.yml b/software.yml
index 943f9046..5db9dc2a 100644
--- a/software.yml
+++ b/software.yml
@@ -8255,6 +8255,33 @@ softwarePackages:
     port: vim
     scoop: vim
     _type: cli
+  docker-langserver:
+    _bin: docker-langserver
+    _desc: A Docker language server
+    _docs: https://github.com/rcjsuen/dockerfile-language-server-nodejs
+    _github: https://github.com/rcjsuen/dockerfile-language-server-nodejs
+    _home: https://github.com/rcjsuen/dockerfile-language-server-nodejs
+    _name: Docker Language Server
+    npm: dockerfile-language-server-nodejs
+  sql-language-server:
+    _bin: sql-language-server
+    _desc: An SQL language server
+    _docs: https://github.com/joe-re/sql-language-server
+    _github: https://github.com/joe-re/sql-language-server
+    _home: https://github.com/joe-re/sql-language-server
+    _name: SQL Language Server
+    brew: sql-language-server
+    npm: sql-language-server
+  solargraph:
+    _bin: solargraph
+    _desc: Ruby language server
+    _docs: https://solargraph.org/guides/getting-started
+    _github: https://github.com/castwide/solargraph
+    _home: https://solargraph.org/
+    _name: Solargraph
+    _post: solargraph download-core
+    brew: solargraph
+    gem: solargraph
   virtualbox:
     _bin: null
     _desc: '[VirtualBox](https://www.virtualbox.org/) is a free and open-source hosted hypervisor for x86 virtualization, developed by Oracle Corporation. Created by Innotek, it was acquired by Sun Microsystems in 2008, which was in turn acquired by Oracle in 2010. VirtualBox may be installed on Windows, macOS, Linux, Solaris and OpenSolaris.'