derped/nixos
1
0
Fork 0
Code Releases Activity

Add function to generate machine option lists + use it for services.

Browse source
This commit is contained in:
Kevin Baensch 2023-09-09 22:30:37 +02:00
parent e6efbd736d
commit 13a25fe675
Signed by: derped
GPG key ID: C0F1D326C7626543
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
fn.nix
View file

@ -69,4 +69,11 @@ rec {
true) true)
)) ))
ld); ld);
makeOptionTypeList = path: (lists.forEach
# get a list of all files ending in .nix in path
(filter (filePath: hasSuffix ".nix" filePath)
(lsfRec path true))
# remove leading path and trailing ".nix", replace every slash with "::"
(replaceStrings [ "${path}/" "/" ".nix" ] [ "" "::" "" ])
);
} }

11
options/machine.nix
View file

@ -5,9 +5,8 @@ with lib;
let let
cfg = config.machine; cfg = config.machine;
metapkgs = let pkgsetList = fn.makeOptionTypeList (toString ../pkgsets);
pPath = (toString ../pkgsets); serviceList = fn.makeOptionTypeList (toString ../services);
in (lists.forEach (fn.lsfRec pPath true) (v: replaceStrings [ "${pPath}/" "/" ".nix" ] [ "" "::" "" ] v));
pkgOption = pname: { pkgOption = pname: {
name = pname; name = pname;
value = rec { value = rec {
@ -30,16 +29,16 @@ let
in { in {
options.machine = { options.machine = {
pkgs = mkOption { pkgs = mkOption {
type = (types.listOf (types.enum metapkgs)); type = (types.listOf (types.enum pkgsetList));
default = [ "base" ]; default = [ "base" ];
description = '' description = ''
The list of metapackages to be installed. The list of metapackages to be installed.
''; '';
}; };
# Package names containing '::' are sub packages and should not have their own pkgset. # Package names containing '::' are sub packages and should not have their own pkgset.
pkgsets = listToAttrs (map pkgOption (lists.filter (v: !(strings.hasInfix "::" v)) metapkgs)); pkgsets = listToAttrs (map pkgOption (lists.filter (v: !(strings.hasInfix "::" v)) pkgsetList));
services = mkOption { services = mkOption {
type = types.listOf types.str; type = (types.listOf (types.enum serviceList));
default = []; default = [];
description = '' description = ''
List of services to be enabled. List of services to be enabled.