From 4427295a1d05b1e5de422e912c4d4e96b51d72d2 Mon Sep 17 00:00:00 2001
From: Quentin Duchemin <quentinduchemin@tuta.io>
Date: Mon, 18 Dec 2023 15:17:18 +0100
Subject: [PATCH] Use GTK3 pinentry program

---
 .gnupg/gpg-agent.conf | 2 +-
 .xinitrc.desk         | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.gnupg/gpg-agent.conf b/.gnupg/gpg-agent.conf
index 959210a..b2ff34b 100644
--- a/.gnupg/gpg-agent.conf
+++ b/.gnupg/gpg-agent.conf
@@ -1,4 +1,4 @@
 enable-ssh-support
 default-cache-ttl 3600
 max-cache-ttl 7200
-pinentry-program /usr/bin/pinentry-gtk-2
+pinentry-program /usr/bin/pinentry-gnome3
diff --git a/.xinitrc.desk b/.xinitrc.desk
index 1fa1c0a..8639bf9 100755
--- a/.xinitrc.desk
+++ b/.xinitrc.desk
@@ -1,5 +1,9 @@
 xrandr --output DVI-I-1 --auto --output HDMI-1 --auto --scale 1x1 --right-of DVI-I-1
 xrdb -merge /home/.Xresources
+# Propagate environment variables to dbus-daemon, necessary for 
+# pinentry-gnome3 to properly display without falling
+# back to ncurses. 
+dbus-update-activation-environment DISPLAY XAUTHORITY
 WALLPAPER_PATH="/home/.local/share/backgrounds/wallpaper.jpg"
 if [ -f ${WALLPAPER_PATH} ]; then
     feh --bg-scale ${WALLPAPER_PATH}