Working on reshuffling

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,15 +1316,12 @@ 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 = {
-        enable = true;
-        enableCompletion = true;
+  config = lib.mkIf (config.mySystem.terminals.zsh.enable or false) {
+    home-manager.users.${username} = {
+      programs.zsh.enable = true;
+      programs.zsh.enableCompletion = true;
 
-        ohMyZsh = {
+      programs.zsh.ohMyZsh = {
         enable = true;
         theme = "catppuccin-mocha";
         plugins = [
@@ -1338,7 +1335,7 @@ in
         ];
       };
 
-        initExtra = ''
+      programs.zsh.initExtra = ''
         # Catppuccin Mocha kleuren
         local mocha_base="#1E1E2E"
         local mocha_surface0="#313244"
@@ -1362,7 +1359,6 @@ in
       '';
     };
   };
-  };
 }
 #+END_SRC
 

Droidnix/generated/modules/terminals/zsh.nix

@@ -7,15 +7,12 @@ 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 = {
-        enable = true;
-        enableCompletion = true;
+  config = lib.mkIf (config.mySystem.terminals.zsh.enable or false) {
+    home-manager.users.${username} = {
+      programs.zsh.enable = true;
+      programs.zsh.enableCompletion = true;
 
-        ohMyZsh = {
+      programs.zsh.ohMyZsh = {
         enable = true;
         theme = "catppuccin-mocha";
         plugins = [
@@ -29,7 +26,7 @@ in
         ];
       };
 
-        initExtra = ''
+      programs.zsh.initExtra = ''
         # Catppuccin Mocha kleuren
         local mocha_base="#1E1E2E"
         local mocha_surface0="#313244"
@@ -53,5 +50,4 @@ in
       '';
     };
   };
-  };
 }