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

gpg-agent: use gpgconf to set SSH_AUTH_SOCK

Browse source
This commit is contained in:
Roman Volosatovs 2017-12-02 22:59:39 +01:00
parent c023b0532a
commit 52bccdab3e
No known key found for this signature in database
GPG key ID: 3AC661943D80C89E
1 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5,17 +5,10 @@ with lib;
let let
cfg = config.services.gpg-agent; cfg = config.services.gpg-agent;
gpgInitStr = ''
GPG_TTY="$(tty)"
export GPG_TTY
${pkgs.gnupg}/bin/gpg-connect-agent updatestartuptty /bye > /dev/null
'';
in in
{ {
meta.maintainers = [ maintainers.rycee ]; meta.maintainers = [ maintainers.rycee maintainers.rvolosatovs ];
options = { options = {
services.gpg-agent = { services.gpg-agent = {
@ -71,7 +64,15 @@ in
}; };
}; };
config = mkIf cfg.enable (mkMerge [ config = let
gpgInitStr = ''
export GPG_TTY=$(tty)
'' + (optionalString cfg.enableSshSupport ''
${pkgs.gnupg}/bin/gpg-connect-agent --quiet updatestartuptty /bye > /dev/null
[ -z "$SSH_AUTH_SOCK" ] && export SSH_AUTH_SOCK=`${pkgs.gnupg}/bin/gpgconf --list-dirs agent-ssh-socket`
'');
in
mkIf cfg.enable (mkMerge [
{ {
home.file.".gnupg/gpg-agent.conf".text = concatStringsSep "\n" ( home.file.".gnupg/gpg-agent.conf".text = concatStringsSep "\n" (
optional (cfg.enableSshSupport) "enable-ssh-support" optional (cfg.enableSshSupport) "enable-ssh-support"
@ -87,13 +88,9 @@ in
"default-cache-ttl-ssh ${toString cfg.defaultCacheTtlSsh}" "default-cache-ttl-ssh ${toString cfg.defaultCacheTtlSsh}"
); );
home.sessionVariables =
optionalAttrs cfg.enableSshSupport {
SSH_AUTH_SOCK = "\${XDG_RUNTIME_DIR}/gnupg/S.gpg-agent.ssh";
};
programs.bash.initExtra = gpgInitStr; programs.bash.initExtra = gpgInitStr;
programs.zsh.initExtra = gpgInitStr; programs.zsh.initExtra = gpgInitStr;
xsession.initExtra = gpgInitStr;
} }
# The systemd units below are direct translations of the # The systemd units below are direct translations of the