summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <git@lassul.us>2023-09-03 12:15:37 +0200
committerlassulus <git@lassul.us>2023-09-03 12:15:37 +0200
commitfaf786cb9cb5e0b5eb8c35e1055c854315a11f44 (patch)
tree55048c281d6f30c0cd1a93b9e0a7b8b3007a7f27
parent6c82f97ae7bcfa26d91503c9975ab394cf30ace8 (diff)
l yubikey: use upstream
-rw-r--r--lass/2configs/yubikey.nix15
1 files changed, 1 insertions, 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;
};
};
}