pkg/sops-nix
1
0
Fork 0
mirror of https://github.com/Mic92/sops-nix.git synced 2025-12-26 14:14:58 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge 0e437c29de into 9836912e37

Browse source
This commit is contained in:
Fabrizio Romano Genovese 2025-12-23 14:50:29 +10:00 • committed by GitHub
commit 2ae3b0f14b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 23 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
modules/home-manager/sops.nix
View file

@ -269,6 +269,16 @@ in
};
gnupg = {
package = lib.mkOption {
type = lib.types.package;
default = pkgs.gnupg;
defaultText = lib.literalExpression "pkgs.gnupg";
description = ''
The gnupg package to use for sops operations.
Useful if you need a specific version or a wrapped instance.
'';
};
home = lib.mkOption {
type = lib.types.nullOr lib.types.str;
default = null;
@ -341,7 +351,7 @@ in
sops.environment = {
SOPS_GPG_EXEC = lib.mkMerge [
(lib.mkIf (cfg.gnupg.home != null || cfg.gnupg.sshKeyPaths != [ ]) (
lib.mkDefault "${pkgs.gnupg}/bin/gpg"
lib.mkDefault "${cfg.gnupg.package}/bin/gpg"
))
(lib.mkIf cfg.gnupg.qubes-split-gpg.enable (
lib.mkDefault config.home.sessionVariables.SOPS_GPG_EXEC

2
modules/nix-darwin/default.nix
View file

@ -384,7 +384,7 @@ in
{
sops.environment.SOPS_GPG_EXEC = lib.mkIf (cfg.gnupg.home != null || cfg.gnupg.sshKeyPaths != [ ]) (
lib.mkDefault "${pkgs.gnupg}/bin/gpg"
lib.mkDefault "${cfg.gnupg.package}/bin/gpg"
);
}
];

12
modules/sops/default.nix
View file

@ -381,6 +381,16 @@ in
This option must be explicitly unset if <literal>config.sops.gnupg.home</literal> is set.
'';
};
package = lib.mkOption {
type = lib.types.package;
default = pkgs.gnupg;
defaultText = lib.literalExpression "pkgs.gnupg";
description = ''
The gnupg package to use for sops operations.
'';
};
};
};
imports = [
@ -442,7 +452,7 @@ in
);
sops.environment.SOPS_GPG_EXEC = lib.mkIf (cfg.gnupg.home != null || cfg.gnupg.sshKeyPaths != [ ]) (
lib.mkDefault "${pkgs.gnupg}/bin/gpg"
lib.mkDefault "${cfg.gnupg.package}/bin/gpg"
);
# When using sysusers we no longer are started as an activation script because those are started in initrd while sysusers is started later.