diff --git a/Droidnix/README.org b/Droidnix/README.org index c528b6882..09c53a6b5 100644 --- a/Droidnix/README.org +++ b/Droidnix/README.org @@ -783,16 +783,25 @@ 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 # ./generated/modules/apps/zenbrowser.nix -{ pkgs, lib, ... }: +{ lib, ... }: +let + # Import the Zen Browser flake directly + zenBrowserFlake = import (builtins.fetchTarball { + url = "https://github.com/youwen5/zen-browser-flake/archive/refs/heads/main.tar.gz"; + }) {}; +in { - # Declare the option to enable Zen Browser + # Module option to enable Zen Browser options.mySystem.apps.zenBrowser.enable = lib.mkEnableOption "Enable Zen Browser"; - # Top-level config, fully self-contained - config = { config, ... }: lib.mkIf (config.mySystem.apps.zenBrowser.enable) { - environment.systemPackages = [ pkgs.zen-browser ]; + # Top-level config using dendritic pattern + config = { config, pkgs, ... }: lib.mkIf (config.mySystem.apps.zenBrowser.enable) { + # Add Zen Browser to system packages + environment.systemPackages = [ + zenBrowserFlake.packages.x86_64-linux.zen-browser + ]; }; } #+END_SRC diff --git a/Droidnix/generated/modules/apps/zenbrowser.nix b/Droidnix/generated/modules/apps/zenbrowser.nix index a0d948adb..f78548203 100644 --- a/Droidnix/generated/modules/apps/zenbrowser.nix +++ b/Droidnix/generated/modules/apps/zenbrowser.nix @@ -1,13 +1,22 @@ # ./generated/modules/apps/zenbrowser.nix -{ pkgs, lib, ... }: +{ lib, ... }: +let + # Import the Zen Browser flake directly + zenBrowserFlake = import (builtins.fetchTarball { + url = "https://github.com/youwen5/zen-browser-flake/archive/refs/heads/main.tar.gz"; + }) {}; +in { - # Declare the option to enable Zen Browser + # Module option to enable Zen Browser options.mySystem.apps.zenBrowser.enable = lib.mkEnableOption "Enable Zen Browser"; - # Top-level config, fully self-contained - config = { config, ... }: lib.mkIf (config.mySystem.apps.zenBrowser.enable) { - environment.systemPackages = [ pkgs.zen-browser ]; + # Top-level config using dendritic pattern + config = { config, pkgs, ... }: lib.mkIf (config.mySystem.apps.zenBrowser.enable) { + # Add Zen Browser to system packages + environment.systemPackages = [ + zenBrowserFlake.packages.x86_64-linux.zen-browser + ]; }; }