diff --git a/flake.nix b/flake.nix
index 6687e57e..49ccefb6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -47,6 +47,9 @@
 
       tritonshell.url = "git+https://git.greenbaum.cloud/dev/tritonshell?ref=main&dir=template";
       tritonshell.inputs.nixpkgs.follows = "latest";
+
+      nix-autobahn.url = "github:wucke13/nix-autobahn";
+      nix-autobahn.inputs.nixpkgs.follows = "latest";
     };
 
   outputs =
@@ -61,6 +64,7 @@
     , nvfetcher
     , deploy
     , tritonshell
+    , nix-autobahn
     , ...
     } @ inputs:
     digga.lib.mkFlake
diff --git a/overlays/yubikey-agent.nix b/overlays/yubikey-agent.nix
new file mode 100644
index 00000000..2dafba71
--- /dev/null
+++ b/overlays/yubikey-agent.nix
@@ -0,0 +1,18 @@
+final: prev: {
+  yubikey-agent-master =
+    let
+      version = "unstable-2022-03-17";
+      src = prev.fetchFromGitHub {
+        owner = "FiloSottile";
+        repo = "yubikey-agent";
+        rev = "205a7ef2554625c7494038600d963123d6311873";
+        sha256 = "sha256-wJpN63KY5scmez6yYFsIr3JLEUB+YSl/XvoatIIeRI0=";
+      };
+    in
+    (prev.yubikey-agent.override rec {
+      buildGoModule = args: prev.buildGoModule.override { go = prev.go_1_17; } (args // {
+        inherit src version;
+        vendorSha256 = "sha256-SnjbkDPVjAnCbM2nLqBsuaPZwOmvDTKiUbi/93BlWVQ=";
+      });
+    });
+}
diff --git a/users/teutat3s/home.nix b/users/teutat3s/home.nix
index d135b63e..18d7e320 100644
--- a/users/teutat3s/home.nix
+++ b/users/teutat3s/home.nix
@@ -4,6 +4,7 @@ let
   psCfg = config.pub-solar;
   xdg = config.home-manager.users."${psCfg.user.name}".xdg;
   tritonshell = inputs.tritonshell;
+  nix-autobahn = inputs.nix-autobahn;
 in
 {
   imports = [
@@ -39,6 +40,8 @@ in
         vault
         veracrypt
         waypoint
+        yubikey-agent-master
+        nix-autobahn.packages.${pkgs.system}.nix-autobahn
       ];
 
 
@@ -49,7 +52,7 @@ in
         };
 
         Service = {
-          ExecStart = "${pkgs.yubikey-agent}/bin/yubikey-agent -l %t/yubikey-agent/yubikey-agent.sock";
+          ExecStart = "${pkgs.yubikey-agent-master}/bin/yubikey-agent -l %t/yubikey-agent/yubikey-agent.sock";
           ExecReload = "/bin/kill -HUP $MAINPID";
           IPAddressDeny = "any";
           RestrictAddressFamilies = "AF_UNIX";