summaryrefslogtreecommitdiff
path: root/lua
diff options
context:
space:
mode:
Diffstat (limited to 'lua')
-rw-r--r--lua/user/lsp/settings/jsonls.lua17
-rw-r--r--lua/user/plugins.lua2
-rw-r--r--lua/user/treesitter.lua23
3 files changed, 20 insertions, 22 deletions
diff --git a/lua/user/lsp/settings/jsonls.lua b/lua/user/lsp/settings/jsonls.lua
index 1fffa68..8ee9544 100644
--- a/lua/user/lsp/settings/jsonls.lua
+++ b/lua/user/lsp/settings/jsonls.lua
@@ -1,9 +1,3 @@
-local default_schemas = nil
-local status_ok, jsonls_settings = pcall(require, "nlspsettings.jsonls")
-if status_ok then
- default_schemas = jsonls_settings.get_default_schemas()
-end
-
local schemas = {
{
description = "TypeScript compiler configuration file",
@@ -168,19 +162,10 @@ local schemas = {
},
}
-local function extend(tab1, tab2)
- for _, value in ipairs(tab2) do
- table.insert(tab1, value)
- end
- return tab1
-end
-
-local extended_schemas = extend(schemas, default_schemas)
-
local opts = {
settings = {
json = {
- schemas = extended_schemas,
+ schemas = schemas,
},
},
setup = {
diff --git a/lua/user/plugins.lua b/lua/user/plugins.lua
index af7dfb1..87dc269 100644
--- a/lua/user/plugins.lua
+++ b/lua/user/plugins.lua
@@ -74,6 +74,8 @@ return packer.startup(function(use)
"nvim-treesitter/nvim-treesitter",
run = ":TSUpdate",
}
+ use "p00f/nvim-ts-rainbow"
+ use "nvim-treesitter/playground"
-- Automatically set up your configuration after cloning packer.nvim
-- Put this at the end after all plugins
diff --git a/lua/user/treesitter.lua b/lua/user/treesitter.lua
index f00cc2d..7d45bd4 100644
--- a/lua/user/treesitter.lua
+++ b/lua/user/treesitter.lua
@@ -1,16 +1,27 @@
-local status_ok, configs = pcall(require, "nvim-treesitter.configs")
-if not status_ok then
- return
-end
+
+
+
+
+
+
+
+
+
+
+
+
+
+local configs = require("nvim-treesitter.configs")
configs.setup {
- ensure_installed = "maintained", -- one of "all", "maintained" (parsers with maintainers), or a list of languages
- sync_install = false, -- install languages synchronously (only applied to `ensure_installed`)
+ ensure_installed = "maintained",
+ sync_install = false,
ignore_install = { "" }, -- List of parsers to ignore installing
highlight = {
enable = true, -- false will disable the whole extension
disable = { "" }, -- list of language that will be disabled
additional_vim_regex_highlighting = true,
+
},
indent = { enable = true, disable = { "yaml" } },
}