From dd76719d2b51e21067bb18ed3fc010aa614c8ac2 Mon Sep 17 00:00:00 2001 From: JJGadgets Date: Sat, 31 Aug 2024 00:24:06 +0800 Subject: [PATCH] feat(dots/nvim): yaml-companion --> schema-companion --- dots/nvim/init.lua | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/dots/nvim/init.lua b/dots/nvim/init.lua index 31a9d9f7..6527f634 100644 --- a/dots/nvim/init.lua +++ b/dots/nvim/init.lua @@ -176,14 +176,20 @@ require("lazy").setup({ { "williamboman/mason-lspconfig.nvim", lazy = true, opts = { automatic_installation = true } }, { "b0o/schemastore.nvim", lazy = true }, { "diogo464/kubernetes.nvim", lazy = true, opts = {}, }, - { "someone-stole-my-name/yaml-companion.nvim", + --{ "someone-stole-my-name/yaml-companion.nvim", --{ "msvechla/yaml-companion.nvim", -- branch = "kubernetes_crd_detection", + { "cenk1cenk2/schema-companion.nvim", ft = { "yaml"}, - dependancies = { "nvim-lua/plenary.nvim" }, + dependancies = { { "nvim-lua/plenary.nvim" }, { "nvim-telescope/telescope.nvim" }, }, config = function() - require("telescope").load_extension("yaml_schema") - end, + require("schema-companion").setup({ + enable_telescope = true, + matchers = { + require("schema-companion.matchers.kubernetes").setup({ version = "1.30.1" }), + }, + }) + end }, { "neovim/nvim-lspconfig", event = { "FileType" }, @@ -232,7 +238,7 @@ require("lazy").setup({ } -- Run LSP server setup -- IMPORTANT: if the return of the args passed to setup has a parent {}, use `setup(arg)` where `arg = {...}` so the result is `setup{...}`, rather than `setup{arg}` which becomes `setup{{...}}` - if vim.bo.filetype == "yaml" then lsp.yamlls.setup( require("yaml-companion").setup { builtin_matchers = { kubernetes = { enabled = true }, }, lspconfig = yamlls_config, schemas = {} } ); end + if vim.bo.filetype == "yaml" then lsp.yamlls.setup( require("schema-companion").setup_client{yamlls_config} ); end lsp.taplo.setup { settings = { evenBetterToml = { schema = { associations = { ['^\\.mise\\.toml$'] = 'https://mise.jdx.dev/schema/mise.json', }}}}}