neovim: edited mappings

2 files changed, 13 insertions, 14 deletions

diff --git a/pkgs/custom-neovim/config/lua/mappings.lua b/pkgs/custom-neovim/config/lua/mappings.lua
index 8e166a9..b108e1a 100644
--- a/pkgs/custom-neovim/config/lua/mappings.lua
+++ b/pkgs/custom-neovim/config/lua/mappings.lua
@@ -17,17 +17,16 @@ mapkey("n", "<leader>p", "Open picker picker", ":lua Snacks.picker.pickers()<cr>
 mapkey("n", "<leader>'", "Open last picker", ":lua Snacks.picker.resume()<cr>")
 mapkey("n", "<leader><leader>", "Open smart picker", ":lua Snacks.picker.smart()<cr>")
 
--- Commenting.
-mapkey("n", "<C-c>", "Comment line", ":norm gcc<cr>")
-mapkey("v", "<C-c>", "Comment line", ":norm gc<cr>")
-
 -- Tabs
 mapkey("n", "<leader>t", "Manage tabs", "")
 mapkey("n", "<leader>tt", "Open new tab", ":tabnew<cr>")
-mapkey("n", "<leader>tq", "Close tab", ":tabclose<cr>")
+mapkey("n", "<leader>tc", "Close tab", ":tabclose<cr>")
 mapkey("n", "<leader>tn", "Go to next tab", ":tabnext<cr>")
 mapkey("n", "<leader>tp", "Go to previous tab", ":tabprev<cr>")
 
+-- Windows
+mapkey("n", "<leader>w", "Manage windows", "<C-w>")
+
 -- Sessions
 mapkey("n", "<leader>s", "Manage sessions", "")
 mapkey("n", "<leader>sw", "Save current session", ":SessionSave<cr>")
diff --git a/pkgs/custom-neovim/config/lua/plugins/mini/clue.lua b/pkgs/custom-neovim/config/lua/plugins/mini/clue.lua
index 12ce52d..5057e1d 100644
--- a/pkgs/custom-neovim/config/lua/plugins/mini/clue.lua
+++ b/pkgs/custom-neovim/config/lua/plugins/mini/clue.lua
@@ -3,44 +3,44 @@ miniclue.setup({
   triggers = {
     -- Leader triggers
     { mode = 'n', keys = '<Leader>' },
-    { mode = 'x', keys = '<Leader>' },
+    { mode = 'v', keys = '<Leader>' },
 
     -- Built-in completion
     { mode = 'i', keys = '<C-x>' },
 
     -- `g` key
     { mode = 'n', keys = 'g' },
-    { mode = 'x', keys = 'g' },
+    { mode = 'v', keys = 'g' },
 
     -- Marks
     { mode = 'n', keys = "'" },
+    { mode = 'v', keys = "'" },
     { mode = 'n', keys = '`' },
-    { mode = 'x', keys = "'" },
-    { mode = 'x', keys = '`' },
+    { mode = 'v', keys = '`' },
 
     -- Registers
     { mode = 'n', keys = '"' },
-    { mode = 'x', keys = '"' },
+    { mode = 'v', keys = '"' },
     { mode = 'i', keys = '<C-r>' },
     { mode = 'c', keys = '<C-r>' },
 
     -- Window commands
     { mode = 'n', keys = '<C-w>' },
+    -- { mode = 'n', keys = '<leader>w' },
 
     -- `z` key
+    { mode = 'v', keys = 'z' },
     { mode = 'n', keys = 'z' },
-    { mode = 'x', keys = 'z' },
   },
 
   clues = {
-    -- Enhance this by adding descriptions for <Leader> mapping groups
-    { mode = 'n', keys = '<Leader>' },
-    { mode = 'x', keys = '<Leader>' },
+    { mode = {'n', 'v'}, keys = '<Leader>' },
     miniclue.gen_clues.builtin_completion(),
     miniclue.gen_clues.g(),
     miniclue.gen_clues.marks(),
     miniclue.gen_clues.registers(),
     miniclue.gen_clues.windows(),
+    Utils.replaceInTable(miniclue.gen_clues.windows(), "<C%-w>", "<leader>w"),
     miniclue.gen_clues.z(),
   },