diff --git a/nix-os/gnupg.nix b/nix-os/gnupg.nix
index 1c9b20e..48ad562 100644
--- a/nix-os/gnupg.nix
+++ b/nix-os/gnupg.nix
@@ -5,11 +5,15 @@
     # Use pcscd for smartcard support
     services.pcscd.enable = true;
 
-    environment.systemPackages = [(
-      pkgs.gnupg.overrideAttrs (superAttrs: {
+    programs.gnupg = {
+      package = pkgs.gnupg.overrideAttrs (superAttrs: {
         configureFlags = superAttrs.configureFlags or []
           ++ [ "--disable-ccid-driver" ];
-      })
-    )];
+      });
+      agent = {
+        enable = true;
+        pinentryPackage = pkgs.pinentry-qt;
+      };
+    };
   };
 }