diff options
4 files changed, 30 insertions, 9 deletions
diff --git a/nvim/.config/nvim/lua/tobyvin/lsp/configs.lua b/nvim/.config/nvim/lua/tobyvin/lsp/configs.lua index 4179ca5..59d0b7d 100644 --- a/nvim/.config/nvim/lua/tobyvin/lsp/configs.lua +++ b/nvim/.config/nvim/lua/tobyvin/lsp/configs.lua @@ -1,4 +1,4 @@ -local configs = { +local M = { bashls = {}, taplo = {}, yamlls = {}, @@ -10,7 +10,18 @@ local configs = { pylsp = {}, } -configs.gopls = { +M.jsonls = { + settings = { + json = { + format = { + enable = true, + }, + validate = { enable = true }, + }, + }, +} + +M.gopls = { cmd = { "gopls", "serve" }, settings = { gopls = { @@ -22,7 +33,7 @@ configs.gopls = { }, } -configs.rust_analyzer = { +M.rust_analyzer = { standalone = true, settings = { ["rust-analyzer"] = { @@ -41,7 +52,7 @@ configs.rust_analyzer = { }, } -configs.sumneko_lua = { +M.sumneko_lua = { settings = { Lua = { completion = { @@ -60,7 +71,7 @@ configs.sumneko_lua = { }, } -configs.texlab = { +M.texlab = { settings = { texlab = { build = { @@ -92,4 +103,4 @@ configs.texlab = { end, } -return configs +return M diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/lspconfig.lua b/nvim/.config/nvim/lua/tobyvin/plugins/lspconfig.lua index 681a3cf..22e9e65 100644 --- a/nvim/.config/nvim/lua/tobyvin/plugins/lspconfig.lua +++ b/nvim/.config/nvim/lua/tobyvin/plugins/lspconfig.lua @@ -4,7 +4,6 @@ local M = { dependencies = { "folke/neodev.nvim", "hrsh7th/cmp-nvim-lsp", - "b0o/SchemaStore.nvim", }, } diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/null-ls.lua b/nvim/.config/nvim/lua/tobyvin/plugins/null-ls.lua index fc64b50..9bbbaa5 100644 --- a/nvim/.config/nvim/lua/tobyvin/plugins/null-ls.lua +++ b/nvim/.config/nvim/lua/tobyvin/plugins/null-ls.lua @@ -17,10 +17,9 @@ function M.config() -- null_ls.builtins.code_actions.gitsigns, null_ls.builtins.code_actions.gitrebase, null_ls.builtins.code_actions.shellcheck, - null_ls.builtins.diagnostics.markdownlint, - null_ls.builtins.formatting.prettier.with({ + disabled_filetypes = { "json", "jsonc" }, extra_args = { "--prose-wrap=always" }, }), null_ls.builtins.formatting.black, diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/schemastore.lua b/nvim/.config/nvim/lua/tobyvin/plugins/schemastore.lua new file mode 100644 index 0000000..0103a6c --- /dev/null +++ b/nvim/.config/nvim/lua/tobyvin/plugins/schemastore.lua @@ -0,0 +1,12 @@ +local M = { + "b0o/SchemaStore.nvim", +} + +function M.init() + require("tobyvin.lsp.configs").jsonls.on_new_config = function(new_config) + new_config.settings.json.schemas = new_config.settings.json.schemas or {} + vim.list_extend(new_config.settings.json.schemas, require("schemastore").json.schemas()) + end +end + +return M |