From cc0b32e0166a89969338ef5db7dea0e61f32d8d7 Mon Sep 17 00:00:00 2001
From: Tom Willemse
Date: Mon, 5 Feb 2024 23:42:12 -0800
Subject: Fix GPG in Emacs

---
 oni/home/services/emacs/init.el | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'oni/home/services/emacs/init.el')

diff --git a/oni/home/services/emacs/init.el b/oni/home/services/emacs/init.el
index 3cf23d2..244d394 100644
--- a/oni/home/services/emacs/init.el
+++ b/oni/home/services/emacs/init.el
@@ -51,3 +51,11 @@
   (add-hook 'electric-quote-inhibit-functions #'oni-in-word-p))
 
 (with-eval-after-load 'yaml-mode (require 'oni-yaml))
+
+(defvar epg-gpg-program)
+(with-eval-after-load 'epg-config
+  ;; This is necessary because otherwise Emacs will select the wrong version of
+  ;; GnuPG through gpg2. gpg is installed by Guix and gpg2 by Archlinux. EPG
+  ;; seems to prefer gpg2 over gpg and now it seems that the versions of both
+  ;; have diverged enough that it now matters which is used.
+  (setq epg-gpg-program "gpg"))
-- 
cgit v1.2.3-54-g00ecf