From 524aa10ff5fe7fa404612f2fb863ba11e3ac6598 Mon Sep 17 00:00:00 2001 From: Ayman Bagabas Date: Thu, 21 Nov 2024 10:41:56 -0500 Subject: [PATCH] fix(gpg): disable gpg-agent ssh support for now --- modules/gpg.nix | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/modules/gpg.nix b/modules/gpg.nix index a4ce6bb..672308d 100644 --- a/modules/gpg.nix +++ b/modules/gpg.nix @@ -14,19 +14,19 @@ in imports = [ ./gpg-auto-import.nix ]; - programs.zsh.initExtra = mkIf (isDarwin && config.services.gpg-agent.enableSshSupport) '' - # use gpg-agent for ssh - # https://www.gnupg.org/documentation/manuals/gnupg/Agent-Examples.html#Agent-Examples - unset SSH_AGENT_PID - if [ "''${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then - SSH_AUTH_SOCK="$(${pkgs.gnupg}/bin/gpgconf --list-dirs agent-ssh-socket)" - export SSH_AUTH_SOCK - fi - GPG_TTY="$(tty)" - export GPG_TTY - ${pkgs.gnupg}/bin/gpgconf --launch gpg-agent - ${pkgs.gnupg}/bin/gpg-connect-agent updatestartuptty /bye > /dev/null - ''; + # programs.zsh.initExtra = mkIf (isDarwin && config.services.gpg-agent.enableSshSupport) '' + # # use gpg-agent for ssh + # # https://www.gnupg.org/documentation/manuals/gnupg/Agent-Examples.html#Agent-Examples + # unset SSH_AGENT_PID + # if [ "''${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then + # SSH_AUTH_SOCK="$(${pkgs.gnupg}/bin/gpgconf --list-dirs agent-ssh-socket)" + # export SSH_AUTH_SOCK + # fi + # GPG_TTY="$(tty)" + # export GPG_TTY + # ${pkgs.gnupg}/bin/gpgconf --launch gpg-agent + # ${pkgs.gnupg}/bin/gpg-connect-agent updatestartuptty /bye > /dev/null + # ''; programs.zsh.shellAliases = { gpg-reload-agent = "gpg-connect-agent reloadagent /bye";