From 5c69d46dd671f7923bbde0eac20b4ab905ce882c Mon Sep 17 00:00:00 2001 From: siduck Date: Fri, 19 Nov 2021 07:17:09 +0530 Subject: [PATCH] rm unused config in nvimtree | include vim highlighting support by default --- lua/plugins/configs/nvimtree.lua | 17 +++++------------ lua/plugins/configs/treesitter.lua | 1 + lua/plugins/init.lua | 1 - 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/lua/plugins/configs/nvimtree.lua b/lua/plugins/configs/nvimtree.lua index e741d69..b4d3d17 100644 --- a/lua/plugins/configs/nvimtree.lua +++ b/lua/plugins/configs/nvimtree.lua @@ -7,17 +7,19 @@ end local g = vim.g -vim.o.termguicolors = true - g.nvim_tree_add_trailing = 0 -- append a trailing slash to folder names g.nvim_tree_git_hl = git_status g.nvim_tree_gitignore = 0 g.nvim_tree_highlight_opened_files = 0 g.nvim_tree_indent_markers = 1 -g.nvim_tree_ignore = { ".git", "node_modules", ".cache" } g.nvim_tree_quit_on_open = 0 -- closes tree when file's opened g.nvim_tree_root_folder_modifier = table.concat { ":t:gs?$?/..", string.rep(" ", 1000), "?:gs?^??" } +g.nvim_tree_window_picker_exclude = { + filetype = { "notify", "packer", "qf" }, + buftype = { "terminal" }, +} + g.nvim_tree_show_icons = { folders = 1, files = 1, @@ -47,15 +49,6 @@ g.nvim_tree_icons = { } nvimtree.setup { - diagnostics = { - enable = false, - icons = { - hint = "", - info = "", - warning = "", - error = "", - }, - }, filters = { dotfiles = false, }, diff --git a/lua/plugins/configs/treesitter.lua b/lua/plugins/configs/treesitter.lua index a9a7f49..6e65340 100644 --- a/lua/plugins/configs/treesitter.lua +++ b/lua/plugins/configs/treesitter.lua @@ -7,6 +7,7 @@ end ts_config.setup { ensure_installed = { "lua", + "vim", }, highlight = { enable = true, diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua index 5a7fa7b..bc1004a 100644 --- a/lua/plugins/init.lua +++ b/lua/plugins/init.lua @@ -68,7 +68,6 @@ return packer.startup(function() use { "nvim-treesitter/nvim-treesitter", - branch = "0.5-compat", event = "BufRead", config = override_req("nvim_treesitter", "plugins.configs.treesitter"), }