Added back in schemastore support

nvim/dot-config/nvim/lua/plugins/lsp.lua

@@ -120,14 +120,14 @@ return {
 		}
 
 		local handler = function(server_name)
-			local server = require("tools").servers[server_name] or {}
+			local server = require("tools").servers()[server_name] or {}
 			server.capabilities = vim.tbl_deep_extend("force", capabilities, server.capabilities or {})
 			server.handlers = handlers
 
 			require("lspconfig")[server_name].setup(server)
 		end
 
-		for server, config in pairs(require("tools").servers) do
+		for server, config in pairs(require("tools").servers()) do
 			if config.system then
 				handler(server)
 			end

nvim/dot-config/nvim/lua/plugins/mason.lua

@@ -15,13 +15,13 @@ return {
 		},
 		config = function()
 			local tools = require("tools")
-			local ensure_installed = vim.tbl_keys(vim.tbl_map(function(server)
+			local ensure_installed = vim.tbl_keys(vim.tbl_map(function(tool)
-				if server.system then
+				if tool.system then
 					return nil
 				else
-					return server
+					return tool
 				end
-			end, tools.servers))
+			end, tools.servers()))
 			ensure_installed =
 				vim.list_extend(ensure_installed, require("util.mason").process_formatters(tools.formatters))
 			ensure_installed = vim.list_extend(ensure_installed, tools.extra)

nvim/dot-config/nvim/lua/tools.lua

@@ -1,60 +1,62 @@
 local tools = {}
 
 -- https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md
-tools.servers = {
+tools.servers = function()
-	clangd = {
+	return {
-		cmd = { "clangd", "--offset-encoding=utf-16", "--clang-tidy" },
+		clangd = {
-	},
+			cmd = { "clangd", "--offset-encoding=utf-16", "--clang-tidy" },
-	gopls = {},
+		},
-	pyright = {},
+		gopls = {},
-	rust_analyzer = {
+		pyright = {},
-		system = true,
+		rust_analyzer = {
-		settings = {
+			system = true,
-			["rust-analyzer"] = {
+			settings = {
-				check = {
+				["rust-analyzer"] = {
-					command = "clippy",
+					check = {
+						command = "clippy",
+					},
 				},
 			},
 		},
-	},
+		lua_ls = {
-	lua_ls = {
+			settings = {
-		settings = {
+				Lua = {
-			Lua = {
+					workspace = { checkThirdParty = false },
-				workspace = { checkThirdParty = false },
+					telemetry = { enable = false },
-				telemetry = { enable = false },
-			},
-		},
-	},
-	jsonls = {
-		settings = {
-			json = {
-				validate = { enable = true },
-				-- schemas = require("schemastore").json.schemas(),
-			},
-		},
-	},
-	yamlls = {
-		settings = {
-			yaml = {
-				schemaStore = {
-					enable = false,
-					url = "",
 				},
-				-- schemas = require("schemastore").yaml.schemas(),
 			},
 		},
-	},
+		jsonls = {
-	taplo = {},
+			settings = {
-	neocmake = {},
+				json = {
-	nil_ls = {
+					validate = { enable = true },
-		system = true,
+					schemas = require("schemastore").json.schemas(),
-	},
+				},
-	typos_lsp = {
+			},
-		init_options = {
-			diagnosticSeverity = "Hint",
 		},
-	},
+		yamlls = {
-}
+			settings = {
+				yaml = {
+					schemaStore = {
+						enable = false,
+						url = "",
+					},
+					schemas = require("schemastore").yaml.schemas(),
+				},
+			},
+		},
+		taplo = {},
+		neocmake = {},
+		nil_ls = {
+			system = true,
+		},
+		typos_lsp = {
+			init_options = {
+				diagnosticSeverity = "Hint",
+			},
+		},
+	}
+end
 
 -- https://github.com/stevearc/conform.nvim
 tools.formatters = require("util.conform").assign_formatters({