diff --git a/Droidnix/README.org b/Droidnix/README.org
index 34176e92e..09f35740c 100644
--- a/Droidnix/README.org
+++ b/Droidnix/README.org
@@ -1305,7 +1305,7 @@ in
 #+END_SRC
 
 ** =generated/modules/terminals/zsh.nix=
-This sets up the zsh terminal
+This sets up the zsh in the  terminal
 #+BEGIN_SRC nix :tangle generated/modules/terminals/zsh.nix :noweb tangle :mkdirp yes :eval never-html
 { lib, pkgs, ... }:
 
@@ -1316,51 +1316,47 @@ in
   options.mySystem.terminals.zsh.enable =
     lib.mkEnableOption "Enable Zsh terminal with Oh-My-Zsh";
 
-  # Let op: config komt van NixOS module args, niet top-level
-  config = {
-    # mkIf kan hier veilig config.mySystem gebruiken
-    home-manager.users.${username} = lib.mkIf (config.mySystem.terminals.zsh.enable or false) {
-      programs.zsh = {
+  config = lib.mkIf (config.mySystem.terminals.zsh.enable or false) {
+    home-manager.users.${username} = {
+      programs.zsh.enable = true;
+      programs.zsh.enableCompletion = true;
+
+      programs.zsh.ohMyZsh = {
         enable = true;
-        enableCompletion = true;
-
-        ohMyZsh = {
-          enable = true;
-          theme = "catppuccin-mocha";
-          plugins = [
-            "git"
-            "docker"
-            "direnv"
-            "zsh-autosuggestions"
-            "zsh-completions"
-            "zsh-history-substring-search"
-            "zsh-syntax-highlighting"
-          ];
-        };
-
-        initExtra = ''
-          # Catppuccin Mocha kleuren
-          local mocha_base="#1E1E2E"
-          local mocha_surface0="#313244"
-          local mocha_text="#CDD6F4"
-          local mocha_lavender="#B4BEFE"
-          local mocha_blue="#89B4FA"
-          local mocha_sapphire="#74C7EC"
-          local mocha_teal="#94D2D5"
-          local mocha_green="#A6E3A1"
-          local mocha_yellow="#F9E2AF"
-          local mocha_peach="#FAB387"
-          local mocha_maroon="#EBA0AC"
-          local mocha_red="#F38BA8"
-          local mocha_mauve="#CBA6F7"
-          local mocha_pink="#F5E2C7"
-          local mocha_flamingo="#F2CDCD"
-          local mocha_rosewater="#F5E0DC"
-
-          PROMPT='%{$fg[$mocha_blue]%}%n%{$reset_color%}@%{$fg[$mocha_peach]%}%m%{$reset_color%} %{$fg[$mocha_lavender]%}%~%{$reset_color%} %{$fg[$mocha_red]%}$%{$reset_color%} '
-          RPROMPT='%{$fg[$mocha_green]%}%T%{$reset_color%}'
-        '';
+        theme = "catppuccin-mocha";
+        plugins = [
+          "git"
+          "docker"
+          "direnv"
+          "zsh-autosuggestions"
+          "zsh-completions"
+          "zsh-history-substring-search"
+          "zsh-syntax-highlighting"
+        ];
       };
+
+      programs.zsh.initExtra = ''
+        # Catppuccin Mocha kleuren
+        local mocha_base="#1E1E2E"
+        local mocha_surface0="#313244"
+        local mocha_text="#CDD6F4"
+        local mocha_lavender="#B4BEFE"
+        local mocha_blue="#89B4FA"
+        local mocha_sapphire="#74C7EC"
+        local mocha_teal="#94D2D5"
+        local mocha_green="#A6E3A1"
+        local mocha_yellow="#F9E2AF"
+        local mocha_peach="#FAB387"
+        local mocha_maroon="#EBA0AC"
+        local mocha_red="#F38BA8"
+        local mocha_mauve="#CBA6F7"
+        local mocha_pink="#F5E2C7"
+        local mocha_flamingo="#F2CDCD"
+        local mocha_rosewater="#F5E0DC"
+
+        PROMPT='%{$fg[$mocha_blue]%}%n%{$reset_color%}@%{$fg[$mocha_peach]%}%m%{$reset_color%} %{$fg[$mocha_lavender]%}%~%{$reset_color%} %{$fg[$mocha_red]%}$%{$reset_color%} '
+        RPROMPT='%{$fg[$mocha_green]%}%T%{$reset_color%}'
+      '';
     };
   };
 }
diff --git a/Droidnix/generated/modules/terminals/zsh.nix b/Droidnix/generated/modules/terminals/zsh.nix
index 4f29fdf64..88f8cb1d3 100644
--- a/Droidnix/generated/modules/terminals/zsh.nix
+++ b/Droidnix/generated/modules/terminals/zsh.nix
@@ -7,51 +7,47 @@ in
   options.mySystem.terminals.zsh.enable =
     lib.mkEnableOption "Enable Zsh terminal with Oh-My-Zsh";
 
-  # Let op: config komt van NixOS module args, niet top-level
-  config = {
-    # mkIf kan hier veilig config.mySystem gebruiken
-    home-manager.users.${username} = lib.mkIf (config.mySystem.terminals.zsh.enable or false) {
-      programs.zsh = {
+  config = lib.mkIf (config.mySystem.terminals.zsh.enable or false) {
+    home-manager.users.${username} = {
+      programs.zsh.enable = true;
+      programs.zsh.enableCompletion = true;
+
+      programs.zsh.ohMyZsh = {
         enable = true;
-        enableCompletion = true;
-
-        ohMyZsh = {
-          enable = true;
-          theme = "catppuccin-mocha";
-          plugins = [
-            "git"
-            "docker"
-            "direnv"
-            "zsh-autosuggestions"
-            "zsh-completions"
-            "zsh-history-substring-search"
-            "zsh-syntax-highlighting"
-          ];
-        };
-
-        initExtra = ''
-          # Catppuccin Mocha kleuren
-          local mocha_base="#1E1E2E"
-          local mocha_surface0="#313244"
-          local mocha_text="#CDD6F4"
-          local mocha_lavender="#B4BEFE"
-          local mocha_blue="#89B4FA"
-          local mocha_sapphire="#74C7EC"
-          local mocha_teal="#94D2D5"
-          local mocha_green="#A6E3A1"
-          local mocha_yellow="#F9E2AF"
-          local mocha_peach="#FAB387"
-          local mocha_maroon="#EBA0AC"
-          local mocha_red="#F38BA8"
-          local mocha_mauve="#CBA6F7"
-          local mocha_pink="#F5E2C7"
-          local mocha_flamingo="#F2CDCD"
-          local mocha_rosewater="#F5E0DC"
-
-          PROMPT='%{$fg[$mocha_blue]%}%n%{$reset_color%}@%{$fg[$mocha_peach]%}%m%{$reset_color%} %{$fg[$mocha_lavender]%}%~%{$reset_color%} %{$fg[$mocha_red]%}$%{$reset_color%} '
-          RPROMPT='%{$fg[$mocha_green]%}%T%{$reset_color%}'
-        '';
+        theme = "catppuccin-mocha";
+        plugins = [
+          "git"
+          "docker"
+          "direnv"
+          "zsh-autosuggestions"
+          "zsh-completions"
+          "zsh-history-substring-search"
+          "zsh-syntax-highlighting"
+        ];
       };
+
+      programs.zsh.initExtra = ''
+        # Catppuccin Mocha kleuren
+        local mocha_base="#1E1E2E"
+        local mocha_surface0="#313244"
+        local mocha_text="#CDD6F4"
+        local mocha_lavender="#B4BEFE"
+        local mocha_blue="#89B4FA"
+        local mocha_sapphire="#74C7EC"
+        local mocha_teal="#94D2D5"
+        local mocha_green="#A6E3A1"
+        local mocha_yellow="#F9E2AF"
+        local mocha_peach="#FAB387"
+        local mocha_maroon="#EBA0AC"
+        local mocha_red="#F38BA8"
+        local mocha_mauve="#CBA6F7"
+        local mocha_pink="#F5E2C7"
+        local mocha_flamingo="#F2CDCD"
+        local mocha_rosewater="#F5E0DC"
+
+        PROMPT='%{$fg[$mocha_blue]%}%n%{$reset_color%}@%{$fg[$mocha_peach]%}%m%{$reset_color%} %{$fg[$mocha_lavender]%}%~%{$reset_color%} %{$fg[$mocha_red]%}$%{$reset_color%} '
+        RPROMPT='%{$fg[$mocha_green]%}%T%{$reset_color%}'
+      '';
     };
   };
 }