From faf786cb9cb5e0b5eb8c35e1055c854315a11f44 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 3 Sep 2023 12:15:37 +0200 Subject: [PATCH] l yubikey: use upstream --- lass/2configs/yubikey.nix | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/lass/2configs/yubikey.nix b/lass/2configs/yubikey.nix index bf6a587af..5ac310199 100644 --- a/lass/2configs/yubikey.nix +++ b/lass/2configs/yubikey.nix @@ -48,19 +48,6 @@ }); ''; - environment.shellInit = '' - if [ "$UID" -eq 1337 ] && [ -z "$SSH_CONNECTION" ]; then - export GPG_TTY="$(tty)" - mkdir -p $HOME/.gnupg - gpg-connect-agent --quiet updatestartuptty /bye > /dev/null - export SSH_AUTH_SOCK="/run/user/$UID/gnupg/S.gpg-agent.ssh" - if [ -z "$SSH_AUTH_SOCK" ]; then - export SSH_AUTH_SOCK=$(${pkgs.gnupg}/bin/gpgconf --list-dirs agent-ssh-socket) - fi - - fi - ''; - # allow nix to acces remote builders via yubikey systemd.services.nix-daemon.environment.SSH_AUTH_SOCK = "/run/user/1337/gnupg/S.gpg-agent.ssh"; @@ -69,7 +56,7 @@ gnupg.agent = { enable = true; pinentryFlavor = "qt"; - # enableSSHSupport = true; + enableSSHSupport = true; }; }; }