diff --git a/modules/home/gpg/default.nix b/modules/home/gpg/default.nix
index 9384c96..d4a4762 100644
--- a/modules/home/gpg/default.nix
+++ b/modules/home/gpg/default.nix
@@ -10,7 +10,15 @@
   };
 
   config = lib.mkIf config.chimera.gpg.enable {
-    programs.gpg.enable = true;
+    programs.gpg = {
+      enable = true;
+
+      scdaemonSettings = lib.mkIf config.chimera.yubikey.enable {
+        reader-port = "Yubico Yubi";
+        disable-ccid = true;
+      };
+    };
+
     services.gpg-agent = {
       enable = true;
       pinentryFlavor = "tty";
diff --git a/modules/home/yubikey/default.nix b/modules/home/yubikey/default.nix
new file mode 100644
index 0000000..f9c32e0
--- /dev/null
+++ b/modules/home/yubikey/default.nix
@@ -0,0 +1,5 @@
+{ config, lib, ... }: {
+  options = {
+    chimera.yubikey.enable = lib.mkEnableOption "Enable support for YuibKeys";
+  };
+}