From f0191a8d59450e61861778ced847ec5cdabce1ee Mon Sep 17 00:00:00 2001
From: Spencer Gilbert <me@spencergilbert.dev>
Date: Tue, 15 Sep 2026 21:31:25 -0400
Subject: [PATCH] [nvim] Fold lsp/ server configs into init.lua

Most of nvim/lsp/*.lua duplicated the cmd/filetypes/root_markers already
shipped by nvim-lspconfig, and the servers were never enabled after the
kickstart rewrite dropped the old vim.lsp.enable() list.

- Move the remaining overrides into the servers table (gopls gofumpt,
  terragrunt root marker for terraformls, yamlls schema store/telemetry)
- Enable bashls, helm_ls, and zls via nvim-lspconfig defaults
- Fix the Helm server name (helmls -> helm_ls)
- Delete nvim/lsp/
---
 nvim/init.lua            | 34 ++++++++++++++++++++++++++++++++++
 nvim/lsp/bashls.lua      |  5 -----
 nvim/lsp/gopls.lua       | 10 ----------
 nvim/lsp/helmls.lua      |  5 -----
 nvim/lsp/terraformls.lua |  5 -----
 nvim/lsp/yamlls.lua      | 17 -----------------
 nvim/lsp/zls.lua         |  5 -----
 7 files changed, 34 insertions(+), 47 deletions(-)
 delete mode 100644 nvim/lsp/bashls.lua
 delete mode 100644 nvim/lsp/gopls.lua
 delete mode 100644 nvim/lsp/helmls.lua
 delete mode 100644 nvim/lsp/terraformls.lua
 delete mode 100644 nvim/lsp/yamlls.lua
 delete mode 100644 nvim/lsp/zls.lua

diff --git a/nvim/init.lua b/nvim/init.lua
index 52237cb..7b27f28 100644
--- a/nvim/init.lua
+++ b/nvim/init.lua
@@ -640,6 +640,40 @@ do
 
     stylua = {}, -- Used to format Lua code
 
+    -- The servers below rely on the defaults shipped by nvim-lspconfig
+    --  (`lsp/<name>.lua`); only overrides to those defaults are listed here.
+    --  See `:help lspconfig-all` for the full defaults of each server.
+    bashls = {},
+
+    gopls = {
+      settings = {
+        gopls = {
+          gofumpt = true,
+        },
+      },
+    },
+
+    helm_ls = {},
+
+    terraformls = {
+      -- Also treat Terragrunt configs as a project root marker.
+      root_markers = { '.terraform', 'terragrunt.hcl', '.git' },
+    },
+
+    yamlls = {
+      settings = {
+        -- https://github.com/redhat-developer/vscode-redhat-telemetry#how-to-disable-telemetry-reporting
+        redhat = { telemetry = { enabled = false } },
+        yaml = {
+          schemaStore = {
+            enable = false,
+          },
+        },
+      },
+    },
+
+    zls = {},
+
     -- Special Lua Config, as recommended by neovim help docs
     lua_ls = {
       on_init = function(client)
diff --git a/nvim/lsp/bashls.lua b/nvim/lsp/bashls.lua
deleted file mode 100644
index b72317b..0000000
--- a/nvim/lsp/bashls.lua
+++ /dev/null
@@ -1,5 +0,0 @@
-return {
-	cmd = { 'bash-language-server', 'start' },
-	filetypes = { 'bash', 'sh' },
-	root_markers = { '.git' },
-}
diff --git a/nvim/lsp/gopls.lua b/nvim/lsp/gopls.lua
deleted file mode 100644
index d3badc7..0000000
--- a/nvim/lsp/gopls.lua
+++ /dev/null
@@ -1,10 +0,0 @@
-return {
-  cmd = { 'gopls' },
-  filetypes = { 'go', 'gomod', 'gowork' },
-  root_markers = { 'go.work', 'go.mod', '.git' },
-  settings = {
-	  gopls = {
-		  gofumpt = true,
-	  }
-  }
-}
diff --git a/nvim/lsp/helmls.lua b/nvim/lsp/helmls.lua
deleted file mode 100644
index e026f32..0000000
--- a/nvim/lsp/helmls.lua
+++ /dev/null
@@ -1,5 +0,0 @@
-return {
-  cmd = { 'helm_ls', 'serve' },
-  filetypes = { 'helm', 'yaml.helm-values' },
-  root_markers = { 'Chart.yaml', '.git' },
-}
diff --git a/nvim/lsp/terraformls.lua b/nvim/lsp/terraformls.lua
deleted file mode 100644
index 2da8777..0000000
--- a/nvim/lsp/terraformls.lua
+++ /dev/null
@@ -1,5 +0,0 @@
-return {
-	cmd = { 'terraform-ls', 'serve' },
-	filetypes = { 'terraform', 'terraform-vars' },
-	root_markers = { '.terraform', 'terragrunt.hcl', '.git' },
-}
diff --git a/nvim/lsp/yamlls.lua b/nvim/lsp/yamlls.lua
deleted file mode 100644
index 52f919c..0000000
--- a/nvim/lsp/yamlls.lua
+++ /dev/null
@@ -1,17 +0,0 @@
-return {
-  cmd = { 'yaml-language-server', '--stdio' },
-  filetypes = { 'yaml' },
-  root_markers = { '.git' },
-  settings = {
-	  redhat = {
-		  telemetry = {
-			  enabled = false,
-		  },
-	  },
-	  yaml = {
-		  schemaStore = {
-			  enable = false,
-		  },
-	  },
-  },
-}
diff --git a/nvim/lsp/zls.lua b/nvim/lsp/zls.lua
deleted file mode 100644
index 68aad50..0000000
--- a/nvim/lsp/zls.lua
+++ /dev/null
@@ -1,5 +0,0 @@
-return {
-	cmd = { 'zls' },
-	filetypes = { 'zig', 'zir' },
-	root_markers = { 'zls.json', 'build.zig', '.git' },
-}
-- 
2.51.2