Working on reshuffling

Droidnix/README.org

@@ -734,15 +734,38 @@ 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
-{ pkgs, lib, ... }:
+{ lib, pkgs, config, ... }:
 
-{
+let
-  # Option to enable Zen Browser installation
+  programName = "zenbrowser";
-  options.enableZenBrowser =
-    lib.mkEnableOption "Install Zen Browser";
 
-  config = lib.mkIf (config.enableZenBrowser or false) {
+  # Optional: path to any assets (empty here since you don't need config)
-    # Add the package system-wide
+  programAssets = ../../../assets/system/conf/${programName};
+  programFiles = builtins.readDir programAssets;
+  files = lib.genAttrs (builtins.attrNames programFiles) (name: {
+    src = "${programAssets}/${name}";
+  });
+
+  # Toggle variable referring to the module option
+  enableProgram = config.enableZenBrowser or false;
+
+in {
+  # Top-level toggle option for the module
+  options.enableZenBrowser = lib.mkEnableOption "Install Zen Browser";
+
+  # Wrap all configuration in mkIf(enable)
+  config = lib.mkIf enableProgram {
+    # myApps container
+    myApps = {
+      ${programName} = {
+        enable = true;
+        assetsDir = programAssets;
+        files = files;
+        user = config.defaultUser or "henrov";
+      };
+    };
+
+    # Install the package system-wide
     environment.systemPackages = [ pkgs.zen-browser ];
   };
 }

Droidnix/generated/modules/apps/zenbrowser.nix

@@ -1,12 +1,35 @@
-{ pkgs, lib, ... }:
+{ lib, pkgs, config, ... }:
 
-{
+let
-  # Option to enable Zen Browser installation
+  programName = "zenbrowser";
-  options.enableZenBrowser =
-    lib.mkEnableOption "Install Zen Browser";
 
-  config = lib.mkIf (config.enableZenBrowser or false) {
+  # Optional: path to any assets (empty here since you don't need config)
-    # Add the package system-wide
+  programAssets = ../../../assets/system/conf/${programName};
+  programFiles = builtins.readDir programAssets;
+  files = lib.genAttrs (builtins.attrNames programFiles) (name: {
+    src = "${programAssets}/${name}";
+  });
+
+  # Toggle variable referring to the module option
+  enableProgram = config.enableZenBrowser or false;
+
+in {
+  # Top-level toggle option for the module
+  options.enableZenBrowser = lib.mkEnableOption "Install Zen Browser";
+
+  # Wrap all configuration in mkIf(enable)
+  config = lib.mkIf enableProgram {
+    # myApps container
+    myApps = {
+      ${programName} = {
+        enable = true;
+        assetsDir = programAssets;
+        files = files;
+        user = config.defaultUser or "henrov";
+      };
+    };
+
+    # Install the package system-wide
     environment.systemPackages = [ pkgs.zen-browser ];
   };
 }