From 750ed369c36b357bc96b32b7255c40015d5ea32d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20La=C3=ADn?= <sergio.lac@pm.me>
Date: Sat, 13 Jul 2024 18:02:08 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix(nvim):=20update=20all=20whic?=
 =?UTF-8?q?h-key=20instances=20to=20the=20new=20version?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nvim/lua/plugins/extras/coding/ai/gen.lua |  4 +--
 .../nvim/lua/plugins/extras/coding/ai/gpt.lua |  4 +--
 .../lua/plugins/extras/coding/annotation.lua  | 10 +++++-
 .../lua/plugins/extras/coding/debugprint.lua  |  4 +--
 .../lua/plugins/extras/coding/snippets.lua    |  4 +--
 .../lua/plugins/extras/coding/sniprun.lua     |  4 +--
 .../lua/plugins/extras/dap/core-extended.lua  |  8 -----
 .../extras/dap/persistent-breakpoints.lua     |  4 +--
 .../plugins/extras/editor/dev-container.lua   |  4 +--
 .../plugins/extras/editor/docs/obsidian.lua   | 36 ++++++++++---------
 .../plugins/extras/editor/git/diffview.lua    |  4 +--
 .../extras/editor/git/git-conflict.lua        |  4 +--
 .../extras/editor/git/github-extended.lua     | 26 +++++++-------
 .../plugins/extras/editor/git/worktree.lua    |  4 +--
 .../plugins/extras/editor/marks/grapple.lua   |  4 +--
 .../extras/editor/marks/harpoon-extended.lua  |  4 +--
 .../plugins/extras/editor/package-info.lua    |  6 ++--
 .../lua/plugins/extras/editor/rest-client.lua |  4 +--
 .../extras/editor/spectre-extended.lua        |  4 +--
 .../editor/telescope/telescope-extended.lua   |  6 ++--
 .../extras/editor/terminal/floaterm.lua       |  6 ++--
 .../plugins/extras/lang/python-extended.lua   |  6 ++--
 .../lua/plugins/extras/lang/rust-extended.lua |  6 ++--
 .../lua/plugins/extras/lang/sql-extended.lua  |  4 +--
 .../plugins/extras/lsp/lspconfig-extended.lua |  4 +--
 .../lua/plugins/extras/test/core-extended.lua | 11 ------
 .../lua/plugins/extras/ui/comment-box.lua     |  6 ++--
 .config/nvim/lua/plugins/extras/ui/modes.lua  | 17 ++-------
 .../plugins/extras/ui/which-key-extended.lua  | 16 ++-------
 .../lua/plugins/extras/util/icon-picker.lua   |  6 ++--
 30 files changed, 100 insertions(+), 130 deletions(-)
 delete mode 100644 .config/nvim/lua/plugins/extras/test/core-extended.lua

