From 340d839c2c4ff47ce047e63969c43393b7a335dc Mon Sep 17 00:00:00 2001
From: Timo Wilken
Date: Tue, 12 Sep 2023 11:07:44 +0200
Subject: Always encrypt to default key as well

Allow specifying a default key for GnuPG, to which it will encrypt
everything. This allows me to still read me sent encrypted mail in aerc.

See also:
https://lists.sr.ht/~rjarry/aerc-discuss/%3CCUMGQ2JG8G0P.YIQ497JVC3AW%40nixos%3E
---
 tw/home/cern.scm       |  3 ++-
 tw/home/files/gpg.conf | 25 -------------------------
 tw/home/lap.scm        |  3 ++-
 3 files changed, 4 insertions(+), 27 deletions(-)
 delete mode 100644 tw/home/files/gpg.conf

(limited to 'tw/home')

diff --git a/tw/home/cern.scm b/tw/home/cern.scm
index 71da61fa..f0dc7214 100644
--- a/tw/home/cern.scm
+++ b/tw/home/cern.scm
@@ -132,6 +132,7 @@
 
      (openssh-service #f)
 
-     (append %common-services %interactive-services pim-services)))))
+     (append %common-services %interactive-services pim-services
+             (gnupg-services "C2249BBE5E8761C943A0CFA1B7B3914BF63ACD7C" #:gui-pinentry? #t))))))
 
 %cern-home
diff --git a/tw/home/files/gpg.conf b/tw/home/files/gpg.conf
deleted file mode 100644
index ec688ebb..00000000
--- a/tw/home/files/gpg.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-# Options for GnuPG
-#
-# An options file can contain any long options which are available in
-# GnuPG. If the first non white space character of a line is a '#',
-# this line is ignored.  Empty lines are also ignored.
-#
-# See the gpg man page for a list of options.
-
-default-key 53EC3C06856883DD92355BC22FC78504681F69B0
-default-recipient-self
-use-agent
-
-photo-viewer "imv %i"
-
-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
-# cleartext signatures; all other PGP versions do it this way too.
-# To enable full OpenPGP compliance you may want to use this option.
-#no-escape-from-lines
-
-# Get rid of the copyright notice
-no-greeting
diff --git a/tw/home/lap.scm b/tw/home/lap.scm
index e0f23c70..c166c75e 100644
--- a/tw/home/lap.scm
+++ b/tw/home/lap.scm
@@ -207,6 +207,7 @@
 
      (openssh-service #t)
 
-     (append pim-services %interactive-services %common-services)))))
+     (append pim-services %interactive-services %common-services
+             (gnupg-services "53EC3C06856883DD92355BC22FC78504681F69B0" #:gui-pinentry? #t))))))
 
 %lap-home
-- 
cgit v1.2.3