3 files changed, 28 insertions, 16 deletions
diff --git a/lua/config/hlslens.lua b/lua/config/hlslens.lua
index dba9dc7..cd03af0 100644
--- a/lua/config/hlslens.lua
+++ b/lua/config/hlslens.lua
@@ -3,19 +3,25 @@ require('hlslens').setup({
     nearest_only = true,
 })
 
-vim.api.nvim_set_keymap(
-  "n",
-  "n",
-  "<Cmd>execute('normal! ' . v:count1 . 'nzzzv')<CR><Cmd>lua require('hlslens').start()<CR>",
-  { noremap = true, silent = true }
-)
+vim.keymap.set('n', 'n', '',
+{
+  noremap = true,
+  silent = true,
+  callback = function()
+    vim.fn.execute("normal! " .. vim.v.count1 .. "nzzzv")
+    require('hlslens').start()
+  end
+})
 
-vim.api.nvim_set_keymap(
-  "n",
-  "N",
-  "<Cmd>execute('normal! ' . v:count1 . 'Nzzzv')<CR><Cmd>lua require('hlslens').start()<CR>",
-  { noremap = true, silent = true }
-)
+vim.keymap.set('n', 'N', '',
+{
+  noremap = true,
+  silent = true,
+  callback = function()
+    vim.fn.execute("normal! " .. vim.v.count1 .. "Nzzzv")
+    require('hlslens').start()
+  end
+})
 
-vim.api.nvim_set_keymap("n", "*", "<Plug>(asterisk-z*)<Cmd>lua require('hlslens').start()<CR>", { silent = true })
-vim.api.nvim_set_keymap("n", "#", "<Plug>(asterisk-z#)<Cmd>lua require('hlslens').start()<CR>", { silent = true })
+vim.keymap.set('n', '*', "<Plug>(asterisk-z*)<Cmd>lua require('hlslens').start()<CR>", { silent = true })
+vim.keymap.set('n', '#', "<Plug>(asterisk-z#)<Cmd>lua require('hlslens').start()<CR>", { silent = true })
diff --git a/lua/config/nvim-tree.lua b/lua/config/nvim-tree.lua
index 7ba565b..d400822 100644
--- a/lua/config/nvim-tree.lua
+++ b/lua/config/nvim-tree.lua
@@ -113,4 +113,7 @@ nvim_tree.setup({
   },
 })
 
-vim.api.nvim_set_keymap("n", "<space>s", "<cmd>lua require'nvim-tree'.toggle(false, true)<CR>", { noremap = true, silent = true })
+vim.keymap.set('n', '<space>s', function()
+  return require('nvim-tree').toggle(false, true)
+end,
+{ noremap = true, silent = true, desc = "toggle nvim-tree"})
diff --git a/lua/config/nvim_hop.lua b/lua/config/nvim_hop.lua
index 77571fd..274b6a1 100644
--- a/lua/config/nvim_hop.lua
+++ b/lua/config/nvim_hop.lua
@@ -8,4 +8,7 @@ require('hop').setup({
   quit_key='<Esc>',
 })
 
-vim.api.nvim_set_keymap('n', 'f', "<cmd>lua require'hop'.hint_char2()<cr>", {noremap = true})
+vim.keymap.set('n', 'f', function()
+  return require('hop').hint_char2()
+end,
+{ silent = true, noremap = true, desc = "nvim-hop char2" })