From 9b2d36b767f71b531e770c21143718d77163e66e Mon Sep 17 00:00:00 2001 From: siduck76 Date: Thu, 1 Jul 2021 11:55:38 +0530 Subject: [PATCH] update nvimtree config and highlights --- lua/highlights.lua | 4 ++- lua/nvimTree.lua | 85 +++++++++++++++++++++++++--------------------- lua/statusline.lua | 10 +++--- 3 files changed, 55 insertions(+), 44 deletions(-) diff --git a/lua/highlights.lua b/lua/highlights.lua index 587cc8f..e276211 100644 --- a/lua/highlights.lua +++ b/lua/highlights.lua @@ -1,6 +1,6 @@ local cmd = vim.cmd -local global_theme = "themes/"..vim.g.nvchad_theme +local global_theme = "themes/" .. vim.g.nvchad_theme local colors = require(global_theme) local white = colors.white @@ -72,10 +72,12 @@ fg("NvimTreeEmptyFolderName", blue) fg("NvimTreeIndentMarker", one_bg2) fg("NvimTreeVertSplit", darker_black) bg("NvimTreeVertSplit", darker_black) +fg("NvimTreeEndOfBuffer", darker_black) fg("NvimTreeRootFolder", darker_black) bg("NvimTreeNormal", darker_black) fg_bg("NvimTreeStatuslineNc", darker_black, darker_black) +fg_bg("NvimTreeWindowPicker", red, black2) -- telescope fg("TelescopeBorder", line) diff --git a/lua/nvimTree.lua b/lua/nvimTree.lua index 5479b86..a866cb6 100644 --- a/lua/nvimTree.lua +++ b/lua/nvimTree.lua @@ -8,23 +8,30 @@ M.config = function() g.nvim_tree_side = "left" g.nvim_tree_width = 25 g.nvim_tree_ignore = {".git", "node_modules", ".cache"} + g.nvim_tree_gitignore = 1 + g.nvim_tree_auto_ignore_ft = {"dashboard"} -- don't open tree on specific fiypes. g.nvim_tree_auto_open = 0 - g.nvim_tree_auto_close = 0 - g.nvim_tree_quit_on_open = 0 + g.nvim_tree_auto_close = 0 -- closes tree when it's the last window + g.nvim_tree_quit_on_open = 0 -- closes tree when file's opened g.nvim_tree_follow = 1 g.nvim_tree_indent_markers = 1 g.nvim_tree_hide_dotfiles = 1 g.nvim_tree_git_hl = 1 + g.nvim_tree_highlight_opened_files = 0 g.nvim_tree_root_folder_modifier = ":t" g.nvim_tree_tab_open = 0 g.nvim_tree_allow_resize = 1 + g.nvim_tree_add_trailing = 0 -- append a trailing slash to folder names + g.nvim_tree_disable_netrw = 1 + g.nvim_tree_hijack_netrw = 0 + g.nvim_tree_update_cwd = 1 g.nvim_tree_show_icons = { git = 1, folders = 1, files = 1 + -- folder_arrows= 1 } - g.nvim_tree_icons = { default = "", symlink = "", @@ -38,50 +45,52 @@ M.config = function() ignored = "◌" }, folder = { + -- disable indent_markers option to get arrows working or if you want both arrows and indent then just add the arrow icons in front ofthe default and opened folders below! + -- arrow_open = "", + -- arrow_closed = "", default = "", open = "", - symlink = "", - empty = "", + empty = "", --  empty_open = "", - symlink_open = "" + symlink = "", + symlink_open = "" } } local tree_cb = require "nvim-tree.config".nvim_tree_callback g.nvim_tree_bindings = { - ["u"] = ":lua require'some_module'.some_function()", - -- default mappings - [""] = tree_cb("edit"), - ["o"] = tree_cb("edit"), - ["<2-LeftMouse>"] = tree_cb("edit"), - ["<2-RightMouse>"] = tree_cb("cd"), - [""] = tree_cb("cd"), - [""] = tree_cb("vsplit"), - [""] = tree_cb("split"), - [""] = tree_cb("tabnew"), - ["<"] = tree_cb("prev_sibling"), - [">"] = tree_cb("next_sibling"), - [""] = tree_cb("close_node"), - [""] = tree_cb("close_node"), - [""] = tree_cb("preview"), - ["I"] = tree_cb("toggle_ignored"), - ["H"] = tree_cb("toggle_dotfiles"), - ["R"] = tree_cb("refresh"), - ["a"] = tree_cb("create"), - ["d"] = tree_cb("remove"), - ["r"] = tree_cb("rename"), - [""] = tree_cb("full_rename"), - ["x"] = tree_cb("cut"), - ["c"] = tree_cb("copy"), - ["p"] = tree_cb("paste"), - ["y"] = tree_cb("copy_name"), - ["Y"] = tree_cb("copy_path"), - ["gy"] = tree_cb("copy_absolute_path"), - ["[c"] = tree_cb("prev_git_item"), - ["]c"] = tree_cb("next_git_item"), - ["-"] = tree_cb("dir_up"), - ["q"] = tree_cb("close") + {key = {"", "o", "<2-LeftMouse>"}, cb = tree_cb("edit")}, + {key = {"<2-RightMouse>", ""}, cb = tree_cb("cd")}, + {key = "", cb = tree_cb("vsplit")}, + {key = "", cb = tree_cb("split")}, + {key = "", cb = tree_cb("tabnew")}, + {key = "<", cb = tree_cb("prev_sibling")}, + {key = ">", cb = tree_cb("next_sibling")}, + {key = "P", cb = tree_cb("parent_node")}, + {key = "", cb = tree_cb("close_node")}, + {key = "", cb = tree_cb("close_node")}, + {key = "", cb = tree_cb("preview")}, + {key = "K", cb = tree_cb("first_sibling")}, + {key = "J", cb = tree_cb("last_sibling")}, + {key = "I", cb = tree_cb("toggle_ignored")}, + {key = "H", cb = tree_cb("toggle_dotfiles")}, + {key = "R", cb = tree_cb("refresh")}, + {key = "a", cb = tree_cb("create")}, + {key = "d", cb = tree_cb("remove")}, + {key = "r", cb = tree_cb("rename")}, + {key = "", cb = tree_cb("full_rename")}, + {key = "x", cb = tree_cb("cut")}, + {key = "c", cb = tree_cb("copy")}, + {key = "p", cb = tree_cb("paste")}, + {key = "y", cb = tree_cb("copy_name")}, + {key = "Y", cb = tree_cb("copy_path")}, + {key = "gy", cb = tree_cb("copy_absolute_path")}, + {key = "[c", cb = tree_cb("prev_git_item")}, + {key = "}c", cb = tree_cb("next_git_item")}, + {key = "-", cb = tree_cb("dir_up")}, + {key = "q", cb = tree_cb("close")}, + {key = "g?", cb = tree_cb("toggle_help")} } end diff --git a/lua/statusline.lua b/lua/statusline.lua index 717a8a0..ea45845 100644 --- a/lua/statusline.lua +++ b/lua/statusline.lua @@ -128,9 +128,9 @@ gls.right[2] = { return " " end, condition = require("galaxyline.condition").check_git_workspace, - highlight = {colors.grey_fg2, colors.lightbg}, - separator = "", - separator_highlight = {colors.lightbg, colors.statusline_bg} + highlight = {colors.grey_fg2, colors.statusline_bg}, + separator = " ", + separator_highlight = {colors.statusline_bg, colors.statusline_bg} } } @@ -138,7 +138,7 @@ gls.right[3] = { GitBranch = { provider = "GitBranch", condition = require("galaxyline.condition").check_git_workspace, - highlight = {colors.grey_fg2, colors.lightbg} + highlight = {colors.grey_fg2, colors.statusline_bg} } } @@ -149,7 +149,7 @@ gls.right[4] = { end, highlight = {colors.statusline_bg, colors.red}, separator = " ", - separator_highlight = {colors.red, colors.lightbg} + separator_highlight = {colors.red, colors.statusline_bg} } }