Update gnus-secondary-select-methods and gnus-topic-topology

1 files changed, 110 insertions, 110 deletions

diff --git a/.emacs.d/lisp/bandali-gnus.el b/.emacs.d/lisp/bandali-gnus.el
index 21dd807..ceba4e1 100644
--- a/.emacs.d/lisp/bandali-gnus.el
+++ b/.emacs.d/lisp/bandali-gnus.el
@@ -1,6 +1,6 @@
 ;;; bandali-gnus.el --- bandali's Gnus setup         -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2018-2022  Amin Bandali
+;; Copyright (C) 2018-2024  Amin Bandali
 
 ;; Author: Amin Bandali <bandali@gnu.org>
 ;; Keywords: mail, news
@@ -46,112 +46,112 @@
 
  gnus-select-method '(nnnil "")
  gnus-secondary-select-methods
- `(,@(if (member (system-name) '("darya" "nostalgia"))
-         '((nnimap
-            "canonical"
-            (nnimap-stream plain)
-            (nnimap-address "127.0.0.1")
-            (nnimap-server-port 143)
-            (nnimap-authenticator plain)
-            (nnimap-user "bandali@canonical.local")))
+ `(,@(when (member (system-name) '("darya" "nostalgia"))
        '((nnimap
-          "kelar"
+          "canonical"
           (nnimap-stream plain)
           (nnimap-address "127.0.0.1")
           (nnimap-server-port 143)
           (nnimap-authenticator plain)
-          (nnimap-user "bandali@kelar.local"))
-         (nnimap
-          "shemshak"
-          (nnimap-stream plain)
-          (nnimap-address "127.0.0.1")
-          (nnimap-server-port 143)
-          (nnimap-authenticator plain)
-          (nnimap-user "bandali@shemshak.local"))
-         (nnimap
-          "gnu"
-          (nnimap-stream plain)
-          (nnimap-address "127.0.0.1")
-          (nnimap-server-port 143)
-          (nnimap-authenticator plain)
-          (nnimap-user "bandali@gnu.local")
-          (nnimap-inbox "INBOX")
-          (nnimap-split-methods 'nnimap-split-fancy)
-          (nnimap-split-fancy
-           (|
-            ;; (: gnus-registry-split-fancy-with-parent)
-            ;; (: gnus-group-split-fancy "INBOX" t "INBOX")
-            ;; spam
-            ("X-Spam_action" "reject" "Junk")
-            ;; keep debbugs emails in INBOX
-            (list ".*<\\(.*\\)\\.debbugs\\.gnu\\.org>.*" "INBOX")
-            ;; list moderation emails
-            (from ".+-\\(owner\\|bounces\\)@\\(non\\)?gnu\\.org" "listmod")
-            ;; gnu
-            (list ".*<\\(.*\\)\\.\\(non\\)?gnu\\.org>.*" "l.\\1")
-            ("Envelope-To" "emacsconf-donations@gnu.org" "l.emacsconf-donations")
-            ;; board-eval
-            (|
-             (list ".*<.*\\.board-eval\\.fsf\\.org>.*" "l.board-eval")
-             (from ".*@board-eval\\.fsf\\.org" "l.board-eval"))
-            ;; fsf
-            (list ".*<\\(.*\\)\\.fsf\\.org>.*" "l.\\1")
-            ;; cfarm
-            (from "cfarm-.*@lists\\.tetaneutral\\.net" "l.cfarm")
-            ;; debian
-            (list ".*<\\(.*\\)\\.\\(lists\\|other\\)\\.debian\\.org>.*" "l.\\1")
-            (list ".*<\\(.*\\)\\.alioth-lists\\.debian\\.net>.*" "l.\\1")
-            ;; gnus
-            (list ".*<\\(.*\\)\\.gnus\\.org>.*" "l.\\1")
-            ;; libreplanet
-            (list ".*<\\(.*\\)\\.libreplanet\\.org>.*" "l.\\1")
-            ;; iana (e.g. tz-announce)
-            (list ".*<\\(.*\\)\\.iana\\.org>.*" "l.\\1")
-            ;; mailop
-            (list ".*<\\(.*\\)\\.mailop\\.org>.*" "l.\\1")
-            ;; sdlu
-            (list ".*<\\(.*\\)\\.spammers\\.dontlike\\.us>.*" "l.sdlu")
-            ;; bitfolk
-            (from ".*@\\(.+\\)?bitfolk\\.com>.*" "bitfolk")
-            ;; haskell
-            (list ".*<\\(.*\\)\\.haskell\\.org>.*" "l.\\1")
-            ;; webmasters
-            (from "webmasters\\(-comment\\)?@gnu\\.org" "webmasters")
-            ;; other
-            (list ".*atreus.freelists.org" "l.atreus")
-            (list ".*deepspec.lists.cs.princeton.edu" "l.deepspec")
-            ;; (list ".*haskell-art.we.lurk.org" "l.haskell.art") ;d
-            ;; (list ".*notmuch.notmuchmail.org" "l.notmuch") ;u
-            (list ".*dev.lists.parabola.nu" "l.parabola-dev")
-            ;; ----------------------------------
-            ;; legend: (u)nsubscribed | (d)ead
-            ;; ----------------------------------
-            ;; otherwise, leave mail in INBOX
-            "INBOX")))
-         (nnimap
-          "csc"
-          (nnimap-stream plain)
-          (nnimap-address "127.0.0.1")
-          (nnimap-server-port 143)
-          (nnimap-authenticator plain)
-          (nnimap-user "abandali@csclub.uwaterloo.local")
-          (nnimap-inbox "INBOX")
-          (nnimap-split-methods 'nnimap-split-fancy)
-          (nnimap-split-fancy
-           (|
-            ;; cron reports and other messages from root
-            (from "root@\\(.*\\.\\)?csclub\\.uwaterloo\\.ca" "INBOX")
-            ;; spam
-            ("X-Spam-Flag" "YES" "Junk")
-            ;; catch-all
-            "INBOX")))
-         (nnimap
-          "sfl"
-          (nnimap-stream plain)
-          (nnimap-address "127.0.0.1")
-          (nnimap-server-port 143)
-          (nnimap-authenticator plain)
-          (nnimap-user "amin.bandali@savoirfairelinux.local")))))
+          (nnimap-user "bandali@canonical.local"))))
+   (nnimap
+    "kelar"
+    (nnimap-stream plain)
+    (nnimap-address "127.0.0.1")
+    (nnimap-server-port 143)
+    (nnimap-authenticator plain)
+    (nnimap-user "bandali@kelar.local"))
+   (nnimap
+    "shemshak"
+    (nnimap-stream plain)
+    (nnimap-address "127.0.0.1")
+    (nnimap-server-port 143)
+    (nnimap-authenticator plain)
+    (nnimap-user "bandali@shemshak.local"))
+   (nnimap
+    "gnu"
+    (nnimap-stream plain)
+    (nnimap-address "127.0.0.1")
+    (nnimap-server-port 143)
+    (nnimap-authenticator plain)
+    (nnimap-user "bandali@gnu.local")
+    (nnimap-inbox "INBOX")
+    (nnimap-split-methods 'nnimap-split-fancy)
+    (nnimap-split-fancy
+     (|
+      ;; (: gnus-registry-split-fancy-with-parent)
+      ;; (: gnus-group-split-fancy "INBOX" t "INBOX")
+      ;; spam
+      ("X-Spam_action" "reject" "Junk")
+      ;; keep debbugs emails in INBOX
+      (list ".*<\\(.*\\)\\.debbugs\\.gnu\\.org>.*" "INBOX")
+      ;; list moderation emails
+      (from ".+-\\(owner\\|bounces\\)@\\(non\\)?gnu\\.org" "listmod")
+      ;; gnu
+      (list ".*<\\(.*\\)\\.\\(non\\)?gnu\\.org>.*" "l.\\1")
+      ("Envelope-To" "emacsconf-donations@gnu.org" "l.emacsconf-donations")
+      ;; board-eval
+      (|
+       (list ".*<.*\\.board-eval\\.fsf\\.org>.*" "l.board-eval")
+       (from ".*@board-eval\\.fsf\\.org" "l.board-eval"))
+      ;; fsf
+      (list ".*<\\(.*\\)\\.fsf\\.org>.*" "l.\\1")
+      ;; cfarm
+      (from "cfarm-.*@lists\\.tetaneutral\\.net" "l.cfarm")
+      ;; debian
+      (list ".*<\\(.*\\)\\.\\(lists\\|other\\)\\.debian\\.org>.*" "l.\\1")
+      (list ".*<\\(.*\\)\\.alioth-lists\\.debian\\.net>.*" "l.\\1")
+      ;; gnus
+      (list ".*<\\(.*\\)\\.gnus\\.org>.*" "l.\\1")
+      ;; libreplanet
+      (list ".*<\\(.*\\)\\.libreplanet\\.org>.*" "l.\\1")
+      ;; iana (e.g. tz-announce)
+      (list ".*<\\(.*\\)\\.iana\\.org>.*" "l.\\1")
+      ;; mailop
+      (list ".*<\\(.*\\)\\.mailop\\.org>.*" "l.\\1")
+      ;; sdlu
+      (list ".*<\\(.*\\)\\.spammers\\.dontlike\\.us>.*" "l.sdlu")
+      ;; bitfolk
+      (from ".*@\\(.+\\)?bitfolk\\.com>.*" "bitfolk")
+      ;; haskell
+      (list ".*<\\(.*\\)\\.haskell\\.org>.*" "l.\\1")
+      ;; webmasters
+      (from "webmasters\\(-comment\\)?@gnu\\.org" "webmasters")
+      ;; other
+      (list ".*atreus.freelists.org" "l.atreus")
+      (list ".*deepspec.lists.cs.princeton.edu" "l.deepspec")
+      ;; (list ".*haskell-art.we.lurk.org" "l.haskell.art") ;d
+      ;; (list ".*notmuch.notmuchmail.org" "l.notmuch") ;u
+      (list ".*dev.lists.parabola.nu" "l.parabola-dev")
+      ;; ----------------------------------
+      ;; legend: (u)nsubscribed | (d)ead
+      ;; ----------------------------------
+      ;; otherwise, leave mail in INBOX
+      "INBOX")))
+   (nnimap
+    "csc"
+    (nnimap-stream plain)
+    (nnimap-address "127.0.0.1")
+    (nnimap-server-port 143)
+    (nnimap-authenticator plain)
+    (nnimap-user "abandali@csclub.uwaterloo.local")
+    (nnimap-inbox "INBOX")
+    (nnimap-split-methods 'nnimap-split-fancy)
+    (nnimap-split-fancy
+     (|
+      ;; cron reports and other messages from root
+      (from "root@\\(.*\\.\\)?csclub\\.uwaterloo\\.ca" "INBOX")
+      ;; spam
+      ("X-Spam-Flag" "YES" "Junk")
+      ;; catch-all
+      "INBOX")))
+   (nnimap
+    "sfl"
+    (nnimap-stream plain)
+    (nnimap-address "127.0.0.1")
+    (nnimap-server-port 143)
+    (nnimap-authenticator plain)
+    (nnimap-user "amin.bandali@savoirfairelinux.local")))
  gnus-message-archive-group "nnimap+gnu:INBOX"
  gnus-parameters
  '(("l\\.deepspec"
@@ -346,14 +346,14 @@
    gnus-topic-topology
    `(("Gnus" visible nil nil)
      (("misc" visible nil nil))
-     ,@(if (member (system-name) '("darya" "nostalgia"))
-           '((("canonical" visible nil nil)))
-         '((("csc" visible nil nil))
-           (("kelar" visible nil nil))
-           (("shemshak" visible nil nil))
-           (("gnu" visible nil nil))
-           ;(("old-gnu" visible nil nil))
-           (("sfl" visible nil nil)))))))
+     ,@(when (member (system-name) '("darya" "nostalgia"))
+         '((("canonical" visible nil nil))))
+     (("csc" visible nil nil))
+     (("kelar" visible nil nil))
+     (("shemshak" visible nil nil))
+     (("gnu" visible nil nil))
+     ;(("old-gnu" visible nil nil))
+     (("sfl" visible nil nil)))))
 
 (with-eval-after-load 'gnus-agent
   (setq gnus-agent-synchronize-flags 'ask))