diff options
| -rw-r--r-- | README.md | 4 | ||||
| -rw-r--r-- | lua/lv-nvimtree/init.lua | 124 | ||||
| -rw-r--r-- | lua/plugins.lua | 2 |
3 files changed, 68 insertions, 62 deletions
@@ -116,9 +116,13 @@ cd ~/.config/nvim && git pull > "I have the processing power of a potato with 4 gb of ram and LunarVim runs perfectly." > - @juanCortelezzi, LunarVim user. +<<<<<<< HEAD + +======= <div align="center"> []() </div> +>>>>>>> 68bfac0468ea4d5d7faf5bede0a4ab8cb5572f0c diff --git a/lua/lv-nvimtree/init.lua b/lua/lv-nvimtree/init.lua index 1cc8a70f..97cfe033 100644 --- a/lua/lv-nvimtree/init.lua +++ b/lua/lv-nvimtree/init.lua @@ -3,70 +3,72 @@ -- --end -- local M = {} --- local status_ok, nvim_tree_config = pcall(require, "nvim-tree.config") --- if not status_ok then --- return --- end +local status_ok, nvim_tree_config = pcall(require, "nvim-tree.config") +if not status_ok then + return +end -- M.config = function() - -- local g = vim.g - -- - -- vim.o.termguicolors = true - -- - -- g.nvim_tree_side = "left" - -- g.nvim_tree_width = 30 - -- g.nvim_tree_ignore = { ".git", "node_modules", ".cache" } - -- g.nvim_tree_auto_open = 1 - -- g.nvim_tree_auto_close = 0 - -- g.nvim_tree_quit_on_open = 0 - -- 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_root_folder_modifier = ":t" - -- g.nvim_tree_tab_open = 0 - -- g.nvim_tree_allow_resize = 1 - -- g.nvim_tree_lsp_diagnostics = 1 - -- g.nvim_tree_auto_ignore_ft = { "startify", "dashboard" } - -- - -- g.nvim_tree_show_icons = { - -- git = 1, - -- folders = 1, - -- files = 1, - -- folder_arrows = 1, - -- } - -- - -- vim.g.nvim_tree_icons = { - -- default = "", - -- symlink = "", - -- git = { - -- unstaged = "", - -- staged = "S", - -- unmerged = "", - -- renamed = "➜", - -- deleted = "", - -- untracked = "U", - -- ignored = "◌", - -- }, - -- folder = { - -- default = "", - -- open = "", - -- empty = "", - -- empty_open = "", - -- symlink = "", - -- }, - -- } - -- local tree_cb = nvim_tree_config.nvim_tree_callback - -- - -- vim.g.nvim_tree_bindings = { - -- { key = { "l", "<CR>", "o" }, cb = tree_cb "edit" }, - -- { key = "h", cb = tree_cb "close_node" }, - -- { key = "v", cb = tree_cb "vsplit" }, - -- } + local g = vim.g + + vim.o.termguicolors = true + + g.nvim_tree_side = "left" + g.nvim_tree_width = 30 + g.nvim_tree_ignore = { ".git", "node_modules", ".cache" } + g.nvim_tree_auto_open = 1 + g.nvim_tree_auto_close = 0 + g.nvim_tree_quit_on_open = 0 + 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_root_folder_modifier = ":t" + g.nvim_tree_tab_open = 0 + g.nvim_tree_allow_resize = 1 + g.nvim_tree_lsp_diagnostics = 1 + g.nvim_tree_auto_ignore_ft = { "startify", "dashboard" } + + g.nvim_tree_show_icons = { + git = 1, + folders = 1, + files = 1, + folder_arrows = 1, + } + + vim.g.nvim_tree_icons = { + default = "", + symlink = "", + git = { + unstaged = "", + staged = "S", + unmerged = "", + renamed = "➜", + deleted = "", + untracked = "U", + ignored = "◌", + }, + folder = { + default = "", + open = "", + empty = "", + empty_open = "", + symlink = "", + }, + } + local tree_cb = nvim_tree_config.nvim_tree_callback + + vim.g.nvim_tree_bindings = { + { key = { "l", "<CR>", "o" }, cb = tree_cb "edit" }, + { key = "h", cb = tree_cb "close_node" }, + { key = "v", cb = tree_cb "vsplit" }, + } +end + +local view_status_ok, view = pcall(require, "nvim-tree.view") +if not view_status_ok then + return end --- -local view = require "nvim-tree.view" --- M.toggle_tree = function() if view.win_open() then require("nvim-tree").close() diff --git a/lua/plugins.lua b/lua/plugins.lua index c8491790..a637cba4 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -128,7 +128,7 @@ return require("packer").startup(function(use) -- Dashboard use { "ChristianChiarulli/dashboard-nvim", - -- event = "BufWinEnter", + event = "BufWinEnter", -- cmd = { "Dashboard", "DashboardNewFile", "DashboardJumpMarks" }, -- config = function() -- require("lv-dashboard").config() |