diff --git a/stowers/nvim/dot-config/nvim/after/plugin/lsp.lua b/stowers/nvim/dot-config/nvim/after/plugin/lsp.lua index be3bc3a..9bdda5e 100644 --- a/stowers/nvim/dot-config/nvim/after/plugin/lsp.lua +++ b/stowers/nvim/dot-config/nvim/after/plugin/lsp.lua @@ -1,25 +1,47 @@ local lsp = require("lsp-zero") lsp.on_attach(function(_client, bufnr) - lsp.default_keymaps({bufnr = bufnr}) + lsp.default_keymaps({bufnr = bufnr}) - vim.keymap.set("n", "cs", vim.lsp.buf.signature_help, {buffer = bufnr}) - vim.keymap.set("n", "cr", vim.lsp.buf.rename, {buffer = bufnr}) - vim.keymap.set("n", "ca", vim.lsp.buf.code_action, {buffer = bufnr}) - vim.keymap.set("n", "cf", vim.lsp.buf.format, {buffer = bufnr}) + vim.keymap.set("n", "cs", vim.lsp.buf.signature_help, {buffer = bufnr}) + vim.keymap.set("n", "cr", vim.lsp.buf.rename, {buffer = bufnr}) + vim.keymap.set("n", "ca", vim.lsp.buf.code_action, {buffer = bufnr}) + vim.keymap.set("n", "cf", vim.lsp.buf.format, {buffer = bufnr}) end) require("mason").setup({}) require("mason-lspconfig").setup({ - ensure_installed = {}, - handlers = { - lsp.default_setup, - }, + ensure_installed = {}, + handlers = { + lsp.default_setup, + }, }) +local lspconfig = require("lspconfig") +lspconfig.yamlls.setup { + settings = { + yaml = { + schemaStore = { + enable = false, + url = "", + }, + schemas = require("schemastore").yaml.schemas(), + }, + }, +} + +lspconfig.jsonls.setup { + settings = { + json = { + schemas = require("schemastore").json.schemas(), + validate = { enable = true, }, + }, + }, +} + local cmp = require("cmp") cmp.setup({ - mapping = cmp.mapping.preset.insert({ - [''] = cmp.mapping.confirm({select = false}), - }), + mapping = cmp.mapping.preset.insert({ + [''] = cmp.mapping.confirm({select = false}), + }), }) diff --git a/stowers/nvim/dot-config/nvim/lua/eyedevelop/packer.lua b/stowers/nvim/dot-config/nvim/lua/eyedevelop/packer.lua index 8ce2493..6e14ed1 100644 --- a/stowers/nvim/dot-config/nvim/lua/eyedevelop/packer.lua +++ b/stowers/nvim/dot-config/nvim/lua/eyedevelop/packer.lua @@ -64,6 +64,9 @@ return require("packer").startup(function(use) { "hrsh7th/nvim-cmp" }, { "hrsh7th/cmp-nvim-lsp" }, { "L3MON4D3/LuaSnip" }, + + -- Json/Yaml schemas + { "b0o/schemastore.nvim", branch = "main" }, } }