From a4663390922b411895aa8c2e8a9c11e214e69d56 Mon Sep 17 00:00:00 2001
From: jdhao <jdhao@hotmail.com>
Date: Sat, 11 Dec 2021 15:46:25 +0800
Subject: [PATCH] update nvim-hlslens settings

---
 core/plugins.vim       |  9 ---------
 lua/config/hlslens.lua | 16 ++++++++++++++++
 lua/plugins.lua        |  9 +++++++--
 3 files changed, 23 insertions(+), 11 deletions(-)
 create mode 100644 lua/config/hlslens.lua

diff --git a/core/plugins.vim b/core/plugins.vim
index db00112..f249bfd 100644
--- a/core/plugins.vim
+++ b/core/plugins.vim
@@ -37,15 +37,6 @@ let g:semshi#error_sign=v:false
 """""""""""""""""""""""""" vlime settings """"""""""""""""""""""""""""""""
 command! -nargs=0 StartVlime call jobstart(printf("sbcl --load %s/vlime/lisp/start-vlime.lisp", g:package_home))
 
-""""""""""""""""""""""""""""" settings for nvim-hlslens"""""""""""""""
-noremap <silent> n <Cmd>execute('normal! ' . v:count1 . 'nzzzv')<CR>
-            \<Cmd>lua require('hlslens').start()<CR>
-noremap <silent> N <Cmd>execute('normal! ' . v:count1 . 'Nzzzv')<CR>
-            \<Cmd>lua require('hlslens').start()<CR>
-
-map *  <Plug>(asterisk-z*)<Cmd>lua require('hlslens').start()<CR>
-map #  <Plug>(asterisk-z#)<Cmd>lua require('hlslens').start()<CR>
-
 """""""""""""""""""""""""""""LeaderF settings"""""""""""""""""""""
 " Do not use cache file
 let g:Lf_UseCache = 0
diff --git a/lua/config/hlslens.lua b/lua/config/hlslens.lua
new file mode 100644
index 0000000..3acc91a
--- /dev/null
+++ b/lua/config/hlslens.lua
@@ -0,0 +1,16 @@
+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.api.nvim_set_keymap(
+	"n",
+	"N",
+	"<Cmd>execute('normal! ' . v:count1 . 'Nzzzv')<CR><Cmd>lua require('hlslens').start()<CR>",
+	{ noremap = true, silent = true }
+)
+
+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 })
diff --git a/lua/plugins.lua b/lua/plugins.lua
index 179cb1e..4671207 100644
--- a/lua/plugins.lua
+++ b/lua/plugins.lua
@@ -85,8 +85,13 @@ require("packer").startup({
     -- Clear highlight search automatically for you
     use({"romainl/vim-cool", event = "VimEnter"})
 
-    -- Show match number for search
-    use {'kevinhwang91/nvim-hlslens', branch = 'main', event = "VimEnter"}
+    -- Show match number and index for searching
+    use {
+      'kevinhwang91/nvim-hlslens',
+      branch = 'main',
+      keys = {{'n', '*'}, {'n', '#'}, {'n', 'n'}, {'n', 'N'}},
+      config = [[require('config.hlslens')]]
+    }
 
     -- Stay after pressing * and search selected text
     use({"haya14busa/vim-asterisk", event = 'VimEnter'})