mirrors/home-manager
1
0
Fork 0
mirror of https://github.com/nix-community/home-manager.git synced 2024-12-14 11:57:55 +00:00
Code Activity

gpg-agent: add quietShellIntegration option

Browse source
This commit is contained in:
Gabe Dunn 2024-08-09 10:07:21 -06:00
parent b3d5ea65d8
commit 0bc81de9cc
No known key found for this signature in database
GPG key ID: 3FF6FEF6C558C94A
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -9,8 +9,10 @@ let
homedir = config.programs.gpg.homedir; homedir = config.programs.gpg.homedir;
gpgConnectAgentOpts = optionalString cfg.quietShellIntegration "--quiet";
gpgSshSupportStr = '' gpgSshSupportStr = ''
${gpgPkg}/bin/gpg-connect-agent updatestartuptty /bye > /dev/null ${gpgPkg}/bin/gpg-connect-agent ${gpgConnectAgentOpts} updatestartuptty /bye > /dev/null
''; '';
gpgInitStr = '' gpgInitStr = ''
@ -25,7 +27,7 @@ let
gpgNushellInitStr = '' gpgNushellInitStr = ''
$env.GPG_TTY = (tty) $env.GPG_TTY = (tty)
'' + optionalString cfg.enableSshSupport '' '' + optionalString cfg.enableSshSupport ''
${gpgPkg}/bin/gpg-connect-agent updatestartuptty /bye | ignore ${gpgPkg}/bin/gpg-connect-agent ${gpgConnectAgentOpts} updatestartuptty /bye | ignore
$env.SSH_AUTH_SOCK = ($env.SSH_AUTH_SOCK? | default (${gpgPkg}/bin/gpgconf --list-dirs agent-ssh-socket)) $env.SSH_AUTH_SOCK = ($env.SSH_AUTH_SOCK? | default (${gpgPkg}/bin/gpgconf --list-dirs agent-ssh-socket))
''; '';
@ -229,6 +231,14 @@ in {
enableNushellIntegration = mkEnableOption "Nushell integration" // { enableNushellIntegration = mkEnableOption "Nushell integration" // {
default = true; default = true;
}; };
quietShellIntegration = mkOption {
type = types.bool;
default = false;
description = ''
Whether to pass the `--quiet` flag to gpg-connect-agent.
'';
};
}; };
}; };