diff --git a/home-manager/users/albert/default.nix b/home-manager/users/albert/default.nix
index fe7a3d95..0dd714fa 100644
--- a/home-manager/users/albert/default.nix
+++ b/home-manager/users/albert/default.nix
@@ -15,6 +15,11 @@
     SOPS_PGP_FP = "D98BBC6C9A27324654C2D8C464F6C4EB46C4543A";
   };
 
+  home.file.".gnupg/gpg-agent.conf".text = ''
+    enable-ssh-support
+    pinentry-program /run/current-system/sw/bin/wayprompt
+  '';
+
   accounts = {
     email = {
       accounts."sysctl" = {
diff --git a/nixos/common/services/gnupg-agent.nix b/nixos/common/services/gnupg-agent.nix
index 4801a723..dff5a679 100644
--- a/nixos/common/services/gnupg-agent.nix
+++ b/nixos/common/services/gnupg-agent.nix
@@ -6,7 +6,6 @@
     enableSSHSupport = true;
     enableBrowserSocket = true;
     enableExtraSocket = true;
-    pinentryFlavor = "tty";
   };
 
   environment.systemPackages = with pkgs; [