[neovim] Improve yamlls/companion configuration

.config/nvim/lua/plugins/lsp/init.lua

@@ -2,7 +2,6 @@ require("plugins.lsp.mason")
 require("plugins.lsp.handlers").setup()
 require("plugins.lsp.null-ls")
 require("plugins.lsp.lsp-saga")
-require("plugins.lsp.yaml-companion")
 
 local win = require("lspconfig.ui.windows")
 win.default_options.border = "rounded"

.config/nvim/lua/plugins/lsp/mason.lua

@@ -40,6 +40,7 @@ for _, server in pairs(servers) do
 
 	server = vim.split(server, "@")[1]
 
+	-- https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md
 	local config_exists, conf_opts = pcall(require, "plugins.lsp.settings." .. server)
 	if config_exists then
 		opts = vim.tbl_deep_extend("force", conf_opts, opts)

.config/nvim/lua/plugins/lsp/settings/yamlls.lua

@@ -1,9 +1,18 @@
-return {
+local cfg = require("yaml-companion").setup({
+	lspconfig = {
 		settings = {
 			redhat = {
 				telemetry = {
 					enabled = false,
 				},
 			},
+			-- 	yaml = {
+			-- 		schemas = {
+			-- 			["https://custom/github-workflow.json"] = "/.github/workflows/*",
+			-- 		},
+			-- 	},
 		},
-}
+	},
+})
+
+return cfg

.config/nvim/lua/plugins/lsp/yaml-companion.lua

@@ -1,2 +0,0 @@
-local cfg = require("yaml-companion").setup({})
-require("lspconfig")["yamlls"].setup(cfg)