diff --git a/.config/nvim/lua/plugins/extras/coding/ai/gen.lua b/.config/nvim/lua/plugins/extras/coding/ai/gen.lua
index f620fe56..8f221ae4 100644
--- a/.config/nvim/lua/plugins/extras/coding/ai/gen.lua
+++ b/.config/nvim/lua/plugins/extras/coding/ai/gen.lua
@@ -55,8 +55,8 @@ return {
   {
     "folke/which-key.nvim",
     opts = {
-      defaults = {
-        ["<leader>i"] = { name = "󱚦 IA (Gen)" },
+      spec = {
+        { "<leader>i", group = "IA (Gen)", icon = "󱚦 " },
       },
     },
   },
diff --git a/.config/nvim/lua/plugins/extras/coding/ai/gpt.lua b/.config/nvim/lua/plugins/extras/coding/ai/gpt.lua
index a070ac52..94374083 100644
--- a/.config/nvim/lua/plugins/extras/coding/ai/gpt.lua
+++ b/.config/nvim/lua/plugins/extras/coding/ai/gpt.lua
@@ -98,8 +98,8 @@ return {
   {
     "folke/which-key.nvim",
     opts = {
-      defaults = {
-        ["<leader>C"] = { name = "󰚩 chatGPT" },
+      spec = {
+        { "<leader>C", group = "chatGPT", icon = "󰚩 " },
       },
     },
   },
diff --git a/.config/nvim/lua/plugins/extras/coding/annotation.lua b/.config/nvim/lua/plugins/extras/coding/annotation.lua
index e946d069..29cf31d2 100644
--- a/.config/nvim/lua/plugins/extras/coding/annotation.lua
+++ b/.config/nvim/lua/plugins/extras/coding/annotation.lua
@@ -4,12 +4,12 @@ return {
     "danymat/neogen",
     -- stylua: ignore
     keys = {
-      { "<leader>a", "", desc = " annotation/snippets" },
       { "<leader>ad", function() require("neogen").generate() end, desc = "Default Annotation" },
       { "<leader>aC", function() require("neogen").generate({ type = "class" }) end, desc = "Class" },
       { "<leader>af", function() require("neogen").generate({ type = "func" }) end, desc = "Function" },
       { "<leader>at", function() require("neogen").generate({ type = "type" }) end, desc = "Type" },
       { "<leader>aF", function() require("neogen").generate({ type = "file" }) end, desc = "File" },
+      { "<leader>cn", false },
     },
   },
   {
@@ -22,4 +22,12 @@ return {
       { "<leader>ao", "<Cmd>DookuOpen<CR>", desc = "Open HTML Docs" },
     },
   },
+  {
+    "folke/which-key.nvim",
+    opts = {
+      spec = {
+        { "<leader>a", group = "annotation/snippets", icon = " " },
+      },
+    },
+  },
 }
diff --git a/.config/nvim/lua/plugins/extras/coding/debugprint.lua b/.config/nvim/lua/plugins/extras/coding/debugprint.lua
index 3e4eb00a..669c9f04 100644
--- a/.config/nvim/lua/plugins/extras/coding/debugprint.lua
+++ b/.config/nvim/lua/plugins/extras/coding/debugprint.lua
@@ -26,8 +26,8 @@ return {
   {
     "folke/which-key.nvim",
     opts = {
-      defaults = {
-        ["<leader>dd"] = { name = "debugPrint" },
+      spec = {
+        { "<leader>dd", group = "debugPrint", icon = "󰐪 " },
       },
     },
   },
diff --git a/.config/nvim/lua/plugins/extras/coding/snippets.lua b/.config/nvim/lua/plugins/extras/coding/snippets.lua
index 7a085bbc..c253d4b5 100644
--- a/.config/nvim/lua/plugins/extras/coding/snippets.lua
+++ b/.config/nvim/lua/plugins/extras/coding/snippets.lua
@@ -16,8 +16,8 @@ return {
   {
     "folke/which-key.nvim",
     opts = {
-      defaults = {
-        ["<leader>a"] = { name = " annotation/snippets" },
+      spec = {
+        { "<leader>a", group = "annotation/snippets", icon = " " },
       },
     },
   },
diff --git a/.config/nvim/lua/plugins/extras/coding/sniprun.lua b/.config/nvim/lua/plugins/extras/coding/sniprun.lua
index e4f3af47..17574113 100644
--- a/.config/nvim/lua/plugins/extras/coding/sniprun.lua
+++ b/.config/nvim/lua/plugins/extras/coding/sniprun.lua
@@ -61,8 +61,8 @@ return {
   {
     "folke/which-key.nvim",
     opts = {
-      defaults = {
-        ["<leader>cu"] = { name = "runner" },
+      spec = {
+        { "<leader>cu", group = "runner", icon = "󰜎 " },
       },
     },
   },
diff --git a/.config/nvim/lua/plugins/extras/dap/core-extended.lua b/.config/nvim/lua/plugins/extras/dap/core-extended.lua
index 2ecf1689..b4e79b6f 100644
--- a/.config/nvim/lua/plugins/extras/dap/core-extended.lua
+++ b/.config/nvim/lua/plugins/extras/dap/core-extended.lua
@@ -30,12 +30,4 @@ return {
       { "<leader>tL", function() require("neotest").run.run_last({ strategy = "dap" }) end, desc = "Debug Last Test" },
     },
   },
-  {
-    "folke/which-key.nvim",
-    opts = {
-      defaults = {
-        ["<leader>d"] = { name = " debug" },
-      },
-    },
-  },
 }
diff --git a/.config/nvim/lua/plugins/extras/dap/persistent-breakpoints.lua b/.config/nvim/lua/plugins/extras/dap/persistent-breakpoints.lua
index b761bec9..1e76ca22 100644
--- a/.config/nvim/lua/plugins/extras/dap/persistent-breakpoints.lua
+++ b/.config/nvim/lua/plugins/extras/dap/persistent-breakpoints.lua
@@ -25,8 +25,8 @@ return {
   {
     "folke/which-key.nvim",
     opts = {
-      defaults = {
-        ["<leader>db"] = { name = "breakpoints" },
+      spec = {
+        { "<leader>db", group = "breakpoints", icon = " " },
       },
     },
   },
diff --git a/.config/nvim/lua/plugins/extras/editor/dev-container.lua b/.config/nvim/lua/plugins/extras/editor/dev-container.lua
index fa41ed2d..af6daef3 100644
--- a/.config/nvim/lua/plugins/extras/editor/dev-container.lua
+++ b/.config/nvim/lua/plugins/extras/editor/dev-container.lua
@@ -24,8 +24,8 @@ return {
   {
     "folke/which-key.nvim",
     opts = {
-      defaults = {
-        ["<leader>o"] = { name = " c[o]ntainers" },
+      spec = {
+        { "<leader><S-Tab>", group = "containers", icon = " " },
       },
     },
   },
diff --git a/.config/nvim/lua/plugins/extras/editor/docs/obsidian.lua b/.config/nvim/lua/plugins/extras/editor/docs/obsidian.lua
index aa43f9aa..960efd4e 100644
--- a/.config/nvim/lua/plugins/extras/editor/docs/obsidian.lua
+++ b/.config/nvim/lua/plugins/extras/editor/docs/obsidian.lua
@@ -1,24 +1,26 @@
+local prefix = "<leader>O"
+
 return {
   {
     "epwalsh/obsidian.nvim",
     event = { "BufReadPre /docs/Documentos/Obsidian/**.md" },
     keys = {
-      { "<leader>oo", "<cmd>ObsidianOpen<CR>", desc = "Open on App" },
-      { "<leader>og", "<cmd>ObsidianSearch<CR>", desc = "Grep" },
+      { prefix .. "o", "<cmd>ObsidianOpen<CR>", desc = "Open on App" },
+      { prefix .. "g", "<cmd>ObsidianSearch<CR>", desc = "Grep" },
       { "<leader>sO", "<cmd>ObsidianSearch<CR>", desc = "Obsidian Grep" },
-      { "<leader>on", "<cmd>ObsidianNew<CR>", desc = "New Note" },
-      { "<leader>o<space>", "<cmd>ObsidianQuickSwitch<CR>", desc = "Find Files" },
-      { "<leader>ob", "<cmd>ObsidianBacklinks<CR>", desc = "Backlinks" },
-      { "<leader>ot", "<cmd>ObsidianTags<CR>", desc = "Tags" },
-      { "<leader>ot", "<cmd>ObsidianTemplate<CR>", desc = "Template" },
-      { "<leader>ol", "<cmd>ObsidianLink<CR>", desc = "Link" },
-      { "<leader>oL", "<cmd>ObsidianLinks<CR>", desc = "Links" },
-      { "<leader>oN", "<cmd>ObsidianLinkNew<CR>", desc = "New Link" },
-      { "<leader>oe", "<cmd>ObsidianExtractNote<CR>", desc = "Extract Note" },
-      { "<leader>ow", "<cmd>ObsidianWorkspace<CR>", desc = "Workspace" },
-      { "<leader>or", "<cmd>ObsidianRename<CR>", desc = "Rename" },
-      { "<leader>oi", "<cmd>ObsidianPasteImg<CR>", desc = "Paste Image" },
-      { "<leader>od", "<cmd>ObsidianDailies<CR>", desc = "Daily Notes" },
+      { prefix .. "n", "<cmd>ObsidianNew<CR>", desc = "New Note" },
+      { prefix .. "<space>", "<cmd>ObsidianQuickSwitch<CR>", desc = "Find Files" },
+      { prefix .. "b", "<cmd>ObsidianBacklinks<CR>", desc = "Backlinks" },
+      { prefix .. "t", "<cmd>ObsidianTags<CR>", desc = "Tags" },
+      { prefix .. "t", "<cmd>ObsidianTemplate<CR>", desc = "Template" },
+      { prefix .. "l", "<cmd>ObsidianLink<CR>", desc = "Link" },
+      { prefix .. "L", "<cmd>ObsidianLinks<CR>", desc = "Links" },
+      { prefix .. "N", "<cmd>ObsidianLinkNew<CR>", desc = "New Link" },
+      { prefix .. "e", "<cmd>ObsidianExtractNote<CR>", desc = "Extract Note" },
+      { prefix .. "w", "<cmd>ObsidianWorkspace<CR>", desc = "Workspace" },
+      { prefix .. "r", "<cmd>ObsidianRename<CR>", desc = "Rename" },
+      { prefix .. "i", "<cmd>ObsidianPasteImg<CR>", desc = "Paste Image" },
+      { prefix .. "d", "<cmd>ObsidianDailies<CR>", desc = "Daily Notes" },
     },
     dependencies = {
       "nvim-lua/plenary.nvim",
@@ -76,8 +78,8 @@ return {
   {
     "folke/which-key.nvim",
     opts = {
-      defaults = {
-        ["<leader>o"] = { name = " obsidian" },
+      spec = {
+        { prefix, group = "obsidian", icon = " " },
       },
     },
   },
diff --git a/.config/nvim/lua/plugins/extras/editor/git/diffview.lua b/.config/nvim/lua/plugins/extras/editor/git/diffview.lua
index 838f919a..e63672fd 100644
--- a/.config/nvim/lua/plugins/extras/editor/git/diffview.lua
+++ b/.config/nvim/lua/plugins/extras/editor/git/diffview.lua
@@ -47,8 +47,8 @@ return {
   {
     "folke/which-key.nvim",
     opts = {
-      defaults = {
-        ["<leader>gC"] = { name = "conflicts" },
+      spec = {
+        { "<leader>gC", group = "conflicts", icon = " " },
       },
     },
   },
diff --git a/.config/nvim/lua/plugins/extras/editor/git/git-conflict.lua b/.config/nvim/lua/plugins/extras/editor/git/git-conflict.lua
index 7e955cae..b63499df 100644
--- a/.config/nvim/lua/plugins/extras/editor/git/git-conflict.lua
+++ b/.config/nvim/lua/plugins/extras/editor/git/git-conflict.lua
@@ -18,8 +18,8 @@ return {
   {
     "folke/which-key.nvim",
     opts = {
-      defaults = {
-        ["<leader>gC"] = { name = "conflicts" },
+      spec = {
+        { "<leader>gC", group = "conflicts", icon = " " },
       },
     },
   },
diff --git a/.config/nvim/lua/plugins/extras/editor/git/github-extended.lua b/.config/nvim/lua/plugins/extras/editor/git/github-extended.lua
index 2a98a13b..230cfaff 100644
--- a/.config/nvim/lua/plugins/extras/editor/git/github-extended.lua
+++ b/.config/nvim/lua/plugins/extras/editor/git/github-extended.lua
@@ -22,19 +22,19 @@ return {
   {
     "folke/which-key.nvim",
     opts = {
-      defaults = {
-        ["<leader>G"] = { name = " github" },
-        ["<leader>Gc"] = { name = "comments" },
-        ["<leader>Gt"] = { name = "threads" },
-        ["<leader>Gi"] = { name = "issues" },
-        ["<leader>Gp"] = { name = "pull requests" },
-        ["<leader>Gpm"] = { name = "merge current PR" },
-        ["<leader>Gr"] = { name = "repo" },
-        ["<leader>Ga"] = { name = "assignee/reviewer" },
-        ["<leader>Gl"] = { name = "label" },
-        ["<leader>Ge"] = { name = "reaction" },
-        ["<leader>GR"] = { name = "review" },
-        ["<leader>Gg"] = { name = "gist" },
+      spec = {
+        { prefix, group = "github", icon = " " },
+        { prefix .. "c", group = "comments" },
+        { prefix .. "t", group = "threads" },
+        { prefix .. "i", group = "issues" },
+        { prefix .. "p", group = "pull requests" },
+        { prefix .. "pm", group = "merge current PR" },
+        { prefix .. "r", group = "repo" },
+        { prefix .. "a", group = "assignee/reviewer" },
+        { prefix .. "l", group = "label" },
+        { prefix .. "e", group = "reaction" },
+        { prefix .. "R", group = "review" },
+        { prefix .. "g", group = "gist" },
       },
     },
   },
diff --git a/.config/nvim/lua/plugins/extras/editor/git/worktree.lua b/.config/nvim/lua/plugins/extras/editor/git/worktree.lua
index 46a3be62..9337deb1 100644
--- a/.config/nvim/lua/plugins/extras/editor/git/worktree.lua
+++ b/.config/nvim/lua/plugins/extras/editor/git/worktree.lua
@@ -16,8 +16,8 @@ return {
   {
     "folke/which-key.nvim",
     opts = {
-      defaults = {
-        ["<leader>gw"] = { name = "worktrees" },
+      spec = {
+        { "<leader>gw", group = "worktrees", icon = " " },
       },
     },
   },
diff --git a/.config/nvim/lua/plugins/extras/editor/marks/grapple.lua b/.config/nvim/lua/plugins/extras/editor/marks/grapple.lua
index 5aa4ee74..2e84e22c 100644
--- a/.config/nvim/lua/plugins/extras/editor/marks/grapple.lua
+++ b/.config/nvim/lua/plugins/extras/editor/marks/grapple.lua
@@ -70,8 +70,8 @@ return {
   {
     "folke/which-key.nvim",
     opts = {
-      defaults = {
-        ["<leader>m"] = { name = "󰛢 marks" },
+      spec = {
+        { "<leader>m", group = "marks", icon = "󰛢 " },
       },
     },
   },
diff --git a/.config/nvim/lua/plugins/extras/editor/marks/harpoon-extended.lua b/.config/nvim/lua/plugins/extras/editor/marks/harpoon-extended.lua
index 8aa373ff..8809d6d6 100644
--- a/.config/nvim/lua/plugins/extras/editor/marks/harpoon-extended.lua
+++ b/.config/nvim/lua/plugins/extras/editor/marks/harpoon-extended.lua
@@ -100,8 +100,8 @@ return {
   {
     "folke/which-key.nvim",
     opts = {
-      defaults = {
-        ["<leader>m"] = { name = "󰛢 marks" },
+      spec = {
+        { "<leader>m", group = "marks", icon = "󰛢 " },
       },
     },
   },
diff --git a/.config/nvim/lua/plugins/extras/editor/package-info.lua b/.config/nvim/lua/plugins/extras/editor/package-info.lua
index 60f02141..667f1d5d 100644
--- a/.config/nvim/lua/plugins/extras/editor/package-info.lua
+++ b/.config/nvim/lua/plugins/extras/editor/package-info.lua
@@ -26,9 +26,9 @@ return {
   {
     "folke/which-key.nvim",
     opts = {
-      defaults = {
-        ["<leader>p"] = { name = " packages/dependencies" },
-        ["<leader>pw"] = { name = "web" },
+      spec = {
+        { "<leader>p", group = "packages/dependencies", icon = " " },
+        { "<leader>pw", group = "web", icon = "󰖟 " },
       },
     },
   },
diff --git a/.config/nvim/lua/plugins/extras/editor/rest-client.lua b/.config/nvim/lua/plugins/extras/editor/rest-client.lua
index f05a2ac9..72387cd7 100644
--- a/.config/nvim/lua/plugins/extras/editor/rest-client.lua
+++ b/.config/nvim/lua/plugins/extras/editor/rest-client.lua
@@ -60,8 +60,8 @@ return {
   {
     "folke/which-key.nvim",
     opts = {
-      defaults = {
-        ["<leader>th"] = { name = "http" },
+      spec = {
+        { "<leader>th", group = "http", icon = "󱞒 " },
       },
     },
   },
diff --git a/.config/nvim/lua/plugins/extras/editor/spectre-extended.lua b/.config/nvim/lua/plugins/extras/editor/spectre-extended.lua
index 49cf3abf..72fdf86d 100644
--- a/.config/nvim/lua/plugins/extras/editor/spectre-extended.lua
+++ b/.config/nvim/lua/plugins/extras/editor/spectre-extended.lua
@@ -23,8 +23,8 @@ return {
   {
     "folke/which-key.nvim",
     opts = {
-      defaults = {
-        ["<leader>sr"] = { name = "replace" },
+      spec = {
+        { "<leader>sr", group = "replace", icon = " " },
       },
     },
   },
diff --git a/.config/nvim/lua/plugins/extras/editor/telescope/telescope-extended.lua b/.config/nvim/lua/plugins/extras/editor/telescope/telescope-extended.lua
index f2918e37..b4758e27 100644
--- a/.config/nvim/lua/plugins/extras/editor/telescope/telescope-extended.lua
+++ b/.config/nvim/lua/plugins/extras/editor/telescope/telescope-extended.lua
@@ -118,9 +118,9 @@ return {
   {
     "folke/which-key.nvim",
     opts = {
-      defaults = {
-        ["<leader>sS"] = { name = "goto symbols (Workspace)" },
-        ["<leader>ss"] = { name = "goto symbols" },
+      spec = {
+        { "<leader>ss", group = "goto symbols", icon = " " },
+        { "<leader>sS", group = "goto symbols (Workspace)", icon = " " },
       },
     },
   },
diff --git a/.config/nvim/lua/plugins/extras/editor/terminal/floaterm.lua b/.config/nvim/lua/plugins/extras/editor/terminal/floaterm.lua
index ebd6e02c..9bc1961b 100644
--- a/.config/nvim/lua/plugins/extras/editor/terminal/floaterm.lua
+++ b/.config/nvim/lua/plugins/extras/editor/terminal/floaterm.lua
@@ -39,9 +39,9 @@ return {
   {
     "folke/which-key.nvim",
     opts = {
-      defaults = {
-        ["<leader>ce"] = { name = "r[e]pl" },
-        ["<leader>ft"] = { name = "terminals" },
+      spec = {
+        { "<leader>ce", group = "r[e]pl", icon = "󰫧 " },
+        { "<leader>ft", group = "terminals", icon = " " },
       },
     },
   },
diff --git a/.config/nvim/lua/plugins/extras/lang/python-extended.lua b/.config/nvim/lua/plugins/extras/lang/python-extended.lua
index 320e73d1..d6203d75 100644
--- a/.config/nvim/lua/plugins/extras/lang/python-extended.lua
+++ b/.config/nvim/lua/plugins/extras/lang/python-extended.lua
@@ -93,9 +93,9 @@ return {
   {
     "folke/which-key.nvim",
     opts = {
-      defaults = {
-        ["<leader>p"] = { name = " packages/dependencies" },
-        ["<leader>pp"] = { name = "python" },
+      spec = {
+        { "<leader>p", group = "packages/dependencies", icon = " " },
+        { "<leader>pp", group = "python", icon = " " },
       },
     },
   },
diff --git a/.config/nvim/lua/plugins/extras/lang/rust-extended.lua b/.config/nvim/lua/plugins/extras/lang/rust-extended.lua
index 991b181b..70764492 100644
--- a/.config/nvim/lua/plugins/extras/lang/rust-extended.lua
+++ b/.config/nvim/lua/plugins/extras/lang/rust-extended.lua
@@ -37,9 +37,9 @@ return {
   {
     "folke/which-key.nvim",
     opts = {
-      defaults = {
-        ["<leader>p"] = { name = " packages/dependencies" },
-        ["<leader>pr"] = { name = "rust" },
+      spec = {
+        { "<leader>p", group = "packages/dependencies", icon = " " },
+        { "<leader>pr", group = "rust", icon = " " },
       },
     },
   },
diff --git a/.config/nvim/lua/plugins/extras/lang/sql-extended.lua b/.config/nvim/lua/plugins/extras/lang/sql-extended.lua
index eb7172ba..95a56cf6 100644
--- a/.config/nvim/lua/plugins/extras/lang/sql-extended.lua
+++ b/.config/nvim/lua/plugins/extras/lang/sql-extended.lua
@@ -18,8 +18,8 @@ return {
   {
     "folke/which-key.nvim",
     opts = {
-      defaults = {
-        ["<leader>D"] = { name = " database" },
+      spec = {
+        { "<leader>D", group = "database", icon = " " },
       },
     },
   },
diff --git a/.config/nvim/lua/plugins/extras/lsp/lspconfig-extended.lua b/.config/nvim/lua/plugins/extras/lsp/lspconfig-extended.lua
index 0e5cf3a2..0d8c6c4f 100644
--- a/.config/nvim/lua/plugins/extras/lsp/lspconfig-extended.lua
+++ b/.config/nvim/lua/plugins/extras/lsp/lspconfig-extended.lua
@@ -57,8 +57,8 @@ return {
   {
     "folke/which-key.nvim",
     opts = {
-      defaults = {
-        ["<leader>cL"] = { name = "lsp" },
+      spec = {
+        { "<leader>cL", group = "lsp", icon = " " },
       },
     },
   },
diff --git a/.config/nvim/lua/plugins/extras/test/core-extended.lua b/.config/nvim/lua/plugins/extras/test/core-extended.lua
deleted file mode 100644
index 6e25a488..00000000
--- a/.config/nvim/lua/plugins/extras/test/core-extended.lua
+++ /dev/null
@@ -1,11 +0,0 @@
-return {
-  { import = "lazyvim.plugins.extras.test.core" },
-  {
-    "folke/which-key.nvim",
-    opts = {
-      defaults = {
-        ["<leader>t"] = { name = "󰙨 test" },
-      },
-    },
-  },
-}
diff --git a/.config/nvim/lua/plugins/extras/ui/comment-box.lua b/.config/nvim/lua/plugins/extras/ui/comment-box.lua
index f8bc4b72..de8d0f74 100644
--- a/.config/nvim/lua/plugins/extras/ui/comment-box.lua
+++ b/.config/nvim/lua/plugins/extras/ui/comment-box.lua
@@ -15,9 +15,9 @@ return {
   {
     "folke/which-key.nvim",
     opts = {
-      defaults = {
-        ["<leader>a"] = { name = " annotation/snippets" },
-        ["<leader>ac"] = { name = "comments" },
+      spec = {
+        { "<leader>a", group = "annotation/snippets", icon = " " },
+        { "<leader>ac", group = "comments", icon = " " },
       },
     },
   },
diff --git a/.config/nvim/lua/plugins/extras/ui/modes.lua b/.config/nvim/lua/plugins/extras/ui/modes.lua
index 1e87fb57..76ea2d97 100644
--- a/.config/nvim/lua/plugins/extras/ui/modes.lua
+++ b/.config/nvim/lua/plugins/extras/ui/modes.lua
@@ -1,16 +1,5 @@
 return {
-  {
-    "mvllow/modes.nvim",
-    event = "VeryLazy",
-    opts = {},
-  },
-  {
-    "folke/which-key.nvim",
-    optional = true,
-    opts = {
-      triggers_blacklist = {
-        n = { "d", "y" },
-      },
-    },
-  },
+  "mvllow/modes.nvim",
+  event = "VeryLazy",
+  opts = {},
 }
diff --git a/.config/nvim/lua/plugins/extras/ui/which-key-extended.lua b/.config/nvim/lua/plugins/extras/ui/which-key-extended.lua
index e6864d2b..a4515da6 100644
--- a/.config/nvim/lua/plugins/extras/ui/which-key-extended.lua
+++ b/.config/nvim/lua/plugins/extras/ui/which-key-extended.lua
@@ -7,19 +7,9 @@ return {
     layout = {
       align = "center",
     },
-    defaults = {
-      ["<leader>ci"] = { name = "info" },
-      ["<leader><tab>"] = { name = "󰓩 tabs" },
-      ["<leader>b"] = { name = "󰖯 buffer" },
-      ["<leader>c"] = { name = " code" },
-      ["<leader>f"] = { name = "󰈔 file/find" },
-      ["<leader>g"] = { name = " git" },
-      ["<leader>l"] = { name = "󰒲 lazy" },
-      ["<leader>q"] = { name = "󰗼 quit/session" },
-      ["<leader>s"] = { name = " search" },
-      ["<leader>u"] = { name = " ui" },
-      ["<leader>w"] = { name = "󱂬 windows" },
-      ["<leader>x"] = { name = "󰁨 diagnostics/quickfix" },
+    spec = {
+      { "<leader>ci", group = "info", icon = " " },
+      { "<leader>l", group = "lazy", icon = "󰒲 " },
     },
   },
 }
diff --git a/.config/nvim/lua/plugins/extras/util/icon-picker.lua b/.config/nvim/lua/plugins/extras/util/icon-picker.lua
index 7ccc7d32..49d66d08 100644
--- a/.config/nvim/lua/plugins/extras/util/icon-picker.lua
+++ b/.config/nvim/lua/plugins/extras/util/icon-picker.lua
@@ -7,7 +7,7 @@ return {
     opts = {
       disable_legacy_commands = true,
     },
-  -- stylua: ignore
+    -- stylua: ignore
     keys = {
       { "<leader>sia", "<cmd>IconPickerNormal<cr>", desc = "All" },
       { "<leader>sis", "<cmd>IconPickerNormal symbols<cr>", desc = "Symbols" },
@@ -18,8 +18,8 @@ return {
   {
     "folke/which-key.nvim",
     opts = {
-      defaults = {
-        ["<leader>si"] = { name = "icons" },
+      spec = {
+        { "<leader>si", group = "icons", icon = " " },
       },
     },
   },