From 82b59ca86fdd40a93d899ba0f9a8f296b1491120 Mon Sep 17 00:00:00 2001
From: Timo Wilken
Date: Fri, 2 Jun 2023 20:35:24 +0200
Subject: Modernise GPG configuration

---
 tw/home.scm                | 6 ++++--
 tw/home/files/dirmngr.conf | 1 -
 tw/home/files/gpg.conf     | 6 ++----
 3 files changed, 6 insertions(+), 7 deletions(-)
 delete mode 100644 tw/home/files/dirmngr.conf

(limited to 'tw')

diff --git a/tw/home.scm b/tw/home.scm
index 3bb47b97..cade5881 100644
--- a/tw/home.scm
+++ b/tw/home.scm
@@ -53,8 +53,10 @@
    (simple-service 'gnupg-config home-files-service-type
      `(;; GnuPG config files must be in ~/.local/share/gnupg, not ~/.config,
        ;; so we can't use `home-xdg-configuration-files-service-type'.
-       (".local/share/gnupg/dirmngr.conf" ,(local-file "home/files/dirmngr.conf"))
-       (".local/share/gnupg/gpg.conf" ,(local-file "home/files/gpg.conf"))
+       (".local/share/gnupg/dirmngr.conf"
+        ,(plain-file "dirmngr.conf" "keyserver hkps://keys.openpgp.org"))
+       (".local/share/gnupg/gpg.conf"
+        ,(local-file "home/files/gpg.conf"))
        (".local/share/gnupg/gpg-agent.conf"
         ,(mixed-text-file "gpg-agent.conf" "\
 pinentry-program " (if gui-pinentry?
diff --git a/tw/home/files/dirmngr.conf b/tw/home/files/dirmngr.conf
deleted file mode 100644
index 14114144..00000000
--- a/tw/home/files/dirmngr.conf
+++ /dev/null
@@ -1 +0,0 @@
-keyserver hkps://keys.openpgp.org
diff --git a/tw/home/files/gpg.conf b/tw/home/files/gpg.conf
index ed39d1ef..ec688ebb 100644
--- a/tw/home/files/gpg.conf
+++ b/tw/home/files/gpg.conf
@@ -12,10 +12,8 @@ use-agent
 
 photo-viewer "imv %i"
 
-auto-key-locate local,keyserver,cert,pka,dane,wkd
-
-keyserver hkps://keys.openpgp.org
-keyserver-options auto-key-retrieve
+auto-key-import
+auto-key-retrieve
 
 # Because some mailers change lines starting with "From " to ">From "
 # it is good to handle such lines in a special way when creating
-- 
cgit v1.2.3