Reshuffling stuff
This commit is contained in:
+7
-3
@@ -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=
|
** =generated/modules/apps/packages.nix=
|
||||||
This will import all packages listed in ./assets/system/apps/packages.conf
|
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
|
#+BEGIN_SRC nix :tangle generated/modules/apps/packages.nix :noweb tangle :mkdirp yes :eval never-html
|
||||||
{ config, pkgs, lib, inputs, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
# Gebruik een relatief pad, geen flakeRoot
|
# Gebruik relatieve pad binnen module
|
||||||
packagesConfPath = ../../../assets/system/apps/packages.conf;
|
packagesConfPath = ../../../assets/system/apps/packages.conf;
|
||||||
|
|
||||||
raw = builtins.readFile packagesConfPath;
|
raw = builtins.readFile packagesConfPath;
|
||||||
@@ -808,7 +808,11 @@ let
|
|||||||
|
|
||||||
in
|
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
|
#+END_SRC
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{ config, pkgs, lib, inputs, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
# Gebruik een relatief pad, geen flakeRoot
|
# Gebruik relatieve pad binnen module
|
||||||
packagesConfPath = ../../../assets/system/apps/packages.conf;
|
packagesConfPath = ../../../assets/system/apps/packages.conf;
|
||||||
|
|
||||||
raw = builtins.readFile packagesConfPath;
|
raw = builtins.readFile packagesConfPath;
|
||||||
@@ -38,5 +38,9 @@ let
|
|||||||
|
|
||||||
in
|
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;
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user