diff --git a/flake.lock b/flake.lock
index 383c4d88..820434b7 100644
--- a/flake.lock
+++ b/flake.lock
@@ -632,6 +632,22 @@
         "type": "github"
       }
     },
+    "pub-solar": {
+      "locked": {
+        "lastModified": 1654369474,
+        "narHash": "sha256-omGF0Ws0l/HE+S08hDObnNptPwM+dVhnA8ya+TAKBHI=",
+        "owner": "pub-solar",
+        "repo": "nixpkgs",
+        "rev": "0b509c42845cea8389e02dcb589eec1c8a165f10",
+        "type": "github"
+      },
+      "original": {
+        "owner": "pub-solar",
+        "ref": "fix/use-latest-unstable-yubikey-agent",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "agenix": "agenix",
@@ -647,7 +663,8 @@
         "nixos-generators": "nixos-generators",
         "nixos-hardware": "nixos-hardware",
         "nur": "nur",
-        "nvfetcher": "nvfetcher"
+        "nvfetcher": "nvfetcher",
+        "pub-solar": "pub-solar"
       }
     },
     "utils": {
diff --git a/flake.nix b/flake.nix
index bbd103dd..4df5dea2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -10,6 +10,7 @@
       # Track channels with commits tested and built by hydra
       nixos.url = "github:nixos/nixpkgs/nixos-22.05";
       latest.url = "github:nixos/nixpkgs/nixos-unstable";
+      pub-solar.url = "github:pub-solar/nixpkgs/fix/use-latest-unstable-yubikey-agent";
 
       digga.url = "github:divnix/digga";
       digga.inputs.nixpkgs.follows = "nixos";
diff --git a/overlays/overrides.nix b/overlays/overrides.nix
index 209e1b1b..e178210b 100644
--- a/overlays/overrides.nix
+++ b/overlays/overrides.nix
@@ -19,6 +19,10 @@ channels: final: prev: {
     tdesktop
     ;
 
+  inherit (channels.pub-solar)
+    yubikey-agent
+    ;
+
 
   haskellPackages = prev.haskellPackages.override
     (old: {
diff --git a/users/ben/default.nix b/users/ben/default.nix
index 7003b961..1655f623 100644
--- a/users/ben/default.nix
+++ b/users/ben/default.nix
@@ -10,6 +10,8 @@ in
   config = {
     home-manager.users = { inherit (hmUsers) ben; };
 
+    services.yubikey-agent.enable = true;
+
     pub-solar = {
       # These are your personal settings
       # The only required settings are `name` and `password`,