diff --git a/home/default.nix b/home/default.nix
index 67c3c4a..b4c3b30 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -45,6 +45,7 @@ in
       pantheon.elementary-files
       pavucontrol
       xdg-utils
+      yubikey-manager
     ];
 
     dconf.settings = {
@@ -62,6 +63,9 @@ in
         settings = {
           keyserver = "hkps://keys.openpgp.org";
         };
+        scdaemonSettings = {
+          disable-ccid = true;
+        };
       };
       ssh = {
         enable = true;
@@ -72,6 +76,7 @@ in
     services.gpg-agent = {
       enable = true;
       enableExtraSocket = true;
+      enableScDaemon = true;
       enableSshSupport = true;
       pinentryFlavor = "gnome3";
     };
diff --git a/system/packages.nix b/system/packages.nix
index f14bf62..64b6edd 100644
--- a/system/packages.nix
+++ b/system/packages.nix
@@ -13,6 +13,7 @@
     ];
   };
 
+  hardware.gpgSmartcards.enable = true;
   programs = {
     git.enable = true;
     gnupg.agent = {
diff --git a/system/services.nix b/system/services.nix
index a8d5880..8c3a835 100644
--- a/system/services.nix
+++ b/system/services.nix
@@ -10,6 +10,7 @@
     fwupd.enable = true;
     gvfs.enable = true;
     lvm.dmeventd.enable = true;
+    pcscd.enable = true;
     pipewire = {
       enable = true;
       alsa.enable = true;
@@ -19,6 +20,7 @@
     power-profiles-daemon.enable = true;
     resolved.enable = true;
     thermald.enable = true;
+    udev.packages = [ pkgs.yubikey-personalization ];
     udisks2.enable = true;
   };
 }