Working on reshuffling

Droidnix/README.org

@@ -734,48 +734,16 @@ 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, pkgs, ... }:
+{ pkgs, lib, ... }:
 
-let
-  programName = "zenbrowser";
-  programAssets = ../../../assets/system/conf/${programName};
-  programFiles = builtins.readDir programAssets;
-  files = lib.genAttrs (builtins.attrNames programFiles) (name: {
-    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
 {
-  options.myApps.${programName}.enable =
+  # Option to enable Zen Browser installation
-    lib.mkEnableOption "Enable Zen Browser";
+  options.enableZenBrowser =
+    lib.mkEnableOption "Install Zen Browser";
 
-  config = lib.mkIf enableProgram {
+  config = lib.mkIf (config.enableZenBrowser or false) {
-
+    # Add the package system-wide
-    # myApps container
+    environment.systemPackages = [ pkgs.zen-browser ];
-    myApps = {
-      ${programName} = {
-        enable = true;
-        assetsDir = programAssets;
-        files = files;
-        user = username;
-      };
-    };
-
-    # Home Manager user
-    home-manager.users.${username} = {
-      home.stateVersion = "26.05";
-      home.username = username;
-      home.homeDirectory = "/home/${username}";
-      home.packages = [ pkgs.zen-browser ];
-    };
   };
 }
 #+END_SRC

Droidnix/generated/modules/apps/zenbrowser.nix

@@ -1,44 +1,12 @@
-{ lib, pkgs, ... }:
+{ pkgs, lib, ... }:
 
-let
-  programName = "zenbrowser";
-  programAssets = ../../../assets/system/conf/${programName};
-  programFiles = builtins.readDir programAssets;
-  files = lib.genAttrs (builtins.attrNames programFiles) (name: {
-    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
 {
-  options.myApps.${programName}.enable =
+  # Option to enable Zen Browser installation
-    lib.mkEnableOption "Enable Zen Browser";
+  options.enableZenBrowser =
+    lib.mkEnableOption "Install Zen Browser";
 
-  config = lib.mkIf enableProgram {
+  config = lib.mkIf (config.enableZenBrowser or false) {
-
+    # Add the package system-wide
-    # myApps container
+    environment.systemPackages = [ pkgs.zen-browser ];
-    myApps = {
-      ${programName} = {
-        enable = true;
-        assetsDir = programAssets;
-        files = files;
-        user = username;
-      };
-    };
-
-    # Home Manager user
-    home-manager.users.${username} = {
-      home.stateVersion = "26.05";
-      home.username = username;
-      home.homeDirectory = "/home/${username}";
-      home.packages = [ pkgs.zen-browser ];
-    };
   };
 }