diff --git a/home/jonas/home.nix b/home/jonas/home.nix
index ab275b3..b457ecd 100644
--- a/home/jonas/home.nix
+++ b/home/jonas/home.nix
@@ -2,8 +2,9 @@
 
 {
   imports = [
-    ./plasma.nix
     ./firefox.nix
+    ./plasma.nix
+    ./yubikey.nix
   ];
 
   # Home Manager needs a bit of information about you and the paths it should
diff --git a/home/jonas/yubikey.nix b/home/jonas/yubikey.nix
new file mode 100644
index 0000000..4955ccd
--- /dev/null
+++ b/home/jonas/yubikey.nix
@@ -0,0 +1,10 @@
+{ config, ... }:
+
+{
+  programs.gpg = {
+    enable = true;
+    settings = {
+      enable-ssh-support = true;
+    };
+  };
+}
\ No newline at end of file
diff --git a/hosts/comfy-station/configuration.nix b/hosts/comfy-station/configuration.nix
index c9e4dd1..9a46c29 100644
--- a/hosts/comfy-station/configuration.nix
+++ b/hosts/comfy-station/configuration.nix
@@ -12,6 +12,7 @@
       ../../modules/hardware/bluetooth.nix
       ../../modules/hardware/printing.nix
       ../../modules/hardware/sound.nix
+      ../../modules/hardware/yubikey.nix
       ../../modules/services/docker.nix
       ../../modules/desktop/dm
       ../../modules/desktop/de
diff --git a/modules/hardware/yubikey.nix b/modules/hardware/yubikey.nix
new file mode 100644
index 0000000..00e376d
--- /dev/null
+++ b/modules/hardware/yubikey.nix
@@ -0,0 +1,13 @@
+{ config, pkgs, ... }:
+{
+  # Include udev rules for yubikey.
+  services.udev.packages = with pkgs; [
+    yubikey-personalization
+  ];
+
+  # OTP Manager
+  environment.systemPackages = with pkgs; [
+    yubioath-flutter
+  ];
+  services.pcscd.enable = true;
+}