more refactor

4 files changed, 23 insertions, 27 deletions

diff --git a/lua/keymappings.lua b/lua/keymappings.lua
index f7f3fb76..470dfbaa 100644
--- a/lua/keymappings.lua
+++ b/lua/keymappings.lua
@@ -64,6 +64,7 @@ vim.cmd 'inoremap <expr> <c-k> ("\\<C-p>")'
 
 vim.cmd 'vnoremap p "0p'
 vim.cmd 'vnoremap P "0P'
+
 -- vim.api.nvim_set_keymap('v', 'p', '"0p', {silent = true})
 -- vim.api.nvim_set_keymap('v', 'P', '"0P', {silent = true})
 
@@ -78,8 +79,6 @@ vim.cmd 'vnoremap P "0P'
 -- map <leader>n <Plug>(miniyank-cycle)
 -- map <leader>N <Plug>(miniyank-cycleback)
 -- ]])
--- no hl
-vim.api.nvim_set_keymap("n", "<Leader>h", ':let @/=""<CR>', { noremap = true, silent = true })
 
 -- Toggle the QuickFix window
 vim.api.nvim_set_keymap("", "<C-q>", ":call QuickFixToggle()<CR>", { noremap = true, silent = true })
diff --git a/lua/lv-telescope/init.lua b/lua/lv-telescope/init.lua
index 0fe7f854..50a5951a 100644
--- a/lua/lv-telescope/init.lua
+++ b/lua/lv-telescope/init.lua
@@ -3,3 +3,4 @@ if not status_ok then
   return
 end
 telescope.setup(O.plugin.telescope)
+vim.api.nvim_set_keymap("n", "<Leader>f", ":Telescope find_files<CR>", { noremap = true, silent = true })
diff --git a/lua/lv-which-key/config.lua b/lua/lv-which-key/config.lua
index f16491c5..a0a51e3c 100644
--- a/lua/lv-which-key/config.lua
+++ b/lua/lv-which-key/config.lua
@@ -36,6 +36,15 @@ O.plugin.which_key = {
     hidden = { "<silent>", "<cmd>", "<Cmd>", "<CR>", "call", "lua", "^:", "^ " }, -- hide mapping boilerplate
     show_help = true, -- show help message on the command line when the popup is visible
   },
+
+  opts = {
+    mode = "n", -- NORMAL mode
+    prefix = "<leader>",
+    buffer = nil, -- Global mappings. Specify a buffer number for buffer local mappings
+    silent = true, -- use `silent` when creating keymaps
+    noremap = true, -- use `noremap` when creating keymaps
+    nowait = true, -- use `nowait` when creating keymaps
+  },
   mappings = {
     ["w"] = "Save",
     ["q"] = "Quit",
diff --git a/lua/lv-which-key/init.lua b/lua/lv-which-key/init.lua
index a799687f..ae000ea3 100644
--- a/lua/lv-which-key/init.lua
+++ b/lua/lv-which-key/init.lua
@@ -17,39 +17,19 @@ else
   vim.g.mapleader = O.leader_key
 end
 
-local opts = {
-  mode = "n", -- NORMAL mode
-  prefix = "<leader>",
-  buffer = nil, -- Global mappings. Specify a buffer number for buffer local mappings
-  silent = true, -- use `silent` when creating keymaps
-  noremap = true, -- use `noremap` when creating keymaps
-  nowait = false, -- use `nowait` when creating keymaps
-}
-
--- explorer
-
-vim.api.nvim_set_keymap(
-  "n",
-  "<Leader>e",
-  ":lua require'lv-nvimtree'.toggle_tree()<CR>",
-  { noremap = true, silent = true }
-)
-
-vim.api.nvim_set_keymap("n", "<Leader>f", ":Telescope find_files<CR>", { noremap = true, silent = true })
-
--- dashboard
-vim.api.nvim_set_keymap("n", "<Leader>;", ":Dashboard<CR>", { noremap = true, silent = true })
+local opts = O.plugin.which_key.opts
 
 -- Comments
 vim.api.nvim_set_keymap("n", "<leader>/", ":CommentToggle<CR>", { noremap = true, silent = true })
 vim.api.nvim_set_keymap("v", "<leader>/", ":CommentToggle<CR>", { noremap = true, silent = true })
-
+-- dashboard
+vim.api.nvim_set_keymap("n", "<Leader>;", ":Dashboard<CR>", { noremap = true, silent = true })
 -- Save
 vim.api.nvim_set_keymap("n", "<leader>w", ":w!<CR>", { noremap = true, silent = true })
-
+-- no hl
+vim.api.nvim_set_keymap("n", "<Leader>h", ':let @/=""<CR>', { noremap = true, silent = true })
 -- Quit
 vim.api.nvim_set_keymap("n", "<leader>q", ":q!<CR>", { noremap = true, silent = true })
-
 -- open lv-config
 vim.api.nvim_set_keymap(
   "n",
@@ -57,6 +37,13 @@ vim.api.nvim_set_keymap(
   ":e " .. CONFIG_PATH .. "/lv-config.lua<CR>",
   { noremap = true, silent = true }
 )
+-- explorer
+vim.api.nvim_set_keymap(
+  "n",
+  "<Leader>e",
+  ":lua require'lv-nvimtree'.toggle_tree()<CR>",
+  { noremap = true, silent = true }
+)
 
 local mappings = O.plugin.which_key.mappings