gnus' gravitational pull is strong

1 files changed, 26 insertions, 14 deletions

diff --git a/email.org b/email.org
index 57d5de0..74920d3 100644
--- a/email.org
+++ b/email.org
@@ -248,11 +248,22 @@
     (bbdb-initialize 'message 'pgp 'mail)
    #+end_src
 * gnus
-  #+begin_src emacs-lisp
-    (setq gnus-init-file "~/.emacs.d/gnus.el"
-          gnus-home-directory "~/.emacs.d/gnus"
-          gnus-directory gnus-home-directory)
-  #+end_src
+*** Directories
+    #+begin_src emacs-lisp
+      (setq gnus-init-file "~/.emacs.d/gnus.el"
+            gnus-home-directory "~/.emacs.d/gnus"
+            gnus-directory gnus-home-directory)
+    #+end_src
+*** Notifications
+    #+begin_src emacs-lisp
+      (defun jao-gnus-notify ()
+        (interactive)
+        (when (fboundp 'jao-gnus--notify)
+          (unless (derived-mode-p 'gnus-summary-mode
+                                  'gnus-article-mode
+                                  'gnus-group-mode)
+            (gnus-demon-scan-news))))
+    #+end_src
 * notmuch
 *** local path
     #+begin_src emacs-lisp
@@ -402,7 +413,8 @@
                            " "))
           (jao-minibuffer-refresh)))
 
-      (jao-minibuffer-add-variable 'jao-notmuch-minibuffer-string -20)
+      (when (eq jao-afio-mail-function 'notmuch)
+        (jao-minibuffer-add-variable 'jao-notmuch-minibuffer-string -20))
 
     #+end_src
 *** searches
@@ -619,18 +631,18 @@
         :init (setq notmuch-fcc-dirs
                     '((".*@bigml.com" . "bigml/sent +bigml +sent -new")
                       (".*" . "jao/sent +jao +sent -new"))
-                    notmuch-maildir-use-notmuch-insert t)
-        :config (setq message-directory "~/var/mail/"
-                      message-auto-save-directory
-                      (expand-file-name "drafts" message-directory))
-        :bind (:map message-mode-map
-                    (("C-c C-d" . notmuch-draft-postpone))))
-
+                    notmuch-maildir-use-notmuch-insert t))
+
+      (when (eq jao-afio-mail-function 'notmuch)
+        (setq message-directory "~/var/mail/"
+              message-auto-save-directory nil)
+        (eval-after-load "notmuch-message"
+          '(define-key message-mode-map (kbd "C-c C-d")
+             #'notmuch-draft-postpone)))
     #+end_src
 *** main
     #+begin_src emacs-lisp
       (use-package notmuch
-        :demand t
         :init
         (setq notmuch-crypto-process-mime t
               notmuch-show-mark-read-tags '("-new" "-unread")