fix(nvimtree): update settings (#2001)

4 files changed, 53 insertions, 20 deletions

diff --git a/lua/lvim/core/nvimtree.lua b/lua/lvim/core/nvimtree.lua
index 1fc93aea..7be9c421 100644
--- a/lua/lvim/core/nvimtree.lua
+++ b/lua/lvim/core/nvimtree.lua
@@ -6,12 +6,22 @@ function M.config()
     active = true,
     on_config_done = nil,
     setup = {
+      disable_netrw = true,
+      hijack_netrw = true,
       open_on_setup = false,
-      auto_close = true,
-      open_on_tab = false,
-      update_focused_file = {
+      ignore_ft_on_setup = {
+        "startify",
+        "dashboard",
+        "alpha",
+      },
+      update_to_buf_dir = {
         enable = true,
+        auto_open = true,
       },
+      auto_close = true,
+      open_on_tab = false,
+      hijack_cursor = false,
+      update_cwd = false,
       diagnostics = {
         enable = true,
         icons = {
@@ -21,16 +31,36 @@ function M.config()
           error = "",
         },
       },
+      update_focused_file = {
+        enable = true,
+        update_cwd = true,
+        ignore_list = {},
+      },
+      system_open = {
+        cmd = nil,
+        args = {},
+      },
+      git = {
+        enable = true,
+        ignore = true,
+        timeout = 200,
+      },
       view = {
         width = 30,
+        height = 30,
         side = "left",
         auto_resize = true,
+        number = false,
+        relativenumber = false,
         mappings = {
           custom_only = false,
+          list = {},
         },
       },
-      hide_dotfiles = false,
-      ignore = { ".git", "node_modules", ".cache" },
+      filters = {
+        dotfiles = false,
+        custom = { ".git", "node_modules", ".cache" },
+      },
     },
     show_icons = {
       git = 1,
@@ -41,9 +71,8 @@ function M.config()
     },
     quit_on_open = 0,
     git_hl = 1,
+    disable_window_picker = 0,
     root_folder_modifier = ":t",
-    allow_resize = 1,
-    auto_ignore_ft = { "startify", "dashboard" },
     icons = {
       default = "",
       symlink = "",
diff --git a/lua/lvim/core/which-key.lua b/lua/lvim/core/which-key.lua
index 7bb0f00e..88af028f 100644
--- a/lua/lvim/core/which-key.lua
+++ b/lua/lvim/core/which-key.lua
@@ -61,7 +61,7 @@ M.config = function()
     -- NOTE: Prefer using : over <cmd> as the latter avoids going back in normal-mode.
     -- see https://neovim.io/doc/user/map.html#:map-cmd
     vmappings = {
-      ["/"] = { "<ESC><CMD>lua ___comment_gc(vim.fn.visualmode())<CR>", "Comment" },
+      ["/"] = { "<ESC><CMD>lua require('Comment.api').gc(vim.fn.visualmode())<CR>", "Comment" },
     },
     mappings = {
       ["w"] = { "<cmd>w!<CR>", "Save" },
diff --git a/lua/lvim/plugins.lua b/lua/lvim/plugins.lua
index 14691272..5b3701c3 100644
--- a/lua/lvim/plugins.lua
+++ b/lua/lvim/plugins.lua
@@ -4,24 +4,24 @@ local commit = {
   cmp_luasnip = "16832bb50e760223a403ffa3042859845dd9ef9d",
   cmp_nvim_lsp = "134117299ff9e34adde30a735cd8ca9cf8f3db81",
   cmp_nvim_lua = "d276254e7198ab7d00f117e88e223b4bd8c02d21",
-  cmp_path = "81518cf6ae29f5f0c79cd47770ae90ff5225ee13",
+  cmp_path = "4fe14cf56288200614950fe57525ac6340f49d5a",
   comment = "a6e1c127fa7f19ec4e3edbffab1aacb2852b6db3",
   dapinstall = "dd09e9dd3a6e29f02ac171515b8a089fb82bb425",
   fixcursorhold = "0e4e22d21975da60b0fd2d302285b3b603f9f71e",
   friendly_snippets = "0806607c4c49b6823cf4155cf0c30bc28934dea2",
   gitsigns = "95845ef39ce0a98f68cdfdcf7dd586c5e965acc7",
-  lualine = "cf75e1af5a1cafaa0866cf8a11632f48b430115d",
-  luasnip = "f400b978b1dbca96e9e190b7009c415c09b8924c",
+  lualine = "1ae4f0aa74f0b34222c5ef3281b34602a76b2b00",
+  luasnip = "e63b58600f91681f744fc180ae13ce2800b5e29a",
   nlsp_settings = "1e75ac7733f6492b501a7594870cf75c4ee23e81",
   null_ls = "b07ce47f02c7b12ad65bfb4da215c6380228a959",
   nvim_autopairs = "fba2503bd8cd0d8861054523aae39c4ac0680c07",
   nvim_cmp = "092fb66b6ddb4b12b9b542d105d7af40e4fbd9f2",
   nvim_dap = "4e8bb7ca12dc8ca6f7a500cbb4ecea185665c7f1",
-  nvim_lsp_installer = "52183c68baf9019c8241b1abf33ba0b6594ab3c8",
-  nvim_lspconfig = "b53f89c16bcc8052aa56d3a903fcad3aaa774041",
-  nvim_notify = "54375b724637eb6f29085c582318ae1fd042e717",
-  nvim_tree = "5d8453dfbd34ab00cb3e8ce39660f9a54cdd35f3",
-  nvim_treesitter = "47cfda2c6711077625c90902d7722238a8294982",
+  nvim_lsp_installer = "f5734a4a64d0c220e59ee53b80756224e93a0236",
+  nvim_lspconfig = "d9aa848da3905e0f8153e546d7b630d3d13e0435",
+  nvim_notify = "9ac4202ed3c5afa92498b83dd28dcde19576ab1f",
+  nvim_tree = "e842f088847c98da59e14eb543bde11c45c87ef7",
+  nvim_treesitter = "678a7857911f20cc9445aa13d28c454ae72483f5",
   nvim_ts_context_commentstring = "9f5e422e1030e7073e593ad32c5354aa0bcb0176",
   nvim_web_devicons = "8df4988ecf8599fc1f8f387bbf2eae790e4c5ffb",
   packer = "7f62848f3a92eac61ae61def5f59ddb5e2cc6823",
@@ -29,7 +29,7 @@ local commit = {
   popup = "b7404d35d5d3548a82149238289fa71f7f6de4ac",
   project = "71d0e23dcfc43cfd6bb2a97dc5a7de1ab47a6538",
   structlog = "6f1403a192791ff1fa7ac845a73de9e860f781f1",
-  telescope = "b415e862bf248d66c40e242de4a0c76c68e278f1",
+  telescope = "ed4adba6d0083a14cabf5837f2511b2617a45593",
   telescope_fzf_native = "b8662b076175e75e6497c59f3e2799b879d7b954",
   toggleterm = "265bbff68fbb8b2a5fb011272ec469850254ec9f",
   which_key = "d3032b6d3e0adb667975170f626cb693bfc66baa",
diff --git a/lua/lvim/utils/init.lua b/lua/lvim/utils/init.lua
index d7affd4b..8c0ad036 100644
--- a/lua/lvim/utils/init.lua
+++ b/lua/lvim/utils/init.lua
@@ -193,12 +193,16 @@ function utils.generate_plugins_sha(output)
     return ret, stdout
   end
 
-  for name, plugin in pairs(_G.packer_plugins) do
-    local retval, latest_sha = git_cmd { "-C", plugin.path, "rev-parse", "@{-1}" }
+  local core_plugins = require "lvim.plugins"
+  for _, plugin in pairs(core_plugins) do
+    local name = plugin[1]:match "/(%S*)"
+    local url = "https://github.com/" .. plugin[1]
+    print("checking: " .. name .. ", at: " .. url)
+    local retval, latest_sha = git_cmd { "ls-remote", url, "origin", "HEAD" }
     if retval == 0 then
       -- replace dashes, remove postfixes and use lowercase
       local normalize_name = (name:gsub("-", "_"):gsub("%.%S+", "")):lower()
-      list[normalize_name] = latest_sha[1]
+      list[normalize_name] = latest_sha[1]:gsub("\tHEAD", "")
     end
   end
   utils.write_file(output, "local commits = " .. vim.inspect(list), "w")