update plugins

lazy-lock.json

@@ -1,5 +1,5 @@
 {
-  "LuaSnip": { "branch": "master", "commit": "99a94cc35ec99bf06263d0346128e908a204575c" },
+  "LuaSnip": { "branch": "master", "commit": "409535b8fc54c650eb845b0c35e0cc7f08810284" },
   "asyncrun.vim": { "branch": "master", "commit": "0f99f96b1a408c37ea6f78e5990554328bc22dd1" },
   "bufresize.nvim": { "branch": "master", "commit": "3b19527ab936d6910484dcc20fb59bdb12322d8b" },
   "cellular-automaton.nvim": { "branch": "main", "commit": "679943b8e1e5ef79aaeeaf4b00782c52eb4e928f" },
@@ -9,15 +9,15 @@
   "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" },
-  "copilot.vim": { "branch": "release", "commit": "97a9f1af97627b6aebeef864c981539ac1776b69" },
+  "copilot.vim": { "branch": "release", "commit": "a24c3fd686ecf53b81d7d259994691508a69ebf6" },
   "flash.nvim": { "branch": "main", "commit": "967117690bd677cb7b6a87f0bc0077d2c0be3a27" },
   "focus.nvim": { "branch": "master", "commit": "31f41d91b6b331faa07f0a513adcbc37087d028d" },
-  "friendly-snippets": { "branch": "main", "commit": "bc38057e513458cb2486b6cd82d365fa294ee398" },
+  "friendly-snippets": { "branch": "main", "commit": "377d45475b49e37460a902d6d569d2093d4037d0" },
   "glow.nvim": { "branch": "main", "commit": "8942dfb05794f436af4fbc90a34393f1fd36f361" },
   "harpoon": { "branch": "master", "commit": "21f4c47c6803d64ddb934a5b314dcb1b8e7365dc" },
   "indent-blankline.nvim": { "branch": "master", "commit": "4541d690816cb99a7fc248f1486aa87f3abce91c" },
   "lazy.nvim": { "branch": "main", "commit": "3ad55ae678876516156cca2f361c51f7952a924b" },
-  "lsp-zero.nvim": { "branch": "v2.x", "commit": "96974fe970c37bd3879ad8b6be4fe7ddfad75680" },
+  "lsp-zero.nvim": { "branch": "v2.x", "commit": "5e440523701b4512298eef61ae96757bbefaac49" },
   "mason-lspconfig": { "branch": "main", "commit": "e86a4c84ff35240639643ffed56ee1c4d55f538e" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "e86a4c84ff35240639643ffed56ee1c4d55f538e" },
   "mason-null-ls.nvim": { "branch": "main", "commit": "ae0c5fa57468ac65617f1bf821ba0c3a1e251f0c" },
@@ -26,22 +26,22 @@
   "mini.comment": { "branch": "main", "commit": "877acea5b2a32ff55f808fc0ebe9aa898648318c" },
   "nabla.nvim": { "branch": "master", "commit": "8c143ad2b3ab3b8ffbd51e238ccfcbd246452a7e" },
   "neoconf.nvim": { "branch": "main", "commit": "08f146d53e075055500dca35e93281faff95716b" },
-  "neodev.nvim": { "branch": "main", "commit": "81a893eb94d502b2cbb08ed3871eeaadfd240131" },
+  "neodev.nvim": { "branch": "main", "commit": "f1f5f840fec7218bd277e7e88e7c539c305f649a" },
-  "neorg": { "branch": "main", "commit": "66e5a4e4ed7645590ac8388abdedb8f840b88f0d" },
+  "neorg": { "branch": "main", "commit": "f296a22864bbac0d94ad00fa18cc8231dbeaa1e3" },
   "neorg-telescope": { "branch": "main", "commit": "1310d4aaefd8149c9839bbe1d5610e94389e2f0e" },
-  "null-ls.nvim": { "branch": "main", "commit": "db09b6c691def0038c456551e4e2772186449f35" },
+  "null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" },
   "nvim-bqf": { "branch": "main", "commit": "c920a55c6153766bd909e474b7feffa9739f07e8" },
-  "nvim-cmp": { "branch": "main", "commit": "3b9f28061a67b19cadc13946de981426a6425e4a" },
+  "nvim-cmp": { "branch": "main", "commit": "51f1e11a89ec701221877532ee1a23557d291dd5" },
-  "nvim-lspconfig": { "branch": "master", "commit": "7c73a4dc44c3d62ee79ab9f03ba313251c0388d4" },
+  "nvim-lspconfig": { "branch": "master", "commit": "0d29cad8de3b2c654315203fc1fe12fde722a18a" },
   "nvim-spectre": { "branch": "master", "commit": "5b39919a2947b1266b3aa34d0b0b14c35523bc69" },
   "nvim-surround": { "branch": "main", "commit": "0d6882635817a2677749a330127d12ac30a4f3c8" },
-  "nvim-treesitter": { "branch": "master", "commit": "d92bfe2cbd86a9c10d814e38ecbe2fb7442da209" },
+  "nvim-treesitter": { "branch": "master", "commit": "922c396b2600653b8af12780077340768a0404fb" },
-  "nvim-treesitter-context": { "branch": "master", "commit": "3d4ab25056dcaf6dd11ebacf1da8525c8df6550f" },
+  "nvim-treesitter-context": { "branch": "master", "commit": "d8fd71428e02190d8f75ff915b6cca9e3063992c" },
   "nvim-treesitter-textobjects": { "branch": "master", "commit": "9e519b6146512c8e2e702faf8ac48420f4f5deec" },
   "nvim-ts-context-commentstring": { "branch": "main", "commit": "e9062e2dfb9854e6a927370f2d720de354c88524" },
