Reshuffling stuff

This commit is contained in:
2026-03-18 18:52:53 +00:00
parent 99e792b69a
commit 9fcb5c8c08
2 changed files with 60 additions and 46 deletions
+14 -7
View File
@@ -768,12 +768,13 @@ 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, lib, pkgs, ... }:
{ lib, ... }:
let
# Gebruik relatieve pad binnen module
packagesConfPath = ../../../assets/system/apps/packages.conf;
# --- Path naar je packages.conf, relatief aan dit bestand ---
packagesConfPath = ./assets/system/apps/packages.conf;
# --- Lees en split ---
raw = builtins.readFile packagesConfPath;
rawLines = lib.splitString "\n" raw;
@@ -789,6 +790,13 @@ let
entries = builtins.filter (l: l != "") (map cleanLine rawLines);
in
{
# --- Flake NixOS module export ---
flake.nixosModules.packages = { config, pkgs, lib, ... }:
let
# Resolve packages via pkgs
resolvePkg = name:
let
parts = lib.splitString "." name;
@@ -799,20 +807,19 @@ let
packages.nix: package not found in pkgs
Token : ${builtins.toJSON name}
packages.conf : ${toString packagesConfPath}
Hint : check the attribute name on search.nixos.org/packages
''
else
found;
packages = builtins.seq _guard (map resolvePkg entries);
in
{
in
{
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
+14 -7
View File
@@ -1,9 +1,10 @@
{ config, lib, pkgs, ... }:
{ lib, ... }:
let
# Gebruik relatieve pad binnen module
packagesConfPath = ../../../assets/system/apps/packages.conf;
# --- Path naar je packages.conf, relatief aan dit bestand ---
packagesConfPath = ./assets/system/apps/packages.conf;
# --- Lees en split ---
raw = builtins.readFile packagesConfPath;
rawLines = lib.splitString "\n" raw;
@@ -19,6 +20,13 @@ let
entries = builtins.filter (l: l != "") (map cleanLine rawLines);
in
{
# --- Flake NixOS module export ---
flake.nixosModules.packages = { config, pkgs, lib, ... }:
let
# Resolve packages via pkgs
resolvePkg = name:
let
parts = lib.splitString "." name;
@@ -29,18 +37,17 @@ let
packages.nix: package not found in pkgs
Token : ${builtins.toJSON name}
packages.conf : ${toString packagesConfPath}
Hint : check the attribute name on search.nixos.org/packages
''
else
found;
packages = builtins.seq _guard (map resolvePkg entries);
in
{
in
{
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;
};
};
}