1 files changed, 7 insertions, 4 deletions
diff --git a/lua/user/nvim-tree.lua b/lua/user/nvim-tree.lua
index c64c5e1..e23b560 100644
--- a/lua/user/nvim-tree.lua
+++ b/lua/user/nvim-tree.lua
@@ -42,7 +42,6 @@ nvim_tree.setup {
     "dashboard",
     "alpha",
   },
-  auto_close = true,
   open_on_tab = false,
   hijack_cursor = false,
   update_cwd = true,
@@ -94,13 +93,17 @@ nvim_tree.setup {
     number = false,
     relativenumber = false,
   },
-<<<<<<< HEAD
   trash = {
     cmd = "trash",
     require_confirm = true,
   },
-=======
->>>>>>> vgg
+  actions = {
+    open_file = {
+      quit_on_open = false,
+      window_picker = {
+        enable = false,
+      },
+    },
   quit_on_open = 0,
   git_hl = 1,
   disable_window_picker = 0,