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

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

diff --git a/Droidnix/README.org b/Droidnix/README.org
index 7ca66fe46..ea44a2d01 100644
--- a/Droidnix/README.org
+++ b/Droidnix/README.org
@@ -782,9 +782,11 @@ 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
-# ./modules/apps/zen-browser.nix
-{ lib, ... }:
+{ config, pkgs, lib, ... }:
 
+let
+  username = "henrov"; # optional, if you want user-specific stuff
+in
 {
   options.mySystem = {
     apps = {
@@ -799,9 +801,9 @@ This is top file of this level which contains just an import statement for all r
     };
   };
 
+  # This is now evaluated with config in scope
   config = lib.mkIf (config.mySystem.apps.zenBrowser.enable) {
-    # Here you could set Home Manager packages or system packages
-    environment.systemPackages = [ (import <nixpkgs> {}).zen-browser ];
+    environment.systemPackages = [ pkgs.zen-browser ];
   };
 }
 #+END_SRC
diff --git a/Droidnix/generated/modules/apps/zenbrowser.nix b/Droidnix/generated/modules/apps/zenbrowser.nix
index 5b53a3ca9..61a1ff1c2 100644
--- a/Droidnix/generated/modules/apps/zenbrowser.nix
+++ b/Droidnix/generated/modules/apps/zenbrowser.nix
@@ -1,6 +1,8 @@
-# ./modules/apps/zen-browser.nix
-{ lib, ... }:
+{ config, pkgs, lib, ... }:
 
+let
+  username = "henrov"; # optional, if you want user-specific stuff
+in
 {
   options.mySystem = {
     apps = {
@@ -15,8 +17,8 @@
     };
   };
 
+  # This is now evaluated with config in scope
   config = lib.mkIf (config.mySystem.apps.zenBrowser.enable) {
-    # Here you could set Home Manager packages or system packages
-    environment.systemPackages = [ (import <nixpkgs> {}).zen-browser ];
+    environment.systemPackages = [ pkgs.zen-browser ];
   };
 }