Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use minimal gnupg #555

Closed
wants to merge 1 commit into from
Closed

Use minimal gnupg #555

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions modules/sops/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,13 +231,13 @@ in {

*WARNING*
Enabling this option has the potential to write secrets to disk unencrypted if the tmpfs volume is written to swap. Do not use unless absolutely necessary.

When using a swap file or device, consider enabling swap encryption by setting the `randomEncryption.enable` option

```
swapDevices = [{
device = "/dev/sdXY";
randomEncryption.enable = true;
randomEncryption.enable = true;
}];
```
'';
Expand Down Expand Up @@ -320,7 +320,7 @@ in {
}]) cfg.secrets)
);

sops.environment.SOPS_GPG_EXEC = lib.mkIf (cfg.gnupg.home != null || cfg.gnupg.sshKeyPaths != []) (lib.mkDefault "${pkgs.gnupg}/bin/gpg");
sops.environment.SOPS_GPG_EXEC = lib.mkIf (cfg.gnupg.home != null || cfg.gnupg.sshKeyPaths != []) (lib.mkDefault (lib.getExe (pkgs.gnupg.override { enableMinimal = true; })));
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we cache the minimal build in hydra?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Kinda https://github.com/NixOS/nixpkgs/blob/e4c22dc16b36c17bea471ecc3ae616f64e69d3d2/pkgs/top-level/all-packages.nix#L27888-L27891, should I do a PR to promote that to a top-level attr?


# When using sysusers we no longer be started as an activation script because those are started in initrd while sysusers is started later.
systemd.services.sops-install-secrets = lib.mkIf (regularSecrets != { } && sysusersEnabled) {
Expand Down