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