From 5cd2165a64ef756fafc5e46e5752522ab824eb78 Mon Sep 17 00:00:00 2001
From: Bartek Stalewski <ftpd@insomniac.pl>
Date: Thu, 19 Jun 2025 01:45:32 +0200
Subject: [PATCH] Clean which-key unused menus.

---
 config/common/nvim/lua/config/keymaps.lua | 51 ++++++++++++----------
 config/common/nvim/lua/plugins/init.lua   | 53 +++++++++++++++++++----
 2 files changed, 72 insertions(+), 32 deletions(-)

diff --git a/config/common/nvim/lua/config/keymaps.lua b/config/common/nvim/lua/config/keymaps.lua
index 105c8f6..5d165de 100644
--- a/config/common/nvim/lua/config/keymaps.lua
+++ b/config/common/nvim/lua/config/keymaps.lua
@@ -5,27 +5,6 @@
 local map = vim.keymap.set
 local nomap = vim.keymap.del
 
-map("i", "<C-a>", "<esc>I")
-map("i", "<C-e>", "<esc>A")
-
-map("n", "<esc><cr>", "<esc><cmd>wq!<cr>", { desc = "save and exit", remap = true })
-map("n", "<tab>", "<C-w>w", { desc = "switch pane", remap = true })
-map("n", "<leader>-", "<C-W>s", { desc = "split horizontally", remap = true })
-map("n", "<leader>|", "<C-W>v", { desc = "split vertically", remap = true })
-map("n", "<leader>/", "gcc", { desc = "toggle comments", remap = true })
-
-map("n", "<leader>ff", LazyVim.pick("files", { root = false }), { desc = "find files (cwd)", remap = true })
-map("n", "<leader>fF", LazyVim.pick("files"), { desc = "find files (root)", remap = true })
-map("n", "<leader>h", "<cmd>set hlsearch!<cr>", { desc = "toggle hlsearch", remap = true })
-map(
-  "n",
-  "<leader>m",
-  '<cmd>execute "set colorcolumn=" . (&colorcolumn == "" ? "80,120" : "")<cr>',
-  { desc = "toggle column", remap = true }
-)
--- <leader>n (toggle decorations) moved to configuration of snacks.nvim in plugins/init.lua
-map("v", "<leader>/", "gc", { desc = "toggle comments", remap = true })
-
 nomap("n", "<leader><space>")
 nomap("n", "<leader>,")
 nomap("n", "<leader>.")
@@ -39,19 +18,22 @@ nomap("n", "<leader>`")
 
 nomap("n", "<leader>bD")
 nomap("n", "<leader>bP")
-nomap("n", "<leader>bb")
-nomap("n", "<leader>bd")
 nomap("n", "<leader>bl")
 nomap("n", "<leader>bo")
 nomap("n", "<leader>bp")
 nomap("n", "<leader>br")
 
+nomap("n", "<leader>e")
+nomap("n", "<leader>E")
+
 nomap("n", "<leader>fb")
+nomap("n", "<leader>fB")
 nomap("n", "<leader>fc")
 nomap("n", "<leader>fe")
 nomap("n", "<leader>fE")
 nomap("n", "<leader>fg")
 nomap("n", "<leader>fn")
+nomap("n", "<leader>fp")
 nomap("n", "<leader>fr")
 nomap("n", "<leader>fR")
 nomap("n", "<leader>ft")
@@ -61,8 +43,31 @@ nomap("n", "<leader>gb")
 nomap("n", "<leader>gB")
 nomap("n", "<leader>gs")
 nomap("n", "<leader>gY")
+nomap("n", "<leader>gd")
+nomap("n", "<leader>gS")
 
 nomap("n", "<leader>qq")
 
 nomap("n", "<leader>xl")
 nomap("n", "<leader>xq")
+
+map("i", "<C-a>", "<esc>I")
+map("i", "<C-e>", "<esc>A")
+
+map("n", "<esc><cr>", "<esc><cmd>wq!<cr>", { desc = "save and exit", remap = true })
+map("n", "<tab>", "<C-w>w", { desc = "switch pane", remap = true })
+map("n", "<leader>-", "<C-W>s", { desc = "split horizontally", remap = true })
+map("n", "<leader>|", "<C-W>v", { desc = "split vertically", remap = true })
+map("n", "<leader>/", "gcc", { desc = "toggle comments", remap = true })
+
+map("n", "<leader>fF", LazyVim.pick("files", { root = false }), { desc = "find files (root)", remap = true })
+map("n", "<leader>ff", LazyVim.pick("files"), { desc = "find files (cwd)", remap = true })
+map("n", "<leader>h", "<cmd>set hlsearch!<cr>", { desc = "toggle hlsearch", remap = true })
+map(
+  "n",
+  "<leader>m",
+  '<cmd>execute "set colorcolumn=" . (&colorcolumn == "" ? "80,120" : "")<cr>',
+  { desc = "toggle column", remap = true }
+)
+-- <leader>n (toggle decorations) moved to configuration of snacks.nvim in plugins/init.lua
+map("v", "<leader>/", "gc", { desc = "toggle comments", remap = true })
diff --git a/config/common/nvim/lua/plugins/init.lua b/config/common/nvim/lua/plugins/init.lua
index 132b3be..9066f2e 100644
--- a/config/common/nvim/lua/plugins/init.lua
+++ b/config/common/nvim/lua/plugins/init.lua
@@ -29,6 +29,49 @@ return {
     },
   },
 
+  {
+    "folke/which-key.nvim",
+    event = "VeryLazy",
+    opts_extend = { "spec" },
+    opts = {
+      preset = "helix",
+      defaults = {},
+      spec = {
+        {
+          mode = { "n", "v" },
+          { "<leader><tab>", group = "tabs", hidden = true },
+          { "<leader>c", group = "code", hidden = true },
+          { "<leader>d", group = "debug", hidden = true },
+          { "<leader>dp", group = "profiler", hidden = true },
+          { "<leader>g", group = "git", hidden = true },
+          { "<leader>gh", group = "hunks", hidden = true },
+          { "<leader>q", group = "quit/session", hidden = true },
+          { "<leader>s", group = "search", hidden = true },
+          { "<leader>u", group = "ui", icon = { icon = "󰙵 ", color = "cyan" }, hidden = true },
+          { "<leader>x", group = "diagnostics/quickfix", icon = { icon = "󱖫 ", color = "green" }, hidden = true },
+          {
+            "<leader>b",
+            group = "buffer",
+            expand = function()
+              return require("which-key.extras").expand.buf()
+            end,
+          },
+          {
+            "<leader>w",
+            group = "windows",
+            proxy = "<c-w>",
+            expand = function()
+              return require("which-key.extras").expand.win()
+            end,
+            hidden = true,
+          },
+          -- better descriptions
+          { "gx", desc = "Open with system app", hidden = true },
+        },
+      },
+    },
+  },
+
   {
     "iamcco/markdown-preview.nvim",
     cmd = { "MarkdownPreviewToggle", "MarkdownPreview", "MarkdownPreviewStop" },
@@ -94,21 +137,13 @@ return {
     "nvim-neo-tree/neo-tree.nvim",
     keys = {
       {
-        "<leader>e",
+        "<leader>t",
         function()
           require("neo-tree.command").execute({ toggle = true, dir = vim.uv.cwd() })
         end,
         desc = "explorer (cwd)",
         remap = true,
       },
-      {
-        "<leader>E",
-        function()
-          require("neo-tree.command").execute({ toggle = true, dir = LazyVim.root() })
-        end,
-        desc = "explorer (root)",
-        remap = true,
-      },
     },
     opts = {
       filesystem = {