diff --git a/SwarselSystems.org b/SwarselSystems.org
index a193afd..3cf6865 100644
--- a/SwarselSystems.org
+++ b/SwarselSystems.org
@@ -4906,6 +4906,7 @@ Also, the system state version is set here. No need to touch it.
       ./gnome-keyring.nix
       ./sway.nix
       ./xdg-portal.nix
+      # ./yubikey-touch-detector.nix
     ];
 
     nix =
@@ -6421,6 +6422,7 @@ This section sets up all the imports that are used in the home-manager section.
       ./gpg-agent.nix
       ./gammastep.nix
       ./safeeyes.nix
+      ./yubikey-touch-detector.nix
     ];
 
     nix = {
@@ -8061,6 +8063,40 @@ A friend of mine used this service and I used to make fun of him. But I have to
   }
 #+end_src
 
+***** yubikey-touch-detector
+
+#+begin_src nix :tangle profiles/common/home/yubikey-touch-detector.nix
+  { pkgs, ... }:
+  {
+    systemd.user.services.yubikey-touch-detector = {
+      Unit = {
+        Description = "Detects when your YubiKey is waiting for a touch";
+        Requires = [ "yubikey-touch-detector.socket" ];
+      };
+      Service = {
+        ExecStart = "${pkgs.yubikey-touch-detector}/bin/yubikey-touch-detector --libnotify";
+        EnvironmentFile = "-%E/yubikey-touch-detector/service.conf";
+      };
+      Install = {
+        Also = [ "yubikey-touch-detector.socket" ];
+        WantedBy = [ "default.target" ];
+      };
+    };
+    systemd.user.sockets.yubikey-touch-detector = {
+      Unit = {
+        Description = "Unix socket activation for YubiKey touch detector service";
+      };
+      Socket = {
+        ListenStream = "%t/yubikey-touch-detector.socket";
+        RemoveOnStop = true;
+      };
+      Install = {
+        WantedBy = [ "sockets.target" ];
+      };
+    };
+  }
+#+end_src
+
 **** Sway
 :PROPERTIES:
 :CUSTOM_ID: h:02df9dfc-d1af-4a37-a7a0-d8da0af96a20
diff --git a/profiles/common/home/default.nix b/profiles/common/home/default.nix
index 6af7b1d..02eb188 100644
--- a/profiles/common/home/default.nix
+++ b/profiles/common/home/default.nix
@@ -30,6 +30,7 @@
     ./gpg-agent.nix
     ./gammastep.nix
     ./safeeyes.nix
+    ./yubikey-touch-detector.nix
   ];
 
   nix = {
diff --git a/profiles/common/home/yubikey-touch-detector.nix b/profiles/common/home/yubikey-touch-detector.nix
new file mode 100644
index 0000000..2ca5fd6
--- /dev/null
+++ b/profiles/common/home/yubikey-touch-detector.nix
@@ -0,0 +1,29 @@
+{ pkgs, ... }:
+{
+  systemd.user.services.yubikey-touch-detector = {
+    Unit = {
+      Description = "Detects when your YubiKey is waiting for a touch";
+      Requires = [ "yubikey-touch-detector.socket" ];
+    };
+    Service = {
+      ExecStart = "${pkgs.yubikey-touch-detector}/bin/yubikey-touch-detector --libnotify";
+      EnvironmentFile = "-%E/yubikey-touch-detector/service.conf";
+    };
+    Install = {
+      Also = [ "yubikey-touch-detector.socket" ];
+      WantedBy = [ "default.target" ];
+    };
+  };
+  systemd.user.sockets.yubikey-touch-detector = {
+    Unit = {
+      Description = "Unix socket activation for YubiKey touch detector service";
+    };
+    Socket = {
+      ListenStream = "%t/yubikey-touch-detector.socket";
+      RemoveOnStop = true;
+    };
+    Install = {
+      WantedBy = [ "sockets.target" ];
+    };
+  };
+}
diff --git a/profiles/common/nixos/default.nix b/profiles/common/nixos/default.nix
index fa13b79..1e2c311 100644
--- a/profiles/common/nixos/default.nix
+++ b/profiles/common/nixos/default.nix
@@ -32,6 +32,7 @@
     ./gnome-keyring.nix
     ./sway.nix
     ./xdg-portal.nix
+    # ./yubikey-touch-detector.nix
   ];
 
   nix =