diff --git a/dots/.nvim-environments/primary/config/after/ftplugin/json.lua b/dots/.nvim-environments/primary/config/after/ftplugin/json.lua new file mode 100644 index 00000000..c7b84cb5 --- /dev/null +++ b/dots/.nvim-environments/primary/config/after/ftplugin/json.lua @@ -0,0 +1,4 @@ +local opt_local = vim.opt_local + +opt_local.tabstop = 2 +opt_local.shiftwidth = 2 diff --git a/dots/.nvim-environments/primary/config/lua/plugins/configs/lsp.lua b/dots/.nvim-environments/primary/config/lua/plugins/configs/lsp.lua index 2750c2e0..e0b7fbcf 100755 --- a/dots/.nvim-environments/primary/config/lua/plugins/configs/lsp.lua +++ b/dots/.nvim-environments/primary/config/lua/plugins/configs/lsp.lua @@ -266,12 +266,18 @@ lspconfig.omnisharp.setup({ on_attach = on_attach, }) -lspconfig.bashls.setup({}) +lspconfig.jsonls.setup({ + settings = { + schemas = require("schemastore").json.schemas(), + validate = { enable = true }, + }, +}) -- NOTE: GENERIC LSP SERVERS for _, server in ipairs({ "clangd", "cmake", + "bashls", "dockerls", "eslint", "html", @@ -284,7 +290,6 @@ for _, server in ipairs({ "vimls", "vuels", "tsserver", - "jsonls", "pyright", "rnix", "marksman", diff --git a/dots/.nvim-environments/primary/config/lua/plugins/plugins.lua b/dots/.nvim-environments/primary/config/lua/plugins/plugins.lua index f5807530..7276c45d 100755 --- a/dots/.nvim-environments/primary/config/lua/plugins/plugins.lua +++ b/dots/.nvim-environments/primary/config/lua/plugins/plugins.lua @@ -316,6 +316,7 @@ return packer.startup({ "williamboman/mason.nvim", "simrat39/rust-tools.nvim", "Hoffs/omnisharp-extended-lsp.nvim", + "b0o/schemastore.nvim", }, config = function() require("mason").setup({})