vars: don't use sops.secrets.*.restartUnits on macOS

This commit is contained in:
Michael Hoang
2025-06-10 13:27:02 +07:00
parent 9b5410a46d
commit 49bec8536b
3 changed files with 34 additions and 20 deletions

View File

@@ -1,4 +1,5 @@
{
_class,
pkgs,
config,
lib,
@@ -10,10 +11,13 @@
config.clan.core.vars.generators.root-password.files.password-hash.path;
clan.core.vars.generators.root-password = {
files.password-hash = {
files.password-hash =
{
neededFor = "users";
};
files.password-hash.restartUnits = lib.optional (config.services.userborn.enable) "userborn.service";
}
// (lib.optionalAttrs (_class == "nixos") {
restartUnits = lib.optional (config.services.userborn.enable) "userborn.service";
});
files.password = {
deploy = false;
};

View File

@@ -1,4 +1,5 @@
{
_class,
pkgs,
config,
lib,
@@ -30,8 +31,13 @@ in
};
clan.core.vars.generators.user-password = {
files.user-password-hash.neededFor = "users";
files.user-password-hash.restartUnits = lib.optional (config.services.userborn.enable) "userborn.service";
files.user-password-hash =
{
neededFor = "users";
}
// (lib.optionalAttrs (_class == "nixos") {
restartUnits = lib.optional (config.services.userborn.enable) "userborn.service";
});
prompts.user-password.type = "hidden";
prompts.user-password.persist = true;

View File

@@ -1,4 +1,5 @@
{
_class,
config,
lib,
pkgs,
@@ -42,20 +43,23 @@ in
secrets = lib.listToAttrs (
map (secret: {
name = "vars/${secret.generator}/${secret.name}";
value = {
value =
{
inherit (secret)
owner
group
mode
neededForUsers
restartUnits
;
sopsFile = builtins.path {
name = "${secret.generator}_${secret.name}";
path = secretPath secret;
};
format = "binary";
};
}
// (lib.optionalAttrs (_class == "nixos") {
inherit (secret) restartUnits;
});
}) (builtins.filter (x: builtins.pathExists (secretPath x)) vars)
);