update

- fix: keymap desc
- disable navbudy on nvim < 0.10
- add grug-far.nvim

Author: aceforeverd

lua/aceforeverd/integration/git.lua

@@ -36,41 +36,41 @@ function M.gitsigns()
         else
           gs.nav_hunk('next')
         end
-      end)
+      end, { desc = 'next hunk' })
 
       map('n', '[c', function()
         if vim.wo.diff then
           vim.cmd.normal({ '[c', bang = true })
         else
           gs.nav_hunk('prev')
         end
-      end)
+      end, { desc = 'previous hunk' })
 
       -- Actions
-      map('n', '<leader>hs', gs.stage_hunk)
-      map('n', '<leader>hr', gs.reset_hunk)
+      map('n', '<leader>hs', gs.stage_hunk, { desc = 'stage hunk' })
+      map('n', '<leader>hr', gs.reset_hunk, { desc = 'reset hunk' })
       map('v', '<leader>hs', function()
         gs.stage_hunk({ vim.fn.line('.'), vim.fn.line('v') })
-      end)
+      end, { desc = 'stage hunk' })
       map('v', '<leader>hr', function()
         gs.reset_hunk({ vim.fn.line('.'), vim.fn.line('v') })
-      end)
-      map('n', '<leader>hS', gs.stage_buffer)
-      map('n', '<leader>hu', gs.undo_stage_hunk)
-      map('n', '<leader>hR', gs.reset_buffer)
-      map('n', '<leader>hp', gs.preview_hunk)
+      end, { desc = 'reset hunk' })
+      map('n', '<leader>hS', gs.stage_buffer, { desc = 'stage buffer' })
+      map('n', '<leader>hu', gs.undo_stage_hunk, { desc = 'undo stage hunk' })
+      map('n', '<leader>hR', gs.reset_buffer, { desc = 'reset buffer' })
+      map('n', '<leader>hp', gs.preview_hunk, { desc = 'preview hunk' })
       map('n', '<leader>hb', function()
         gs.blame_line({ full = true })
-      end)
-      map('n', '<leader>tb', gs.toggle_current_line_blame)
-      map('n', '<leader>hd', gs.diffthis)
+      end, { desc = 'blame line' })
+      map('n', '<leader>tb', gs.toggle_current_line_blame, { desc = 'toggle line blame' })
+      map('n', '<leader>hd', gs.diffthis, { desc = 'diff buffer with HEAD' })
       map('n', '<leader>hD', function()
         gs.diffthis('~')
-      end)
-      map('n', '<leader>td', gs.toggle_deleted)
+      end, { desc = 'diff buffer with HEAD~' })
+      map('n', '<leader>td', gs.toggle_deleted, { desc = 'toggle deleted' })
 
       -- Text object
-      map({ 'o', 'x' }, 'ih', ':<C-U>Gitsigns select_hunk<CR>')
+      map({ 'o', 'x' }, 'ih', ':<C-U>Gitsigns select_hunk<CR>', { desc = 'select hunk' })
     end,
     diff_opts = { internal = true },
     numhl = true,

lua/aceforeverd/plugins/init.lua

@@ -90,8 +90,21 @@ M.plugin_list = {
       'MunifTanjim/nui.nvim',
     },
     opts = { lsp = { auto_attach = true } },
+    cond = function()
+      return vim.fn.has('nvim-0.10') == 1
+    end
   },
 
+  -- {
+  --   'Bekaboo/dropbar.nvim',
+  --   dependencies = {
+  --     'nvim-telescope/telescope-fzf-native.nvim'
+  --   },
+  --   cond = function()
+  --     return vim.fn.has('nvim-0.10') == 1
+  --   end
+  -- },
+
   {
     'nvim-lua/lsp-status.nvim',
     config = function()
@@ -1164,6 +1177,16 @@ M.plugin_list = {
       { "<leader>ry", function() require("rulebook").yankDiagnosticCode() end }
     }
   },
+
+    {
+    'MagicDuck/grug-far.nvim',
+    config = function()
+      require('grug-far').setup({
+        engine = 'ripgrep'
+      });
+    end
+  },
+
 }
 
 return M

lua/aceforeverd/util/map.lua

@@ -17,7 +17,7 @@
 local M = {}
 
 -- some mapping may not work for nvim < 0.7.0 due to can't map function-rhs
-local map_fn = vim.fn.has('nvim-0.7.0') == 1 and vim.keymap.set or vim.api.nvim_set_keymap
+local map_fn = vim.keymap.set
 
 --- create map based on a table
 ---@param map_list dict first level key should be vim mode name, e.g 'n', 'v'