Merge pull request 'Data-mesher: don't set owner for public vars' (#3571) from misc-fixes-2 into main

Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/3571
This commit is contained in:
Mic92
2025-05-12 10:27:05 +00:00
4 changed files with 13 additions and 10 deletions

View File

@@ -14,7 +14,7 @@ in
./installation/flake-module.nix
./morph/flake-module.nix
./nixos-documentation/flake-module.nix
./sanity-checks/dont-depend-on-repo-root.nix
./dont-depend-on-repo-root.nix
];
perSystem =
{

View File

@@ -105,10 +105,7 @@ in
private_key = {
inherit owner;
};
public_key = {
inherit owner;
secret = false;
};
public_key.secret = false;
};
runtimeInputs = [
@@ -134,10 +131,7 @@ in
private_key = {
inherit owner;
};
public_key = {
inherit owner;
secret = false;
};
public_key.secret = false;
};
runtimeInputs = [

View File

@@ -58,7 +58,16 @@ in
)
)
''
The config.clan.core.vars.generators.${generator.name}.files.${file.name} is not secret, but has non-default owner/group/mode set.
The config.clan.core.vars.generators.${generator.name}.files.${file.name} is not secret:
${lib.optionalString (file.owner != "root") ''
The owner is set to ${file.owner}, but should be root.
''}
${lib.optionalString (file.group != (if _class == "darwin" then "wheel" else "root")) ''
The group is set to ${file.group}, but should be ${if _class == "darwin" then "wheel" else "root"}.
''}
${lib.optionalString (file.mode != "0400") ''
The mode is set to ${file.mode}, but should be 0400.
''}
This doesn't work because the file will be added to the nix store
''
) [ ] (lib.attrValues generator.files)