diff --git a/modules/gpg.nix b/modules/gpg.nix
index 71e4915..fd9719c 100644
--- a/modules/gpg.nix
+++ b/modules/gpg.nix
@@ -2,14 +2,21 @@
   pkgs,
   username,
   ...
-}: {
+}: let
+    pinentry-multiplexed = pkgs.writeScriptBin "pinentry" ''
+        #if [[ $- == *i* ]]
+        #then
+            exec ${pkgs.pinentry.curses}/bin/pinentry "$@"
+        #else
+        #    exec ${pkgs.pinentry.gnome3}/bin/pinentry "$@"
+        #fi
+    '';
+in {
   home = {
     programs.gpg.enable = true;
     services.gpg-agent = {
       enable = true;
-      extraConfig = ''
-        pinentry-program ${pkgs.pinentry.curses}/bin/pinentry
-      '';
+      pinentryFlavor = "curses";
     };
   };
 
@@ -19,4 +26,8 @@
       mode = "0700";
     }
   ];
+
+  home.home.packages = [
+    pinentry-multiplexed
+  ];
 }