pub-solar/infra
6
1
Fork 3
Code Issues 23 Pull requests 10 Actions Packages Projects 1 Releases Wiki Activity

style: run nix fmt
Some checks failed
Flake checks / Check (pull_request) Failing after 38s
Details

Browse source
This commit is contained in:
b12f 2024-11-12 20:30:03 +01:00
parent daf2a34274
commit 656211888b
Signed by: b12f
GPG key ID: 729956E1124F8F26
2 changed files with 41 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
logins/default.nix
View file

@ -7,11 +7,10 @@ in
flake = { flake = {
logins = { logins = {
admins = admins; admins = admins;
wireguardDevices = wireguardDevices = lib.lists.foldl (
lib.lists.foldl wireguardDevices: adminConfig:
(wireguardDevices: adminConfig: wireguardDevices ++ (if adminConfig ? "wireguardDevices" then adminConfig.wireguardDevices else [ ])) wireguardDevices ++ (if adminConfig ? "wireguardDevices" then adminConfig.wireguardDevices else [ ])
[ ] ) [ ] (lib.attrsets.attrValues admins);
(lib.attrsets.attrValues admins);
robots.sshPubKeys = lib.attrsets.attrValues robots; robots.sshPubKeys = lib.attrsets.attrValues robots;
}; };
}; };

22
modules/core/users.nix
View file

@ -31,8 +31,12 @@
}; };
config = { config = {
users.users = (lib.attrsets.foldlAttrs users.users =
(acc: name: value: acc // { ${name} = { (lib.attrsets.foldlAttrs (
acc: name: value:
acc
// {
${name} = {
name = name; name = name;
group = name; group = name;
extraGroups = [ extraGroups = [
@ -42,9 +46,8 @@
isNormalUser = true; isNormalUser = true;
openssh.authorizedKeys.keys = lib.attrsets.attrValues value.sshPubKeys; openssh.authorizedKeys.keys = lib.attrsets.attrValues value.sshPubKeys;
}; };
}) }
{ } ) { } flake.self.logins.admins)
flake.self.logins.admins)
// { // {
# TODO: Remove when we stop locking ourselves out. # TODO: Remove when we stop locking ourselves out.
root.openssh.authorizedKeys.keys = config.pub-solar-os.authentication.sshPubKeys; root.openssh.authorizedKeys.keys = config.pub-solar-os.authentication.sshPubKeys;
@ -62,10 +65,11 @@
}; };
}; };
users.groups = (lib.attrsets.foldlAttrs users.groups =
(acc: name: value: acc // { "${name}" = { }; }) (lib.attrsets.foldlAttrs (
{ } acc: name: value:
flake.self.logins.admins) acc // { "${name}" = { }; }
) { } flake.self.logins.admins)
// { // {
${config.pub-solar-os.authentication.robot.username} = { }; ${config.pub-solar-os.authentication.robot.username} = { };
}; };