From a58b6e1751c6e71ef87d799b1fe9c3fec4035fb2 Mon Sep 17 00:00:00 2001
From: "info@data-pro.nu" <info@data-pro.nu>
Date: Thu, 19 Mar 2026 07:25:46 +0000
Subject: [PATCH] Working on reshuffling

---
 Droidnix/README.org                           | 22 ++++++++++++++-----
 .../generated/modules/apps/zenbrowser.nix     | 22 ++++++++++++++-----
 2 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/Droidnix/README.org b/Droidnix/README.org
index 060da8d60..7ca66fe46 100644
--- a/Droidnix/README.org
+++ b/Droidnix/README.org
@@ -783,16 +783,26 @@ in
 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
 # ./modules/apps/zen-browser.nix
-{ lib, config, ... }:
+{ lib, ... }:
 
 {
-  mySystem = {
-    apps.zenBrowser = {
-      enable = true;
-      # just store symbolic info, no direct pkgs reference
-      packageRef = "zen-browser";
+  options.mySystem = {
+    apps = {
+      zenBrowser = {
+        enable = lib.mkEnableOption "Enable Zen Browser";
+        packageRef = lib.mkOption {
+          type = lib.types.str;
+          default = "zen-browser";
+          description = "Package reference for Zen Browser";
+        };
+      };
     };
   };
+
+  config = lib.mkIf (config.mySystem.apps.zenBrowser.enable) {
+    # Here you could set Home Manager packages or system packages
+    environment.systemPackages = [ (import <nixpkgs> {}).zen-browser ];
+  };
 }
 #+END_SRC
 
diff --git a/Droidnix/generated/modules/apps/zenbrowser.nix b/Droidnix/generated/modules/apps/zenbrowser.nix
index dca8aeb42..5b53a3ca9 100644
--- a/Droidnix/generated/modules/apps/zenbrowser.nix
+++ b/Droidnix/generated/modules/apps/zenbrowser.nix
@@ -1,12 +1,22 @@
 # ./modules/apps/zen-browser.nix
-{ lib, config, ... }:
+{ lib, ... }:
 
 {
-  mySystem = {
-    apps.zenBrowser = {
-      enable = true;
-      # just store symbolic info, no direct pkgs reference
-      packageRef = "zen-browser";
+  options.mySystem = {
+    apps = {
+      zenBrowser = {
+        enable = lib.mkEnableOption "Enable Zen Browser";
+        packageRef = lib.mkOption {
+          type = lib.types.str;
+          default = "zen-browser";
+          description = "Package reference for Zen Browser";
+        };
+      };
     };
   };
+
+  config = lib.mkIf (config.mySystem.apps.zenBrowser.enable) {
+    # Here you could set Home Manager packages or system packages
+    environment.systemPackages = [ (import <nixpkgs> {}).zen-browser ];
+  };
 }