diff --git a/hosts/main.nix b/hosts/main.nix
index 0fca5f6..cfa6e41 100644
--- a/hosts/main.nix
+++ b/hosts/main.nix
@@ -19,6 +19,7 @@
     ../nix-os/xdg-default-apps.nix
     ../nix-os/services/nix-binary-cache.nix
     ../nix-os/udev.nix
+    ../nix-os/gnupg.nix
 
     "${inputs.nixos-vscode-server}"
   ];
diff --git a/hosts/tablet.nix b/hosts/tablet.nix
index 7c449bf..ad06d9b 100644
--- a/hosts/tablet.nix
+++ b/hosts/tablet.nix
@@ -8,6 +8,7 @@
     ../nix-os/adb.nix
     ../nix-os/locale.nix
     ../nix-os/shell.nix
+    ../nix-os/gnupg.nix
 
     ../nix-os/desktopManagers/gnome.nix
     ../nix-os/displayManagers/gdm.nix
diff --git a/nix-os/gnupg.nix b/nix-os/gnupg.nix
new file mode 100644
index 0000000..1c9b20e
--- /dev/null
+++ b/nix-os/gnupg.nix
@@ -0,0 +1,15 @@
+{ pkgs, ... }:
+
+{
+  config = {
+    # Use pcscd for smartcard support
+    services.pcscd.enable = true;
+
+    environment.systemPackages = [(
+      pkgs.gnupg.overrideAttrs (superAttrs: {
+        configureFlags = superAttrs.configureFlags or []
+          ++ [ "--disable-ccid-driver" ];
+      })
+    )];
+  };
+}