Merge branch '13-bufferline.lua' into vgg

1 files changed, 15 insertions, 0 deletions

diff --git a/lua/user/nvim-tree.lua b/lua/user/nvim-tree.lua
index e80e04b..c64c5e1 100644
--- a/lua/user/nvim-tree.lua
+++ b/lua/user/nvim-tree.lua
@@ -64,6 +64,14 @@ nvim_tree.setup {
     update_cwd = true,
     ignore_list = {},
   },
+  system_open = {
+    cmd = nil,
+    args = {},
+  },
+  filters = {
+    dotfiles = false,
+    custom = {},
+  },
   git = {
     enable = true,
     ignore = true,
@@ -86,6 +94,13 @@ nvim_tree.setup {
     number = false,
     relativenumber = false,
   },
+<<<<<<< HEAD
+  trash = {
+    cmd = "trash",
+    require_confirm = true,
+  },
+=======
+>>>>>>> vgg
   quit_on_open = 0,
   git_hl = 1,
   disable_window_picker = 0,