-  "nvim-ufo": { "branch": "main", "commit": "5be5b800b4f3512bca128f345e9c98574b5637c0" },
+  "nvim-ufo": { "branch": "main", "commit": "aebd36bf5447862671356fcd5d4a8708ce6c9470" },
   "nvim-web-devicons": { "branch": "master", "commit": "ab899311f8ae00a47eae8e0879506cead8eb1561" },
-  "oil.nvim": { "branch": "master", "commit": "0e5fca35cdc743cf3a448cea1a6251cf25cebafa" },
+  "oil.nvim": { "branch": "master", "commit": "8f7807946a67b5f1a515946f82251e33651bae29" },
   "playground": { "branch": "master", "commit": "2b81a018a49f8e476341dfcb228b7b808baba68b" },
   "plenary.nvim": { "branch": "master", "commit": "267282a9ce242bbb0c5dc31445b6d353bed978bb" },
   "promise-async": { "branch": "main", "commit": "e94f35161b8c5d4a4ca3b6ff93dd073eb9214c0e" },

lua/rayandrew/plugins.lua

@@ -219,20 +219,24 @@ return {
           enable = true,
           set_jumps = true,
           goto_next_start = {
-            ["]m"] = "@function.outer",
+            ["]k"] = { query = "@block.outer", desc = "Next block start" },
-            ["]]"] = "@class.outer",
+            ["]f"] = { query = "@function.outer", desc = "Next function start" },
+            ["]a"] = { query = "@parameter.inner", desc = "Next parameter start" },
           },
           goto_next_end = {
-            ["]M"] = "@function.outer",
+            ["]K"] = { query = "@block.outer", desc = "Next block end" },
-            ["]["] = "@class.outer",
+            ["]F"] = { query = "@function.outer", desc = "Next function end" },
+            ["]A"] = { query = "@parameter.inner", desc = "Next parameter end" },
           },
           goto_previous_start = {
-            ["[m"] = "@function.outer",
+            ["[k"] = { query = "@block.outer", desc = "Previous block start" },
-            ["[["] = "@class.outer",
+            ["[f"] = { query = "@function.outer", desc = "Previous function start" },
+            ["[a"] = { query = "@parameter.inner", desc = "Previous parameter start" },
           },
           goto_previous_end = {
-            ["[M"] = "@function.outer",
+            ["[K"] = { query = "@block.outer", desc = "Previous block end" },
-            ["[]"] = "@class.outer",
+            ["[F"] = { query = "@function.outer", desc = "Previous function end" },
+            ["[A"] = { query = "@parameter.inner", desc = "Previous parameter end" },
           },
         },
         swap = {
@@ -313,7 +317,7 @@ return {
           if vim.bo.filetype == "oil" then
             return
           end
-          require("oil").open()
+          require("oil").open_float()
         end,
         desc = "Open current directory",
       },
@@ -328,12 +332,101 @@ return {
         end,
         desc = "Open current directory",
       },
+      -- {
+      --   "<leader>h",
+      --   function()
+      --     if vim.bo.filetype == "oil" then
+      --       local oil = require("oil")
+      --       oil.toggle_hidden()
+      --     end
+      --   end,
+      -- },
+      -- {
+      --   "t",
+      --   function()
+      --     if vim.bo.filetype == "oil" then
+      --       local oil = require("oil")
+      --       oil.select()
+      --     end
+      --   end,
+      -- },
+      -- {
+      --   "q",
+      --   function()
+      --     if vim.bo.filetype == "oil" then
+      --       local oil = require("oil")
+      --       oil.close()
+      --     end
+      --   end,
+      -- },
+      -- {
+      --   "<leader>i",
+      --   function()
+      --     if vim.bo.filetype == "oil" then
+      --       local oil = require("oil")
+      --       vim.g.oil_show_info = not vim.g.oil_show_info
+      --       if vim.g.oil_show_info then
+      --         oil.set_columns({
+      --           "permissions",
+      --           "size",
+      --           "mtime",
+      --         })
+      --       else
+      --         oil.set_columns({})
+      --       end
+      --       return
+      --     end
+      --   end,
+      -- },
     },
     opts = {
+      columns = {
+        -- "icon",
+        -- "permissions",
+        -- "size",
+        -- "mtime",
+      },
       default_file_explorer = true,
       restore_win_options = true,
+      float = {
+        padding = 2,
+        max_width = 240,
+        max_height = 70,
+        -- width = 0.2,
+        -- max_height = 0.5,
+        border = "rounded",
+        win_options = {
+          winblend = 10,
+        },
+      },
+      keymaps = {
+        ["<C-i>"] = {
+          callback = function()
+            if vim.bo.filetype == "oil" then
+              local oil = require("oil")
+              vim.g.oil_show_info = not vim.g.oil_show_info
+              if vim.g.oil_show_info then
+                oil.set_columns({
+                  "permissions",
+                  "size",
+                  "mtime",
+                  "icon",
+                })
+              else
+                oil.set_columns({})
+              end
+              return
+            end
+          end,
+          desc = "Toggle info",
+        },
+        ["q"] = "actions.close",
+        ["<C-h>"] = "actions.toggle_hidden",
+        ["?"] = "actions.show_help",
+      },
     },
     init = function()
+      vim.g.oil_show_info = false
       if vim.fn.argc() == 1 then
         local stat = vim.loop.fs_stat(vim.fn.argv(0))
         if stat and stat.type == "directory" then