Clean up nvimtree config

RhydianJenkins · Nov 18, 2023 · d521ea5 · d521ea5
1 parent afbdac1
commit d521ea5
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 59 deletions.
diff --git a/nvim/after/plugin/nvimtree.lua b/nvim/after/plugin/nvimtree.lua
@@ -7,64 +7,44 @@ end
 
 local on_attach = function(bufnr)
     local api = require("nvim-tree.api")
-    local opts = function(desc)
-        return { desc = "nvim-tree: " .. desc, buffer = bufnr, noremap = true, silent = true, nowait = true }
+    local map = function(key, fn, desc)
+        vim.keymap.set("n", key, fn, {
+            desc = "nvim-tree: " .. desc,
+            buffer = bufnr,
+            noremap = true,
+            silent = true,
+            nowait = true,
+        })
     end
 
-    -- vim.keymap.set("n", "<C-]>", api.tree.change_root_to_node, opts("CD"))
-    -- vim.keymap.set("n", "<C-e>", api.node.open.replace_tree_buffer, opts("Open: In Place"))
-    -- vim.keymap.set("n", "<C-k>", api.node.show_info_popup, opts("Info"))
-    -- vim.keymap.set("n", "<C-r>", api.fs.rename_sub, opts("Rename: Omit Filename"))
-    -- vim.keymap.set("n", "<C-t>", api.node.open.tab, opts("Open: New Tab"))
-    -- vim.keymap.set("n", "<C-v>", api.node.open.vertical, opts("Open: Vertical Split"))
-    -- vim.keymap.set("n", "<C-x>", api.node.open.horizontal, opts("Open: Horizontal Split"))
-    -- vim.keymap.set("n", ">", api.node.navigate.sibling.next, opts("Next Sibling"))
-    -- vim.keymap.set("n", "<", api.node.navigate.sibling.prev, opts("Previous Sibling"))
-    -- vim.keymap.set("n", ".", api.node.run.cmd, opts("Run Command"))
-    -- vim.keymap.set("n", "-", api.tree.change_root_to_parent, opts("Up"))
-    -- vim.keymap.set("n", "bmv", api.marks.bulk.move, opts("Move Bookmarked"))
-    -- vim.keymap.set("n", "B", api.tree.toggle_no_buffer_filter, opts("Toggle No Buffer"))
-    -- vim.keymap.set("n", "C", api.tree.toggle_git_clean_filter, opts("Toggle Git Clean"))
-    -- vim.keymap.set("n", "[c", api.node.navigate.git.prev, opts("Prev Git"))
-    -- vim.keymap.set("n", "]c", api.node.navigate.git.next, opts("Next Git"))
-    -- vim.keymap.set("n", "D", api.fs.trash, opts("Trash"))
-    -- vim.keymap.set("n", "]e", api.node.navigate.diagnostics.next, opts("Next Diagnostic"))
-    -- vim.keymap.set("n", "[e", api.node.navigate.diagnostics.prev, opts("Prev Diagnostic"))
-    -- vim.keymap.set("n", "F", api.live_filter.clear, opts("Clean Filter"))
-    -- vim.keymap.set("n", "f", api.live_filter.start, opts("Filter"))
-    -- vim.keymap.set("n", "m", api.marks.toggle, opts("Toggle Bookmark"))
-    -- vim.keymap.set("n", "s", api.node.run.system, opts("Run System"))
-    -- vim.keymap.set("n", "S", api.tree.search_node, opts("Search"))
-
-    vim.keymap.set("n", "<CR>", api.node.open.no_window_picker, opts("Open: No window Picker"))
-    vim.keymap.set("n", "<Tab>", api.node.open.preview, opts("Open Preview"))
-    vim.keymap.set("n", "<BS>", api.node.navigate.parent_close, opts("Close Directory"))
-    vim.keymap.set("n", "a", api.fs.create, opts("Create"))
-    vim.keymap.set("n", "c", api.fs.copy.node, opts("Copy"))
-    vim.keymap.set("n", "d", api.fs.remove, opts("Delete"))
-    vim.keymap.set("n", "E", api.tree.expand_all, opts("Expand All"))
-    vim.keymap.set("n", "e", api.fs.rename_basename, opts("Rename: Basename"))
-    vim.keymap.set("n", "?", api.tree.toggle_help, opts("Help"))
-    vim.keymap.set("n", "g?", api.tree.toggle_help, opts("Help"))
-    vim.keymap.set("n", "gy", api.fs.copy.absolute_path, opts("Copy Absolute Path"))
-    vim.keymap.set("n", "H", api.tree.toggle_hidden_filter, opts("Toggle Dotfiles"))
-    vim.keymap.set("n", "I", api.tree.toggle_gitignore_filter, opts("Toggle Git Ignore"))
-    vim.keymap.set("n", "J", api.node.navigate.sibling.last, opts("Last Sibling"))
-    vim.keymap.set("n", "K", api.node.navigate.sibling.first, opts("First Sibling"))
-    vim.keymap.set("n", "o", api.node.open.no_window_picker, opts("Open: No Window Picker"))
-    vim.keymap.set("n", "O", api.node.open.no_window_picker, opts("Open: No Window Picker"))
-    vim.keymap.set("n", "p", api.fs.paste, opts("Paste"))
-    vim.keymap.set("n", "P", api.node.navigate.parent, opts("Parent Directory"))
-    vim.keymap.set("n", "q", api.tree.close, opts("Close"))
-    vim.keymap.set("n", "r", api.fs.rename, opts("Rename"))
-    vim.keymap.set("n", "R", api.tree.reload, opts("Refresh"))
-    vim.keymap.set("n", "U", api.tree.toggle_custom_filter, opts("Toggle Hidden"))
-    vim.keymap.set("n", "W", api.tree.collapse_all, opts("Collapse"))
-    vim.keymap.set("n", "x", api.fs.cut, opts("Cut"))
-    vim.keymap.set("n", "y", api.fs.copy.filename, opts("Copy Name"))
-    vim.keymap.set("n", "Y", api.fs.copy.relative_path, opts("Copy Relative Path"))
-    vim.keymap.set("n", "<2-LeftMouse>", api.node.open.no_window_picker, opts("Open: No Window Picker"))
-    vim.keymap.set("n", "<2-RightMouse>", api.tree.change_root_to_node, opts("CD"))
+    map("<CR>", api.node.open.no_window_picker, "Open: No window Picker")
+    map("<Tab>", api.node.open.preview, "Open Preview")
+    map("<BS>", api.node.navigate.parent_close, "Close Directory")
+    map("a", api.fs.create, "Add/Create")
+    map("c", api.fs.copy.node, "Copy")
+    map("d", api.fs.remove, "Delete")
+    map("E", api.tree.expand_all, "Expand All")
+    map("e", api.fs.rename_basename, "Rename: Basename")
+    map("?", api.tree.toggle_help, "Help")
+    map("gy", api.fs.copy.absolute_path, "Copy Absolute Path")
+    map("H", api.tree.toggle_hidden_filter, "Toggle Dotfiles")
+    map("I", api.tree.toggle_gitignore_filter, "Toggle Git Ignore")
+    map("J", api.node.navigate.sibling.last, "Last Sibling")
+    map("K", api.node.navigate.sibling.first, "First Sibling")
+    map("o", api.node.open.no_window_picker, "Open: No Window Picker")
+    map("O", api.node.open.no_window_picker, "Open: No Window Picker")
+    map("p", api.fs.paste, "Paste")
+    map("P", api.node.navigate.parent, "Parent Directory")
+    map("q", api.tree.close, "Close")
+    map("r", api.fs.rename, "Rename")
+    map("R", api.tree.reload, "Refresh")
+    map("U", api.tree.toggle_custom_filter, "Toggle Hidden")
+    map("W", api.tree.collapse_all, "Collapse")
+    map("x", api.fs.cut, "Cut")
+    map("y", api.fs.copy.filename, "Copy Name")
+    map("Y", api.fs.copy.relative_path, "Copy Relative Path")
+    map("<2-LeftMouse>", api.node.open.no_window_picker, "Open: No Window Picker")
+    map("<2-RightMouse>", api.tree.change_root_to_node, "CD")
 end
 
 nvimtree.setup({

diff --git a/nvim/lua/rhydian/packer.lua b/nvim/lua/rhydian/packer.lua
@@ -22,9 +22,6 @@ return require("packer").startup(function(use)
 
     use({
         "nvim-tree/nvim-tree.lua",
-        config = function()
-            require("nvim-tree").setup({})
-        end,
         requires = {
             "nvim-tree/nvim-web-devicons",
         },