diff --git a/dot_config/nvim/lua/configs/filetypes.lua b/dot_config/nvim/lua/configs/filetypes.lua index 8f2dde6..2827066 100644 --- a/dot_config/nvim/lua/configs/filetypes.lua +++ b/dot_config/nvim/lua/configs/filetypes.lua @@ -9,12 +9,21 @@ function M.setup() axaml = 'xml', xaml = 'xml', - cake = 'cs' + cake = 'cs', }, filename = { ['Directory.Build.props'] = 'xml', ['Directory.Build.targets'] = 'xml', - } + }, + pattern = { + ['.*vars/.*yaml'] = 'yaml.ansible', + ['.*/inventory/.*yaml'] = 'yaml.ansible', + ['.*/roles/.*yaml'] = 'yaml.ansible', + ['.*/handlers/.*yaml'] = 'yaml.ansible', + ['.*/tasks/.*yaml'] = 'yaml.ansible', + ['.*/defaults/.*yaml'] = 'yaml.ansible', + ['.*/meta/.*yaml'] = 'yaml.ansible', + }, }) end diff --git a/dot_config/nvim/lua/configs/packages/lsp.lua b/dot_config/nvim/lua/configs/packages/lsp.lua index 23a14c2..9ba14e0 100644 --- a/dot_config/nvim/lua/configs/packages/lsp.lua +++ b/dot_config/nvim/lua/configs/packages/lsp.lua @@ -37,24 +37,24 @@ local server_configs = function() settings = { FormattingOptions = { EnableEditorConfigSupport = true, - OrganizeImportsOnFormat = true + OrganizeImportsOnFormat = true, }, RoslynExtensionsOptions = { EnableAnalyzersSupport = true, EnableImportCompletion = true, AnalyzeOpenDocumentsOnly = true, - }, - }, + + }, cmd = { 'omnisharp', 'RoslynExtensionsOptions:EnableDecompilationSupport=true' }, }, -- }}} lua_ls = { -- {{{ settings = { Lua = { - workspace = { checkThirdParty = false, }, + workspace = { checkThirdParty = false }, telemetry = { enable = false }, - completion = { callSnippet = 'Replace', }, + completion = { callSnippet = 'Replace' }, }, }, }, -- }}} @@ -72,7 +72,7 @@ local server_configs = function() end) end, }, -- }}} - yamlls = require('yaml-companion').setup { + yamlls = require('schema-companion').setup_client { -- {{{ settings = { yaml = { @@ -397,11 +397,20 @@ return { { 'b0o/schemastore.nvim', lazy = true }, { 'Issafalcon/lsp-overloads.nvim', lazy = true }, { - 'vlada-dudr/yaml-companion.nvim', + 'cenk1cenk2/schema-companion.nvim', lazy = true, + config = function() + require('schema-companion').setup({ + enable_telescope = true, + matchers = { + require('schema-companion.matchers.kubernetes').setup({ version = 'master' }), + }, + }) + end, dependencies = { { 'neovim/nvim-lspconfig' }, { 'nvim-lua/plenary.nvim' }, + { 'nvim-telescope/telescope.nvim' }, }, }, } diff --git a/dot_config/nvim/lua/configs/packages/misc.lua b/dot_config/nvim/lua/configs/packages/misc.lua index c3a7cc6..e1dccbe 100644 --- a/dot_config/nvim/lua/configs/packages/misc.lua +++ b/dot_config/nvim/lua/configs/packages/misc.lua @@ -242,7 +242,6 @@ return { { 'chrisbra/csv.vim', ft = 'csv' }, { 'NoahTheDuke/vim-just' }, { 'towolf/vim-helm' }, - { 'pearofducks/ansible-vim' }, { 'grafana/vim-alloy' },