diff options
| author | Emanuel Evans <mail@emanuel.industries> | 2019-02-23 10:20:12 -0800 |
|---|---|---|
| committer | Emanuel Evans <mail@emanuel.industries> | 2019-02-23 10:49:32 -0800 |
| commit | ddabdc0a1ed0f93bd09a98bf6e8a54d97994720b (patch) | |
| tree | 5d8baae364f01f71270afc53573ce34d5bff1940 /nixos/modules/programs/gnupg.nix | |
| parent | bea06ac613befbba4ca30a75a0492f5bd959d3ca (diff) | |
| download | nixlib-ddabdc0a1ed0f93bd09a98bf6e8a54d97994720b.tar nixlib-ddabdc0a1ed0f93bd09a98bf6e8a54d97994720b.tar.gz nixlib-ddabdc0a1ed0f93bd09a98bf6e8a54d97994720b.tar.bz2 nixlib-ddabdc0a1ed0f93bd09a98bf6e8a54d97994720b.tar.lz nixlib-ddabdc0a1ed0f93bd09a98bf6e8a54d97994720b.tar.xz nixlib-ddabdc0a1ed0f93bd09a98bf6e8a54d97994720b.tar.zst nixlib-ddabdc0a1ed0f93bd09a98bf6e8a54d97994720b.zip | |
nixos/gnupg: set SSH_AUTH_SOCK in non-interactive settings
`SSH_AUTH_SOCK` is useful in some non-interactive settings, for instance daemonized Emacs. Fixes #55733.
Diffstat (limited to 'nixos/modules/programs/gnupg.nix')
| -rw-r--r-- | nixos/modules/programs/gnupg.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/nixos/modules/programs/gnupg.nix b/nixos/modules/programs/gnupg.nix index b01de9efaa5e..22521280e936 100644 --- a/nixos/modules/programs/gnupg.nix +++ b/nixos/modules/programs/gnupg.nix @@ -85,11 +85,13 @@ in # SSH agent protocol doesn't support changing TTYs, so bind the agent # to every new TTY. ${pkgs.gnupg}/bin/gpg-connect-agent --quiet updatestartuptty /bye > /dev/null + ''); + environment.extraInit = mkIf cfg.agent.enableSSHSupport '' if [ -z "$SSH_AUTH_SOCK" ]; then export SSH_AUTH_SOCK=$(${pkgs.gnupg}/bin/gpgconf --list-dirs agent-ssh-socket) fi - ''); + ''; assertions = [ { assertion = cfg.agent.enableSSHSupport -> !config.programs.ssh.startAgent; |