diff --git a/modules/nixos/gnupg.nix b/modules/nixos/gnupg.nix
index 5770783..1e1f380 100644
--- a/modules/nixos/gnupg.nix
+++ b/modules/nixos/gnupg.nix
@@ -2,8 +2,14 @@
 
 {
   # enable gnupg agent
-  services.gnupg.agent = {
+  programs.gnupg.agent = {
     enable = true;
     enableSSHSupport = true;
+    pinentryPackage = pkgs.pinentry-curses;
   };
+
+  environment.systemPackages = with pkgs; [ 
+    gnupg
+    pinentry-curses
+  ];
 }
diff --git a/modules/nixos/packages.nix b/modules/nixos/packages.nix
index bb5f2d0..cb7a0cf 100644
--- a/modules/nixos/packages.nix
+++ b/modules/nixos/packages.nix
@@ -11,7 +11,6 @@
     file
     ghostty
     git
-    gnupg
     imagemagick
     imv
     iperf3