Working on reshuffling

Droidnix/README.org

@@ -1307,12 +1307,15 @@ in
 ** =generated/modules/terminals/zsh.nix=
 This sets up the zsh in the terminal
 #+BEGIN_SRC nix :tangle generated/modules/terminals/zsh.nix :noweb tangle :mkdirp yes :eval never-html
+# terminals/zsh.nix
 { lib, pkgs, ... }:
 
-flake.nixosModules.zsh = { config, pkgs, lib, ... }: let
+let
   username = "henrov";
 in
 {
+  # Export as a flake module
+  zsh = { config, pkgs, lib, ... }: {
     options.mySystem.terminals.zsh.enable =
       lib.mkEnableOption "Enable Zsh terminal with Oh-My-Zsh";
 
@@ -1365,6 +1368,7 @@ in
         '';
       };
     };
+  };
 }
 #+END_SRC
 

Droidnix/generated/modules/terminals/zsh.nix

@@ -1,9 +1,12 @@
+# terminals/zsh.nix
 { lib, pkgs, ... }:
 
-flake.nixosModules.zsh = { config, pkgs, lib, ... }: let
+let
   username = "henrov";
 in
 {
+  # Export as a flake module
+  zsh = { config, pkgs, lib, ... }: {
     options.mySystem.terminals.zsh.enable =
       lib.mkEnableOption "Enable Zsh terminal with Oh-My-Zsh";
 
@@ -56,4 +59,5 @@ in
         '';
       };
     };
+  };
 }