mirror of
https://github.com/nix-community/home-manager
synced 2024-11-01 08:49:44 +01:00
gpg-agent: use $TTY parameter in zsh integration
This commit is contained in:
parent
454e8d6b15
commit
eea1bc6072
1 changed files with 5 additions and 1 deletions
|
@ -18,6 +18,10 @@ let
|
||||||
export GPG_TTY
|
export GPG_TTY
|
||||||
'' + optionalString cfg.enableSshSupport gpgSshSupportStr;
|
'' + optionalString cfg.enableSshSupport gpgSshSupportStr;
|
||||||
|
|
||||||
|
gpgZshInitStr = ''
|
||||||
|
export GPG_TTY=$TTY
|
||||||
|
'' + optionalString cfg.enableSshSupport gpgSshSupportStr;
|
||||||
|
|
||||||
gpgFishInitStr = ''
|
gpgFishInitStr = ''
|
||||||
set -gx GPG_TTY (tty)
|
set -gx GPG_TTY (tty)
|
||||||
'' + optionalString cfg.enableSshSupport gpgSshSupportStr;
|
'' + optionalString cfg.enableSshSupport gpgSshSupportStr;
|
||||||
|
@ -287,7 +291,7 @@ in {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
programs.bash.initExtra = mkIf cfg.enableBashIntegration gpgInitStr;
|
programs.bash.initExtra = mkIf cfg.enableBashIntegration gpgInitStr;
|
||||||
programs.zsh.initExtra = mkIf cfg.enableZshIntegration gpgInitStr;
|
programs.zsh.initExtra = mkIf cfg.enableZshIntegration gpgZshInitStr;
|
||||||
programs.fish.interactiveShellInit =
|
programs.fish.interactiveShellInit =
|
||||||
mkIf cfg.enableFishIntegration gpgFishInitStr;
|
mkIf cfg.enableFishIntegration gpgFishInitStr;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue