From 9ed1d49ae52b30fe93b853313d3b990059f97a02 Mon Sep 17 00:00:00 2001 From: Matt Leong Date: Fri, 29 Oct 2021 13:11:23 -0700 Subject: [PATCH] feat(config): add ability to add ensured_installed for treesitter --- lua/cosmic/config/config.lua | 17 ++++++++++++++++- lua/cosmic/config/init.lua | 12 ++++++++++++ lua/cosmic/core/treesitter/init.lua | 16 ++-------------- 3 files changed, 30 insertions(+), 15 deletions(-) diff --git a/lua/cosmic/config/config.lua b/lua/cosmic/config/config.lua index 4457f23..ca9991c 100644 --- a/lua/cosmic/config/config.lua +++ b/lua/cosmic/config/config.lua @@ -8,6 +8,19 @@ config.statusline = { main_icon = '★', } +config.treesitter = { + ensure_installed = { + 'typescript', + 'javascript', + 'tsx', + 'html', + 'css', + 'lua', + 'json', + 'scss', + }, +} + config.lsp = { -- true/false or table of filetypes {'.ts', '.js',} @@ -17,6 +30,7 @@ config.lsp = { rename_notification = false, diagnostic = { + -- disable diagnostic virtual text (see :h vim.diagnostic.config for all options) virtual_text = false, @@ -28,6 +42,7 @@ config.lsp = { -- disable underline for diagnostic underline = false, + }, servers = { @@ -36,7 +51,7 @@ config.lsp = { eslint = false, -- enable non-default servers, use default lsp config - -- check here for configs that will be used: https://github.com/williamboman/nvim-lsp-installer/tree/main/lua/nvim-lsp-installer/servers + -- check here for configs that will be used by default: https://github.com/williamboman/nvim-lsp-installer/tree/main/lua/nvim-lsp-installer/servers rust_analyzer = true, tsserver = { diff --git a/lua/cosmic/config/init.lua b/lua/cosmic/config/init.lua index efc8720..d80a8c9 100644 --- a/lua/cosmic/config/init.lua +++ b/lua/cosmic/config/init.lua @@ -15,6 +15,18 @@ local default_config = { statusline = { main_icon = require('cosmic.core.theme.icons').ghost, }, + treesitter = { + ensure_installed = { + 'typescript', + 'javascript', + 'tsx', + 'html', + 'css', + 'lua', + 'json', + 'scss', + }, + }, lsp = { format_on_save = true, -- true/false or table of filetypes {'.ts', '.js',} rename_notification = true, diff --git a/lua/cosmic/core/treesitter/init.lua b/lua/cosmic/core/treesitter/init.lua index 7f6f4c4..83abd5e 100644 --- a/lua/cosmic/core/treesitter/init.lua +++ b/lua/cosmic/core/treesitter/init.lua @@ -1,18 +1,6 @@ +local config = require('cosmic.config') require('nvim-treesitter.configs').setup({ - ensure_installed = { - 'typescript', - 'javascript', - 'tsx', - 'html', - 'css', - 'bash', - 'lua', - 'json', - 'python', - 'php', - 'scss', - 'go', - }, + ensure_installed = config.treesitter.ensure_installed, highlight = { enable = true, use_languagetree = true,