gnus: use nnnm

1 files changed, 32 insertions, 37 deletions

diff --git a/gnus.org b/gnus.org
index 839005e..af2e36d 100644
--- a/gnus.org
+++ b/gnus.org
@@ -11,6 +11,7 @@
   (defvar jao-gnus-use-gmane nil)
   (defvar jao-gnus-use-nnml nil)
   (defvar jao-gnus-use-maildirs nil)
+  (defvar jao-gnus-use-nnnm t)
   #+end_src
 * Startup and kill
   #+begin_src emacs-lisp
@@ -57,12 +58,12 @@
 * Looks
 *** Verbosity
     #+begin_src emacs-lisp
-      (setq gnus-verbose 5)
+      (setq gnus-verbose 6)
     #+end_src
 *** Geometry
     #+begin_src emacs-lisp
       ;;; geometry:
-      (defvar jao-gnus-use-three-panes t)
+      (defvar jao-gnus-use-three-panes window-system)
       (defvar jao-gnus-groups-width 60)
       (defvar jao-gnus-wide-width 190)
 
@@ -143,11 +144,6 @@
   #+end_src
 * IMAP servers
   #+begin_src emacs-lisp
-    ;; archiving messages
-    (setq gnus-message-archive-group nil
-          nnimap-quirks nil)
-
-    ;; imap
     (when jao-gnus-use-local-imap
       (add-to-list 'gnus-secondary-select-methods
                    `(nnimap "" (nnimap-address "localhost"))))
@@ -163,9 +159,11 @@
       (add-to-list 'gnus-secondary-select-methods
                    '(nnimap "gandi" (nnimap-address "mail.gandi.net"))))
   #+end_src
-* Mailbox and maildir servers
+* Local mail servers
   #+begin_src emacs-lisp
-    (setq mail-sources nil)
+    (setq mail-sources nil
+          gnus-message-archive-group nil
+          nnimap-quirks nil)
 
     (setq nnml-get-new-mail t
           nnmail-treat-duplicates 'delete
@@ -181,7 +179,7 @@
           nnmail-split-methods 'nnmail-split-fancy)
 
     (when jao-gnus-use-nnml
-      (add-to-list 'gnus-secondary-select-methods `(nnml "")))
+      (add-to-list 'gnus-secondary-select-methods '(nnml "")))
 
     (when jao-gnus-use-maildirs
       (add-to-list 'gnus-secondary-select-methods
@@ -200,8 +198,8 @@
                                                    (remove-prefix
                                                     "/home/jao/var/mail/")))))
 
-    (when (require 'nnnotmuch nil t)
-      (add-to-list 'gnus-secondary-select-methods '(nnnotmuch "nm")))
+    (when (and jao-gnus-use-nnnm (require 'nnnm nil t))
+      (add-to-list 'gnus-secondary-select-methods '(nnnm "")))
   #+end_src
 * Demons and notifications
   #+begin_src emacs-lisp
@@ -400,32 +398,32 @@
     (setq gnus-permanently-visible-groups "^nnselect:.*")
 
     (setq gnus-parameters
-          `(("^nnimap:jao/.*"
-             (jao-gnus--trash-group "nnimap:jao/trash")
-             (jao-gnus--spam-group "nnimap:jao/spam")
-             (jao-gnus--archiving-group "nnimap:jao/trove"))
-            ("^nnimap:\\(jao\\|bigml\\)/\\(trash\\|spam\\)"
+          `(("^nnnm:jao/.*"
+             (jao-gnus--trash-group "nnnm:jao/trash")
+             (jao-gnus--spam-group "nnnm:jao/spam")
+             (jao-gnus--archiving-group "nnnm:jao/trove"))
+            ("^nnnm:\\(jao\\|bigml\\)/\\(trash\\|spam\\)"
              (gcc-self . nil)
              (auto-expire . t)
              (total-expire . t)
              (expiry-wait . 1)
              (jao-gnus--trash-group nil)
              (expiry-target . delete))
-            ("^nnimap:.*/\\(inbox\\|hacking\\)"
+            ("^nnnm:.*/\\(inbox\\|hacking\\)"
              (gcc-self . t))
-            ("^nnimap:bigml/.*"
+            ("^nnnm:bigml/.*"
              (gcc-self . t)
              (posting-style (address "jao@bigml.com"))
-             (jao-gnus--archiving-group "nnimap:bigml/trove")
-             (jao-gnus--spam-group "nnimap:bigml/spam"))
-            ("^nnimap:bigml/inbox"
-             (auto-expire . t)
-             (total-expire . t)
-             (expiry-wait . 7)
-             (expiry-target . "nnimap:bigml/trove"))
-            ("^nnimap:bigml/support"
+             (jao-gnus--archiving-group "nnnm:bigml/trove")
+             (jao-gnus--spam-group "nnnm:bigml/spam"))
+            ;; ("^nnnm:bigml/inbox"
+            ;;  (auto-expire . t)
+            ;;  (total-expire . t)
+            ;;  (expiry-wait . 7)
+            ;;  (expiry-target . "nnnm:bigml/trove"))
+            ("^nnnm:bigml/support"
              (posting-style (address "support@bigml.com")))
-            (,(format "^nnimap:bigml/%s"
+            (,(format "^nnnm:bigml/%s"
                       (regexp-opt '("reports" "deploys" "lists" "drivel")))
              (jao-gnus--trash-group nil)
              (gcc-self . nil)
@@ -433,24 +431,21 @@
              (total-expire . t)
              (expiry-wait . 3)
              (expiry-target . delete))
-            ("^nnimap:\\(jao/\\(think\\|drivel\\)\\|local\\)"
+            ("^nnnm:\\(jao/\\(think\\|drivel\\)\\|local\\|emacs.*\\)"
              (auto-expire . t)
              (total-expire . t)
              (expiry-wait . 1)
              (expiry-target . delete))
-            ("^nnimap:feeds/.*"
+            ("^nnnm:feeds/.*"
              (auto-expire . t)
              (total-expire . t)
              (expiry-wait . 7)
              (expiry-target . delete)
-             (jao-gnus--archiving-group "nnimap:feeds/trove"))
-            ("^nnimap:feeds/\\(news\\|emacs\\|prog\\)$" (expiry-wait . 1))
-            ("^nnimap:feeds/trove"
+             (jao-gnus--archiving-group "nnnm:feeds/trove"))
+            ("^nnnm:feeds/\\(news\\|emacs\\|prog\\)$" (expiry-wait . 1))
+            ("^nnnm:feeds/trove"
              (auto-expire . nil)
-             (total-expire . nil))
-            ("\\(gmane\\|gwene\\)\\..*"
-             (jao-gnus--archiving-group "nnimap:feeds/trove")
-             (posting-style (address "jao@gnu.org")))))
+             (total-expire . nil))))
   #+end_src
 * Summary buffer
 *** Configuration