fricklerhandwerk/Fediversity
1
0
Fork 0
forked from Fediversity/Fediversity
Code Pull requests Activity

put config stuff in an attrset

Browse source
This commit is contained in:
Kiara Grouwstra 2025-07-31 15:54:31 +02:00
parent 26adce03fe
commit 742cafc426
Signed by: kiara
SSH key fingerprint: SHA256:COspvLoLJ5WC5rFb9ZDe5urVCkK4LJZOsjfF4duRJFU
1 changed files with 23 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
deployment/data-model-test.nix
View file

@ -45,8 +45,10 @@ in
description = "Any options from NixOS"; description = "Any options from NixOS";
}; };
}; };
config.resource-type = types.raw; # TODO: what's the type of a NixOS configuration? config = {
config.apply = requests: lib.mkMerge (requests ++ [ config.extra-config ]); resource-type = types.raw; # TODO: what's the type of a NixOS configuration?
apply = requests: lib.mkMerge (requests ++ [ config.extra-config ]);
};
}; };
}; };
resources.login-shell = { resources.login-shell = {
@ -82,24 +84,26 @@ in
default = false; default = false;
}; };
}; };
config.resource-type = types.raw; # TODO: splice out the user type from NixOS config = {
config.apply = resource-type = types.raw; # TODO: splice out the user type from NixOS
requests: apply =
let requests:
# Filter out requests that need wheel if policy doesn't allow it let
validRequests = lib.filterAttrs ( # Filter out requests that need wheel if policy doesn't allow it
_name: req: !req.login-shell.wheel || config.wheel validRequests = lib.filterAttrs (
) requests.resources; _name: req: !req.login-shell.wheel || config.wheel
in ) requests.resources;
lib.optionalAttrs (validRequests != { }) { in
${config.username} = { lib.optionalAttrs (validRequests != { }) {
isNormalUser = true; ${config.username} = {
packages = isNormalUser = true;
with lib; packages =
attrValues (concatMapAttrs (_name: request: request.login-shell.packages) validRequests); with lib;
extraGroups = lib.optional config.wheel "wheel"; attrValues (concatMapAttrs (_name: request: request.login-shell.packages) validRequests);
extraGroups = lib.optional config.wheel "wheel";
};
}; };
}; };
}; };
}; };
applications.hello = applications.hello =