Working on reshuffling

Droidnix/README.org

@@ -734,7 +734,7 @@ in
 ** =generated/modules/apps/zenbrowser.nix=
 This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder
 #+BEGIN_SRC nix :tangle generated/modules/apps/zenbrowser.nix :noweb tangle :mkdirp yes :eval never-html
-{ lib, flakeRoot, pkgs, ... }:
+{ lib, pkgs, ... }:
 
 let
   programName = "zenbrowser";
@@ -744,17 +744,22 @@ let
     src = "${programAssets}/${name}";
   });
 in
+
+# The module itself must be a function of config/lib/pkgs
+{ config, pkgs, lib, ... }:
+
+let
+  # toggle variable based on module option
+  enableProgram = config.myApps.${programName}.enable or false;
+  username = config.defaultUser or "henrov";
+in
 {
-  # Top-level toggle option (just use a literal quoted key)
+  options.myApps.${programName}.enable =
-  "enableZenbrowser" = lib.mkEnableOption "Enable Zen Browser";
+    lib.mkEnableOption "Enable Zen Browser";
 
-  # Configuration (must be a function so `config` exists)
+  config = lib.mkIf enableProgram {
-  config = { config, pkgs, ... }: let
-    enableProgram = config."enableZenbrowser" or false;
-    username = config.defaultUser or "henrov";
-  in lib.mkIf enableProgram {
 
-    # Dendritic container
+    # myApps container
     myApps = {
       ${programName} = {
         enable = true;
@@ -764,7 +769,7 @@ in
       };
     };
 
-    # Home Manager user config
+    # Home Manager user
     home-manager.users.${username} = {
       home.stateVersion = "26.05";
       home.username = username;

Droidnix/generated/modules/apps/zenbrowser.nix

@@ -1,4 +1,4 @@
-{ lib, flakeRoot, pkgs, ... }:
+{ lib, pkgs, ... }:
 
 let
   programName = "zenbrowser";
@@ -8,17 +8,22 @@ let
     src = "${programAssets}/${name}";
   });
 in
+
+# The module itself must be a function of config/lib/pkgs
+{ config, pkgs, lib, ... }:
+
+let
+  # toggle variable based on module option
+  enableProgram = config.myApps.${programName}.enable or false;
+  username = config.defaultUser or "henrov";
+in
 {
-  # Top-level toggle option (just use a literal quoted key)
+  options.myApps.${programName}.enable =
-  "enableZenbrowser" = lib.mkEnableOption "Enable Zen Browser";
+    lib.mkEnableOption "Enable Zen Browser";
 
-  # Configuration (must be a function so `config` exists)
+  config = lib.mkIf enableProgram {
-  config = { config, pkgs, ... }: let
-    enableProgram = config."enableZenbrowser" or false;
-    username = config.defaultUser or "henrov";
-  in lib.mkIf enableProgram {
 
-    # Dendritic container
+    # myApps container
     myApps = {
       ${programName} = {
         enable = true;
@@ -28,7 +33,7 @@ in
       };
     };
 
-    # Home Manager user config
+    # Home Manager user
     home-manager.users.${username} = {
       home.stateVersion = "26.05";
       home.username = username;