fix home-manager module

This commit is contained in:
Pablo Ovelleiro Corral 2025-01-15 16:00:53 +01:00 committed by Jörg Thalheim
parent 7eb645636c
commit 1f8e8fcf3f
2 changed files with 29 additions and 46 deletions

View file

@ -294,8 +294,7 @@ in
}; };
config = lib.mkIf (cfg.secrets != { }) { config = lib.mkIf (cfg.secrets != { }) {
assertions = assertions = [
[
{ {
assertion = assertion =
cfg.gnupg.home != null cfg.gnupg.home != null
@ -322,23 +321,7 @@ in
); );
message = "sops.gnupg.qubes-split-gpg.domain is required when sops.gnupg.qubes-split-gpg.enable is set to true"; message = "sops.gnupg.qubes-split-gpg.domain is required when sops.gnupg.qubes-split-gpg.enable is set to true";
} }
] ];
++ lib.optionals cfg.validateSopsFiles (
lib.concatLists (
lib.mapAttrsToList (name: secret: [
{
assertion = builtins.pathExists secret.sopsFile;
message = "Cannot find path '${secret.sopsFile}' set in sops.secrets.${lib.strings.escapeNixIdentifier name}.sopsFile";
}
{
assertion =
builtins.isPath secret.sopsFile
|| (builtins.isString secret.sopsFile && lib.hasPrefix builtins.storeDir secret.sopsFile);
message = "'${secret.sopsFile}' is not in the Nix store. Either add it to the Nix store or set sops.validateSopsFiles to false";
}
]) cfg.secrets
)
);
home.sessionVariables = lib.mkIf cfg.gnupg.qubes-split-gpg.enable { home.sessionVariables = lib.mkIf cfg.gnupg.qubes-split-gpg.enable {
# TODO: Add this package to nixpkgs and use it from the store # TODO: Add this package to nixpkgs and use it from the store

View file

@ -24,7 +24,7 @@ let
) [ ] (builtins.attrValues secrets); ) [ ] (builtins.attrValues secrets);
in in
if failedAssertions != [ ] then if cfg.validateSopsFiles && failedAssertions != [ ] then
throw "\nFailed assertions:\n${lib.concatStringsSep "\n" (map (x: "- ${x}") failedAssertions)}" throw "\nFailed assertions:\n${lib.concatStringsSep "\n" (map (x: "- ${x}") failedAssertions)}"
else else
writeTextFile { writeTextFile {