diff --git a/machines/modules/gnupg.nix b/machines/modules/gnupg.nix
index e0f6a02..38e2396 100644
--- a/machines/modules/gnupg.nix
+++ b/machines/modules/gnupg.nix
@@ -4,5 +4,8 @@
   programs.gnupg.agent = {
     enable = true;
     enableSSHSupport = config.services.openssh.enable;
+    pinentryFlavor = "gtk2";
   };
+
+  services.passSecretService.enable = true;
 }
diff --git a/users/modules/pass.nix b/users/modules/pass.nix
index a9c9af7..be27ddd 100644
--- a/users/modules/pass.nix
+++ b/users/modules/pass.nix
@@ -15,11 +15,4 @@ in
       PASSWORD_STORE_DIR = "${passDataDir}/store";
     };
   };
-  services.pass-secret-service.enable = true;
-
-  programs.gpg.enable = true;
-  services.gpg-agent = {
-    enable = true;
-    pinentryFlavor = "gtk2";
-  };
 }