#1050 #1068 various default options tweaks (#1074)

lua/nvim-tree.lua

@@ -334,7 +334,7 @@ local function setup_autocommands(opts)
   vim.cmd "augroup end"
 end
 
-local DEFAULT_OPTS = {
+local DEFAULT_OPTS = { -- BEGIN_DEFAULT_OPTS
   auto_close = false,
   auto_reload_on_write = true,
   disable_netrw = false,
@@ -347,6 +347,21 @@ local DEFAULT_OPTS = {
   open_on_tab = false,
   sort_by = "name",
   update_cwd = false,
+  view = {
+    width = 30,
+    height = 30,
+    side = "left",
+    preserve_window_proportions = false,
+    number = false,
+    relativenumber = false,
+    signcolumn = "yes",
+    mappings = {
+      custom_only = false,
+      list = {
+        -- user mappings go here
+      },
+    },
+  },
   hijack_directories = {
     enable = true,
     auto_open = true,
@@ -391,9 +406,18 @@ local DEFAULT_OPTS = {
       resize_window = false,
       window_picker = {
         enable = true,
+        chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890",
+        exclude = {
+          filetype = { "notify", "packer", "qf", "diff", "fugitive", "fugitiveblame" },
+          buftype = { "nofile", "terminal", "help" },
+        },
       },
     },
   },
+  trash = {
+    cmd = "trash",
+    require_confirm = true,
+  },
   log = {
     enable = false,
     truncate = false,
@@ -403,7 +427,7 @@ local DEFAULT_OPTS = {
       git = false,
     },
   },
-}
+} -- END_DEFAULT_OPTS
 
 local function merge_options(conf)
   if conf and conf.update_to_buf_dir then

lua/nvim-tree/actions/open-file.lua

@@ -4,18 +4,7 @@ local lib = require "nvim-tree.lib"
 local utils = require "nvim-tree.utils"
 local view = require "nvim-tree.view"
 
-local M = {
-  quit_on_open = false,
-  resize_window = false,
-  window_picker = {
-    enable = true,
-    chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890",
-    exclude = {
-      filetype = { "notify", "packer", "qf", "diff", "fugitive", "fugitiveblame" },
-      buftype = { "nofile", "terminal", "help" },
-    },
-  },
-}
+local M = {}
 
 local function get_split_cmd()
   local side = view.View.side
@@ -235,7 +224,7 @@ function M.setup(opts)
   if opts.actions.open_file.window_picker.chars then
     opts.actions.open_file.window_picker.chars = tostring(opts.actions.open_file.window_picker.chars):upper()
   end
-  M.window_picker = vim.tbl_extend("force", M.window_picker, opts.actions.open_file.window_picker)
+  M.window_picker = opts.actions.open_file.window_picker
 end
 
 return M

lua/nvim-tree/view.lua

@@ -348,18 +348,8 @@ function M.is_root_folder_visible()
   return core.get_cwd() ~= "/" and not M.View.hide_root_folder
 end
 
-local DEFAULT_CONFIG = {
-  width = 30,
-  height = 30,
-  side = "left",
-  preserve_window_proportions = false,
-  number = false,
-  relativenumber = false,
-  signcolumn = "yes",
-}
-
 function M.setup(opts)
-  local options = vim.tbl_deep_extend("force", DEFAULT_CONFIG, opts.view or {})
+  local options = opts.view or {}
   M.View.side = options.side
   M.View.width = options.width
   M.View.height = options.height