diff --git a/.config/nvim/nvim-pack-lock.json b/.config/nvim/nvim-pack-lock.json
--- a/.config/nvim/nvim-pack-lock.json
+++ b/.config/nvim/nvim-pack-lock.json
@@ -93,6 +93,10 @@
       "rev": "6264451f14119d63a52580e5198d6baf8518b0b2",
       "src": "https://github.com/rachartier/tiny-inline-diagnostic.nvim"
     },
+    "which-key.nvim": {
+      "rev": "3aab2147e74890957785941f0c1ad87d0a44c15a",
+      "src": "https://github.com/folke/which-key.nvim"
+    },
     "whisk.nvim": {
       "rev": "a5d122ed7c08dcb8366ddc58b44df9458a263d23",
       "src": "https://github.com/josstei/whisk.nvim"
diff --git a/.config/nvim/plugin/which-key.lua b/.config/nvim/plugin/which-key.lua
new file mode 100644
--- /dev/null
+++ b/.config/nvim/plugin/which-key.lua
@@ -0,0 +1,10 @@
+vim.api.nvim_create_autocmd("VimEnter", {
+  once = true,
+  callback = function()
+    vim.pack.add({ "https://github.com/folke/which-key.nvim" })
+    require("which-key").setup({
+      preset = "helix",
+      icons = { mappings = false },
+    })
+  end,
+})
diff --git a/.config/nvim/lua/config/keymaps.lua b/.config/nvim/lua/config/keymaps.lua
--- a/.config/nvim/lua/config/keymaps.lua
+++ b/.config/nvim/lua/config/keymaps.lua
@@ -1,19 +1,20 @@
 local map = vim.keymap.set
+local del = vim.keymap.del
 
 -- exit insert mode by double tapping `j`
 map("i", "jj", "<esc>")
 
 -- quick inspect
-map("n", "<leader>ui", "<cmd>Inspect<cr>")
+map("n", "<leader>ui", "<cmd>Inspect<cr>", { desc = "Inspect" })
 
 -- select all
-map("n", "<C-a>", "gg<S-v>G")
+map("n", "<C-a>", "gg<S-v>G", { desc = "Select all" })
 
 -- open diagnostic
-map("n", "<leader>xe", vim.diagnostic.open_float)
+map("n", "<leader>xe", vim.diagnostic.open_float, { desc = "Open diagnostic" })
 
 -- quick restart
-map("n", "<leader>rr", "<cmd>restart<cr>")
+map("n", "<leader>rr", "<cmd>restart<cr>", { desc = "Restart Neovim" })
 
 -- save file
 map({ "i", "x", "n", "s" }, "<C-s>", "<cmd>silent! write<cr><esc>")
@@ -33,12 +34,12 @@
 map("v", "<A-s>", ":'<,'>sort<cr>")
 
 -- add pipe operator
-map("i", "<M-p>", "<C-o>A<C-j>|> ")
+map("i", "<M-p>", "<C-o>A<C-j>|> ", { desc = "Add pipe operator" })
 
 -- delete buffer
-map("n", "<leader>bd", "<cmd>bdelete<cr>")
-map("n", "<S-l>", "<cmd>bnext<cr>")
-map("n", "<S-h>", "<cmd>bprev<cr>")
+map("n", "<leader>bd", "<cmd>bdelete<cr>", { desc = "Delete current buffer" })
+map("n", "<S-l>", "<cmd>bnext<cr>", { desc = "Next buffer" })
+map("n", "<S-h>", "<cmd>bprev<cr>", { desc = "Previous buffer" })
 
 -- better up/down
 map(