diff --git a/homes/x86_64-linux/rafiq/default.nix b/homes/x86_64-linux/rafiq/default.nix
index 9a5f5e6..2ed815c 100644
--- a/homes/x86_64-linux/rafiq/default.nix
+++ b/homes/x86_64-linux/rafiq/default.nix
@@ -5,7 +5,8 @@
 }:
 {
   cli.shell = "zsh";
-  cli.enableScreensaver = true;
+  cli.screensaver.enable = true;
+  cli.screensaver.timeout = "10";
   cli.editor = "nvf";
   cli.file-browser = "yazi";
   cli.multiplexer = "zellij";
diff --git a/modules/home/cli/default.nix b/modules/home/cli/default.nix
index 86b9538..911fd2b 100644
--- a/modules/home/cli/default.nix
+++ b/modules/home/cli/default.nix
@@ -7,7 +7,8 @@
 {
   options.cli = {
     shell = lib.pantheon.mkStrOption;
-    enableScreensaver = lib.mkEnableOption "";
+    screensaver.enable = lib.mkEnableOption "";
+    screensaver.timeout = lib.pantheon.mkStrOption;
     editor = lib.pantheon.mkStrOption;
     file-browser = lib.pantheon.mkStrOption;
     multiplexer = lib.pantheon.mkStrOption;
diff --git a/modules/home/cli/shell/default.nix b/modules/home/cli/shell/default.nix
index 353d9fe..425499b 100644
--- a/modules/home/cli/shell/default.nix
+++ b/modules/home/cli/shell/default.nix
@@ -17,7 +17,7 @@
         size = 10000;
       };
     };
-    programs.zsh.initContent = lib.mkIf config.cli.enableScreensaver (
+    programs.zsh.initContent = lib.mkIf config.cli.screensaver.enable (
       lib.mkOrder 1200
         # zsh
         ''
@@ -25,9 +25,10 @@
           PROMPT='> '
           RPROMPT='[%D{%L:%M:%S %p}]'
 
-          TMOUT=10
+          TMOUT=${config.cli.screensaver.timeout}
 
           TRAPALRM() {
+              PROMPT='IDLE > '
               zle reset-prompt
           }
         ''