diff --git a/home/vim/default.nix b/home/vim/default.nix
index 9ef28a0..a15ad6a 100644
--- a/home/vim/default.nix
+++ b/home/vim/default.nix
@@ -68,6 +68,9 @@ in
       null-ls-nvim # LSP integration for linters and formatters
       (nvim-treesitter.withPlugins (_: pkgs.tree-sitter.allGrammars)) # Better highlighting
       plenary-nvim # 'null-ls' dependency
+
+      # UX improvements
+      which-key-nvim # Show available mappings
     ];
 
     extraConfig = builtins.readFile ./init.vim;
diff --git a/home/vim/plugin/settings/which-key.vim b/home/vim/plugin/settings/which-key.vim
new file mode 100644
index 0000000..505bdc4
--- /dev/null
+++ b/home/vim/plugin/settings/which-key.vim
@@ -0,0 +1,4 @@
+lua << EOF
+local wk = require("which-key")
+wk.setup()
+EOF