diff --git a/Droidnix/README.org b/Droidnix/README.org
index b0b302152..a92615032 100644
--- a/Droidnix/README.org
+++ b/Droidnix/README.org
@@ -1358,25 +1358,24 @@ let
   files = lib.genAttrs (builtins.attrNames zshFiles) (name: {
     src = "${zshAssets}/${name}";
   });
-
-  # Enable toggle for this program
-  enableProgram = true;
 in
 {
   # Top-level toggle for this program
   options.enableZsh =
     lib.mkEnableOption "Enable Zsh terminal with Oh-My-Zsh";
 
-  # Configuration applied only if enabled
-  config = lib.mkIf enableProgram {
+  # Wrap everything in config only if enabled
+  config = lib.mkIf (config.enableZsh or false) (let
+    # Safe reference to defaultUser inside the mkIf
+    username = config.defaultUser or "henrov";
+  in
+  {
     myApps = {
       zsh = {
         enable = true;
         assetsDir = zshAssets;
         files = files;
-
-        # Reference default user
-        user = config.defaultUser or "henrov";
+        user = username;
 
         # Zsh-specific settings
         ohMyZsh = {
@@ -1423,7 +1422,7 @@ in
         '';
       };
     };
-  };
+  ));
 }
 #+END_SRC
 
diff --git a/Droidnix/generated/modules/terminals/zsh.nix b/Droidnix/generated/modules/terminals/zsh.nix
index 5f784d816..74fcdc4b4 100644
--- a/Droidnix/generated/modules/terminals/zsh.nix
+++ b/Droidnix/generated/modules/terminals/zsh.nix
@@ -8,25 +8,24 @@ let
   files = lib.genAttrs (builtins.attrNames zshFiles) (name: {
     src = "${zshAssets}/${name}";
   });
-
-  # Enable toggle for this program
-  enableProgram = true;
 in
 {
   # Top-level toggle for this program
   options.enableZsh =
     lib.mkEnableOption "Enable Zsh terminal with Oh-My-Zsh";
 
-  # Configuration applied only if enabled
-  config = lib.mkIf enableProgram {
+  # Wrap everything in config only if enabled
+  config = lib.mkIf (config.enableZsh or false) (let
+    # Safe reference to defaultUser inside the mkIf
+    username = config.defaultUser or "henrov";
+  in
+  {
     myApps = {
       zsh = {
         enable = true;
         assetsDir = zshAssets;
         files = files;
-
-        # Reference default user
-        user = config.defaultUser or "henrov";
+        user = username;
 
         # Zsh-specific settings
         ohMyZsh = {
@@ -73,5 +72,5 @@ in
         '';
       };
     };
-  };
+  ));
 }