refactor(nvim-tree): update settings structure (#2304)

3 files changed, 49 insertions, 28 deletions

diff --git a/lua/lvim/core/nvimtree.lua b/lua/lvim/core/nvimtree.lua
index 17b8f36a..8e40bb8c 100644
--- a/lua/lvim/core/nvimtree.lua
+++ b/lua/lvim/core/nvimtree.lua
@@ -14,6 +14,12 @@ function M.config()
         "dashboard",
         "alpha",
       },
+      auto_reload_on_write = true,
+      hijack_unnamed_buffer_when_opening = false,
+      hijack_directories = {
+        enable = true,
+        auto_open = true,
+      },
       update_to_buf_dir = {
         enable = true,
         auto_open = true,
@@ -67,17 +73,27 @@ function M.config()
         cmd = "trash",
         require_confirm = true,
       },
+      actions = {
+        change_dir = {
+          global = false,
+        },
+        open_file = {
+          quit_on_open = false,
+        },
+        window_picker = {
+          enable = false,
+          chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890",
+          exclude = {},
+        },
+      },
     },
     show_icons = {
       git = 1,
       folders = 1,
       files = 1,
       folder_arrows = 1,
-      tree_width = 30,
     },
-    quit_on_open = 0,
     git_hl = 1,
-    disable_window_picker = 0,
     root_folder_modifier = ":t",
     icons = {
       default = "",
@@ -118,21 +134,25 @@ function M.setup()
   if lvim.builtin.project.active then
     lvim.builtin.nvimtree.respect_buf_cwd = 1
     lvim.builtin.nvimtree.setup.update_cwd = true
-    lvim.builtin.nvimtree.setup.disable_netrw = false
-    lvim.builtin.nvimtree.setup.hijack_netrw = false
-    vim.g.netrw_banner = false
+    lvim.builtin.nvimtree.setup.update_focused_file = { enable = true, update_cwd = true }
+  end
+
+  local function telescope_find_files(_)
+    require("lvim.core.nvimtree").start_telescope "find_files"
+  end
+  local function telescope_live_grep(_)
+    require("lvim.core.nvimtree").start_telescope "live_grep"
   end
 
   -- Add useful keymaps
-  local tree_cb = nvim_tree_config.nvim_tree_callback
   if #lvim.builtin.nvimtree.setup.view.mappings.list == 0 then
     lvim.builtin.nvimtree.setup.view.mappings.list = {
-      { key = { "l", "<CR>", "o" }, cb = tree_cb "edit" },
-      { key = "h", cb = tree_cb "close_node" },
-      { key = "v", cb = tree_cb "vsplit" },
-      { key = "C", cb = tree_cb "cd" },
-      { key = "gtf", cb = "<cmd>lua require'lvim.core.nvimtree'.start_telescope('find_files')<cr>" },
-      { key = "gtg", cb = "<cmd>lua require'lvim.core.nvimtree'.start_telescope('live_grep')<cr>" },
+      { key = { "l", "<CR>", "o" }, action = "edit", mode = "n" },
+      { key = "h", action = "close_node" },
+      { key = "v", action = "vsplit" },
+      { key = "C", action = "cd" },
+      { key = "gtf", action = "telescope_find_files", action_cb = telescope_find_files },
+      { key = "gtg", action = "telescope_live_grep", action_cb = telescope_live_grep },
     }
   end
 
diff --git a/lua/lvim/lsp/config.lua b/lua/lvim/lsp/config.lua
index 4feb64a9..72a1941f 100644
--- a/lua/lvim/lsp/config.lua
+++ b/lua/lvim/lsp/config.lua
@@ -78,6 +78,7 @@ return {
     "graphql",
     "jedi_language_server",
     "ltex",
+    "ocamllsp",
     "phpactor",
     "psalm",
     "pylsp",
diff --git a/lua/lvim/plugins.lua b/lua/lvim/plugins.lua
index f4c2b05a..5c465379 100644
--- a/lua/lvim/plugins.lua
+++ b/lua/lvim/plugins.lua
@@ -1,6 +1,6 @@
 local commit = {
   bufferline = "e97a404bd7449ecebab243c796c1016c98397fc0",
-  cmp_buffer = "f83773e2f433a923997c5faad7ea689ec24d1785",
+  cmp_buffer = "d66c4c2d376e5be99db68d2362cd94d250987525",
   cmp_luasnip = "d6f837f4e8fe48eeae288e638691b91b97d1737f",
   cmp_nvim_lsp = "ebdfc204afb87f15ce3d3d3f5df0b8181443b5ba",
   cmp_path = "466b6b8270f7ba89abd59f402c73f63c7331ff6e",
@@ -11,29 +11,29 @@ local commit = {
   friendly_snippets = "2e575549910571ff5abb6b02178c69ad760a4e00",
   gitsigns = "1d1f043acf025f919b8dd12bb672569109c7f099",
   lua_dev = "a0ee77789d9948adce64d98700cc90cecaef88d5",
-  lualine = "40849728b6c9b3389c7b54739f426f9899b53778",
-  luasnip = "c1d07078dce0c9631e89a299e4b4a93334650a7b",
-  nlsp_settings = "80cb4d3051366afb019ddabe619b6eb967c82f63",
-  null_ls = "3059dc761b27c4c836f88879c460cd7a989caa47",
+  lualine = "016a20711ee595a11426f9c1f4ab3e04967df553",
+  luasnip = "8f2480d7a8c23c164429f2e4b487f28fc9a72d4b",
+  nlsp_settings = "a3f9d3451913b909d0ce61987b91c9c74e1a56f9",
+  null_ls = "ae1edec262c11964d45188b56af19135c5e38c89",
   nvim_autopairs = "784398a8f184431fd4329f20b0e4f52e87707bbd",
   nvim_cmp = "13d64460cba64950aff41e230cc801225bd9a3e2",
   nvim_dap = "9fcff6e02e1a549d47a2c559a4b833798537c0bc",
-  nvim_lsp_installer = "c95ffd31428da0abaffa2459c0231fa9971fcbaa",
-  nvim_lspconfig = "19a21d5a8681f721c584125a920d4cbeda1c80cc",
-  nvim_notify = "8038d04d5371e49cf15728ae98cc6bff655b923b",
-  nvim_tree = "2e1f82d8c0c57cbc2bfdc041a3aff26947559a1e",
-  nvim_treesitter = "2298a7584414af40a6a09cbe72a81175382992c7",
+  nvim_lsp_installer = "43661e1485311102cabfb3afcd35cce54bae009f",
+  nvim_lspconfig = "ec7119b166b16e681f663fcbf16b7139b38172ae",
+  nvim_notify = "57093e9f3749c57f20f49d7e10be9c7d15018c86",
+  nvim_tree = "3486c48225265792842545e90dc041e5a214686d",
+  nvim_treesitter = "3533721282669e945b62b3ae9c53d4c5ffe16c76",
   nvim_ts_context_commentstring = "097df33c9ef5bbd3828105e4bee99965b758dc3f",
-  nvim_web_devicons = "e3294f687626b40754bb40ac2d636d166098b2fb",
+  nvim_web_devicons = "4415d1aaa56f73b9c05795af84d625c610b05d3b",
   packer = "963cb58c3dd15699c801baf3e64393c6795b62e9",
-  plenary = "66472128c3191b786966798fc956a689705ab1be",
+  plenary = "2a278c8a12a399e25b78a43ebcd4f3996cd4e4b6",
   popup = "b7404d35d5d3548a82149238289fa71f7f6de4ac",
   project = "cef52b8da07648b750d7f1e8fb93f12cb9482988",
-  schemastore = "c0c11c832fa812174cd196c723b97c493f528b5c",
+  schemastore = "45761cc7f76abc543e614e2fafa1ea146f4313bb",
   structlog = "6f1403a192791ff1fa7ac845a73de9e860f781f1",
   telescope = "df0b35c8bc0944164828ccba8ea17941423c6725",
-  telescope_fzf_native = "b8662b076175e75e6497c59f3e2799b879d7b954",
-  toggleterm = "f9845199f1d647890ca47f6185f7ac935991b442",
+  telescope_fzf_native = "8ec164b541327202e5e74f99bcc5fe5845720e18",
+  toggleterm = "981e207e17ecd8bf065b5b9201c1d6d2395e9338",
   which_key = "28d2bd129575b5e9ebddd88506601290bb2bb221",
 }