diff --git a/home-manager/sajenim/features/editors/default.nix b/home-manager/sajenim/features/editors/default.nix
index e4f97aa..0b7d463 100644
--- a/home-manager/sajenim/features/editors/default.nix
+++ b/home-manager/sajenim/features/editors/default.nix
@@ -22,6 +22,7 @@
       (buildIdeWithPlugins pkgs.jetbrains "idea-community" [
         "IdeaVIM"
         "gruvbox-material-dark"
+        "eu.theblob42.idea.whichkey"
       ])
     ]); # https://github.com/theCapypara/nix-jetbrains-plugins
 
diff --git a/home-manager/sajenim/features/editors/ideavimrc b/home-manager/sajenim/features/editors/ideavimrc
index 317e424..1d1afbc 100644
--- a/home-manager/sajenim/features/editors/ideavimrc
+++ b/home-manager/sajenim/features/editors/ideavimrc
@@ -1,3 +1,16 @@
+" some general configuration options
 set number
 set relativenumber
 set clipboard=unnamedplus
+
+" disable the timeout option
+set notimeout
+" enable which-key
+set which-key
+
+" required by vim-commentary
+filetype plugin indent on
+
+" install some plugins
+Plug 'tpope/vim-commentary'
+Plug 'tpope/vim-surround'