diff --git a/modules/utility/binds/which-key.nix b/modules/utility/binds/which-key.nix
index ef9fdf6..ce65134 100644
--- a/modules/utility/binds/which-key.nix
+++ b/modules/utility/binds/which-key.nix
@@ -15,6 +15,35 @@ in {
   config = mkIf (cfg.enable) {
     vim.startPlugins = ["which-key"];
 
-    vim.luaConfigRC.whichkey = nvim.dag.entryAnywhere ''local wk = require("which-key").setup {}'';
+    vim.luaConfigRC.whichkey = nvim.dag.entryAnywhere ''
+      require("which-key").setup {}
+
+      local wk = require("which-key")
+      wk.register({
+        ["<leader>b"] = { name = "+Buffer" },
+        ["<leader>c"] = { name = "+CodeAction" },
+        ["<leader>b"] = { name = "+Buffer" },
+        ["<leader>f"] = { name = "+Telescope" },
+        ["<leader>m"] = { name = "+Minimap" },
+        ["<leader>o"] = { name = "+Notes" },
+        ["<leader>t"] = { name = "+NvimTree" },
+        ["<leader>x"] = { name = "+Trouble" }, -- TODO: move all trouble binds to the same parent group
+        ["<leader>l"] = { name = "+Trouble" },
+
+        -- Buffer
+        ["<leader>bm"] = { name = "BufferLineMove" },
+        ["<leader>bm"] = { name = "BufferLineSort" },
+
+        -- Telescope
+        ["<leader>fl"] = { name = "Telescope LSP" },
+        ["<leader>fm"] = { name = "Cellular Automaton" }, -- TODO: mvoe this to its own parent group
+        ["<leader>fv"] = { name = "Telescope Git" },
+        ["<leader>fvc"] = { name = "Commits" },
+
+        -- Trouble
+        ["<leader>lw"] = { name = "Workspace" },
+      })
+
+    '';
   };
 }