From 784f5ce1fd6adc8a1c673795cf612e946bc886ec Mon Sep 17 00:00:00 2001
From: Daniel Borchmann <daniel@algebra20.de>
Date: Sat, 2 Feb 2019 15:30:16 +0100
Subject: [PATCH] =?UTF-8?q?[Mail]=20Move=20=E2=80=98db/mail-accounts?=
 =?UTF-8?q?=E2=80=99=20to=20db-mail=20package?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gnus.el              | 14 +-------------
 init.el              | 25 +------------------------
 site-lisp/db-mail.el | 32 +++++++++++++++++++++++++++-----
 3 files changed, 29 insertions(+), 42 deletions(-)

diff --git a/gnus.el b/gnus.el
index adfb004..a7e1bc7 100644
--- a/gnus.el
+++ b/gnus.el
@@ -15,19 +15,7 @@
 
 ;; Requires
 
-(require 'dash)
-(require 'gnus)
-(require 'message)
-(require 'gnus-util)
-(require 'gnus-start)
-(require 'gnus-group)
-(require 'gnus-sum)
-(require 'gnus-art)
-(require 'gnus-score)
-(require 'nntp)
-(require 'gnus-agent)
-(require 'nnml)
-(require 'gnus-async)
+(require 'db-mail)
 
 ;; Accounts
 
diff --git a/init.el b/init.el
index 3036229..c1d4dab 100644
--- a/init.el
+++ b/init.el
@@ -1197,28 +1197,6 @@
 
 ;; * Mail
 
-;; XXX: This needs some functionality for local accounts
-(defcustom db/mail-accounts nil
-  "Configuration for email accounts.
-This is a list of lists, where each such list specifies necessary
-parameters for one particular email address."
-  :group 'personal-settings
-  :type '(repeat
-          (list
-           (string :tag "EMail Address")
-           (string :tag "Group Name")
-           (string :tag "IMAP Server Address")
-           (string :tag "SMTP Server Address")
-           (choice :tag "SMTP Stream Type"
-                   (const nil) (const starttls) (const plain) (const ssl))
-           (integer :tag "SMTP Service Port")
-           (string :tag "SMTP Login Name"))))
-
-(defcustom db/personal-gnus-filter-rules nil
-  "Default filter rules as used by Gnus for `user-mail-address’."
-  :group 'personal-settings
-  :type 'sexp)
-
 (use-package db-mail
   :commands (db/public-key
              db/encryption-possible-p
@@ -1582,8 +1560,7 @@ parameters for one particular email address."
 
 (use-package notmuch
   :defer t
-  :init (progn
-          (setq notmuch-fcc-dirs nil)))
+  :init (setq notmuch-fcc-dirs nil))
 
 (use-package smtpmail
   :defer t
diff --git a/site-lisp/db-mail.el b/site-lisp/db-mail.el
index 5f69fd4..2c067ec 100644
--- a/site-lisp/db-mail.el
+++ b/site-lisp/db-mail.el
@@ -10,6 +10,28 @@
 (require 'epg)
 (require 'mml-sec)
 
+;; XXX: This needs some functionality for local accounts
+(defcustom db/mail-accounts nil
+  "Configuration for email accounts.
+This is a list of lists, where each such list specifies necessary
+parameters for one particular email address."
+  :group 'personal-settings
+  :type '(repeat
+          (list
+           (string :tag "EMail Address")
+           (string :tag "Group Name")
+           (string :tag "IMAP Server Address")
+           (string :tag "SMTP Server Address")
+           (choice :tag "SMTP Stream Type"
+                   (const nil) (const starttls) (const plain) (const ssl))
+           (integer :tag "SMTP Service Port")
+           (string :tag "SMTP Login Name"))))
+
+(defcustom db/personal-gnus-filter-rules nil
+  "Default filter rules as used by Gnus for `user-mail-address’."
+  :group 'personal-settings
+  :type 'sexp)
+
 (defun db/public-key (address &optional method)
   "Return valid public keys for ADDRESS and given METHOD.
 
@@ -19,11 +41,11 @@ ADDRESS is a string containing exactly one email address."
   (unless method (setq method "pgpmime"))
   (epg-list-keys (epg-make-context
                   (cond
-                    ((string= method "smime")
-                     'CMS)
-                    ((string= method "pgpmime")
-                     'OpenPGP)
-                    (t (error "Unknown method %s" method))))
+                   ((string= method "smime")
+                    'CMS)
+                   ((string= method "pgpmime")
+                    'OpenPGP)
+                   (t (error "Unknown method %s" method))))
                  address))
 
 (defun db/encryption-possible-p (recipients method)