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)
-				if server.system then
+			local ensure_installed = vim.tbl_keys(vim.tbl_map(function(tool)
+				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,7 +1,8 @@
 local tools = {}
 
 -- https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md
-tools.servers = {
+tools.servers = function()
+	return {
 		clangd = {
 			cmd = { "clangd", "--offset-encoding=utf-16", "--clang-tidy" },
 		},
@@ -29,7 +30,7 @@ tools.servers = {
 			settings = {
 				json = {
 					validate = { enable = true },
-				-- schemas = require("schemastore").json.schemas(),
+					schemas = require("schemastore").json.schemas(),
 				},
 			},
 		},
@@ -40,7 +41,7 @@ tools.servers = {
 						enable = false,
 						url = "",
 					},
-				-- schemas = require("schemastore").yaml.schemas(),
+					schemas = require("schemastore").yaml.schemas(),
 				},
 			},
 		},
@@ -55,6 +56,7 @@ tools.servers = {
 			},
 		},
 	}
+end
 
 -- https://github.com/stevearc/conform.nvim
 tools.formatters = require("util.conform").assign_formatters({