diff options
| author | Ihar Hrachyshka <ihar.hrachyshka@gmail.com> | 2024-08-29 16:25:33 -0400 |
|---|---|---|
| committer | Ihar Hrachyshka <ihar.hrachyshka@gmail.com> | 2024-08-29 16:37:56 -0400 |
| commit | 75d14c62cbc4360cbd1a1b5c52dbd17b8bd08892 (patch) | |
| tree | 4d93189b1e597ea2f9d7b602f45b676a7ab943b3 | |
| parent | ac5694a0b855a981e81b4d9f14052e3ff46ca39e (diff) | |
gpg: Suppress stderr from gpg-connect-agent on shell init
In some scenarios, the command may fail, e.g. when the shell is executed
with a different $HOME from where gpg agent is configured to run from.
(E.g. this happens in kitty terminal test suite.)
This patch will suppress stderr errors on tty in this situation.
Note that zsh does not allow to suppress execution of /etc/zshenv on
startup, so it's impossible to skip it in the test suite environment.
An alternative would be to set IN_NIX_SHELL in the test suite, but this
was rejected in upstream:
https://github.com/kovidgoyal/kitty/pull/7800
There's also a kitty package specific fix posted here but this may be
unnecessary once nix-darwin is patched here:
https://github.com/NixOS/nixpkgs/pull/338070
Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
| -rw-r--r-- | modules/programs/gnupg.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/programs/gnupg.nix b/modules/programs/gnupg.nix index 4c451ec..6a34e30 100644 --- a/modules/programs/gnupg.nix +++ b/modules/programs/gnupg.nix @@ -43,7 +43,7 @@ in '' + (optionalString cfg.agent.enableSSHSupport '' # 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 + ${pkgs.gnupg}/bin/gpg-connect-agent --quiet updatestartuptty /bye > /dev/null 2>&1 export SSH_AUTH_SOCK=$(${pkgs.gnupg}/bin/gpgconf --list-dirs agent-ssh-socket) ''); |