From 99e792b69ac9e8de55cfd63686ab6beee4d58de0 Mon Sep 17 00:00:00 2001 From: "info@data-pro.nu" Date: Wed, 18 Mar 2026 18:49:44 +0000 Subject: [PATCH] Reshuffling stuff --- Droidnix/README.org | 10 +++++++--- Droidnix/generated/modules/apps/packages.nix | 10 +++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/Droidnix/README.org b/Droidnix/README.org index a5f77381f..99f684018 100644 --- a/Droidnix/README.org +++ b/Droidnix/README.org @@ -768,10 +768,10 @@ This is top file of this level which contains just an import statement for all r ** =generated/modules/apps/packages.nix= This will import all packages listed in ./assets/system/apps/packages.conf #+BEGIN_SRC nix :tangle generated/modules/apps/packages.nix :noweb tangle :mkdirp yes :eval never-html -{ config, pkgs, lib, inputs, ... }: +{ config, lib, pkgs, ... }: let - # Gebruik een relatief pad, geen flakeRoot + # Gebruik relatieve pad binnen module packagesConfPath = ../../../assets/system/apps/packages.conf; raw = builtins.readFile packagesConfPath; @@ -808,7 +808,11 @@ let in { - environment.systemPackages = packages ; + options.mySystem.system.packages.enable = lib.mkEnableOption "Enable packages from packages.conf"; + + config = lib.mkIf (config.mySystem.system.packages.enable or false) { + environment.systemPackages = packages; + }; } #+END_SRC diff --git a/Droidnix/generated/modules/apps/packages.nix b/Droidnix/generated/modules/apps/packages.nix index 6a5b728d8..ec62c282f 100644 --- a/Droidnix/generated/modules/apps/packages.nix +++ b/Droidnix/generated/modules/apps/packages.nix @@ -1,7 +1,7 @@ -{ config, pkgs, lib, inputs, ... }: +{ config, lib, pkgs, ... }: let - # Gebruik een relatief pad, geen flakeRoot + # Gebruik relatieve pad binnen module packagesConfPath = ../../../assets/system/apps/packages.conf; raw = builtins.readFile packagesConfPath; @@ -38,5 +38,9 @@ let in { - environment.systemPackages = packages ; + options.mySystem.system.packages.enable = lib.mkEnableOption "Enable packages from packages.conf"; + + config = lib.mkIf (config.mySystem.system.packages.enable or false) { + environment.systemPackages = packages; + }; }