Mirrors/home-manager
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

gpg-agent: use $TTY for zsh

Browse source
This commit is contained in:
Sizhe Zhao 2024-06-08 13:35:30 +08:00
parent a7117efb37
commit b02843e229
No known key found for this signature in database
GPG key ID: 52091D14C4D7017B
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
modules/services/gpg-agent.nix
View file

@ -13,11 +13,16 @@ let
${gpgPkg}/bin/gpg-connect-agent updatestartuptty /bye > /dev/null
'';
gpgInitStr = ''
gpgBashInitStr = ''
GPG_TTY="$(tty)"
export GPG_TTY
'' + optionalString cfg.enableSshSupport gpgSshSupportStr;
gpgZshInitStr = ''
GPG_TTY="$TTY"
export GPG_TTY
'' + optionalString cfg.enableSshSupport gpgSshSupportStr;
gpgFishInitStr = ''
set -gx GPG_TTY (tty)
'' + optionalString cfg.enableSshSupport gpgSshSupportStr;
@ -256,8 +261,8 @@ in {
fi
'';
programs.bash.initExtra = mkIf cfg.enableBashIntegration gpgInitStr;
programs.zsh.initExtra = mkIf cfg.enableZshIntegration gpgInitStr;
programs.bash.initExtra = mkIf cfg.enableBashIntegration gpgBashInitStr;
programs.zsh.initExtra = mkIf cfg.enableZshIntegration gpgZshInitStr;
programs.fish.interactiveShellInit =
mkIf cfg.enableFishIntegration gpgFishInitStr;