From 83e533b9281b33125f67099904b6e35fad768c66 Mon Sep 17 00:00:00 2001
From: Daniel Carrillo <daniel.carrillo@gmail.com>
Date: Sun, 9 Jul 2023 18:19:20 +0200
Subject: [PATCH] [neovim] Improve yamlls/companion configuration

---
 .config/nvim/lua/plugins/lsp/init.lua         |  1 -
 .config/nvim/lua/plugins/lsp/mason.lua        |  1 +
 .../nvim/lua/plugins/lsp/settings/yamlls.lua  | 21 +++++++++++++------
 .../nvim/lua/plugins/lsp/yaml-companion.lua   |  2 --
 4 files changed, 16 insertions(+), 9 deletions(-)
 delete mode 100644 .config/nvim/lua/plugins/lsp/yaml-companion.lua

diff --git a/.config/nvim/lua/plugins/lsp/init.lua b/.config/nvim/lua/plugins/lsp/init.lua
index 3abb436..0bfe9e6 100644
--- a/.config/nvim/lua/plugins/lsp/init.lua
+++ b/.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"
diff --git a/.config/nvim/lua/plugins/lsp/mason.lua b/.config/nvim/lua/plugins/lsp/mason.lua
index d381b8f..546252a 100644
--- a/.config/nvim/lua/plugins/lsp/mason.lua
+++ b/.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)
diff --git a/.config/nvim/lua/plugins/lsp/settings/yamlls.lua b/.config/nvim/lua/plugins/lsp/settings/yamlls.lua
index 4a5ddc3..07259af 100644
--- a/.config/nvim/lua/plugins/lsp/settings/yamlls.lua
+++ b/.config/nvim/lua/plugins/lsp/settings/yamlls.lua
@@ -1,9 +1,18 @@
-return {
-	settings = {
-		redhat = {
-			telemetry = {
-				enabled = false,
+local cfg = require("yaml-companion").setup({
+	lspconfig = {
+		settings = {
+			redhat = {
+				telemetry = {
+					enabled = false,
+				},
 			},
+			-- 	yaml = {
+			-- 		schemas = {
+			-- 			["https://custom/github-workflow.json"] = "/.github/workflows/*",
+			-- 		},
+			-- 	},
 		},
 	},
-}
+})
+
+return cfg
diff --git a/.config/nvim/lua/plugins/lsp/yaml-companion.lua b/.config/nvim/lua/plugins/lsp/yaml-companion.lua
deleted file mode 100644
index 9662709..0000000
--- a/.config/nvim/lua/plugins/lsp/yaml-companion.lua
+++ /dev/null
@@ -1,2 +0,0 @@
-local cfg = require("yaml-companion").setup({})
-require("lspconfig")["yamlls"].setup(cfg)