diff options
| author | Alyssa Ross <hi@alyssa.is> | 2020-08-23 11:26:05 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-08-23 11:26:05 +0000 |
| commit | 6341a79fbfb64b2b950e8385d8b1a2e9da9f1ba4 (patch) | |
| tree | 2fb90ba0ac39029066f8c9db536b6e92190b043a /modules | |
| parent | 0d39ec30d4bfefeaec327cf4ca4fac925ccf602a (diff) | |
| download | nixlib-6341a79fbfb64b2b950e8385d8b1a2e9da9f1ba4.tar nixlib-6341a79fbfb64b2b950e8385d8b1a2e9da9f1ba4.tar.gz nixlib-6341a79fbfb64b2b950e8385d8b1a2e9da9f1ba4.tar.bz2 nixlib-6341a79fbfb64b2b950e8385d8b1a2e9da9f1ba4.tar.lz nixlib-6341a79fbfb64b2b950e8385d8b1a2e9da9f1ba4.tar.xz nixlib-6341a79fbfb64b2b950e8385d8b1a2e9da9f1ba4.tar.zst nixlib-6341a79fbfb64b2b950e8385d8b1a2e9da9f1ba4.zip | |
modules/gnupg: don't override SSH_AUTH_SOCK if set
This fixes SSH agent forwarding.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/workstation/gnupg/default.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/modules/workstation/gnupg/default.nix b/modules/workstation/gnupg/default.nix index a93a31411d08..bae1e51c535b 100644 --- a/modules/workstation/gnupg/default.nix +++ b/modules/workstation/gnupg/default.nix @@ -21,7 +21,10 @@ environment.extraInit = '' export GNUPGHOME="$HOME/state/gnupg" - export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)" + + if [ -z "$SSH_AUTH_SOCK" ]; then + export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)" + fi ''; programs.sway.extraConfig = '' |