Various mail-related updates and cleanups

[~bandali/configs] / .emacs.d / lisp / bandali-gnus.el

diff --git a/.emacs.d/lisp/bandali-gnus.el b/.emacs.d/lisp/bandali-gnus.el
index c2249a2..d8949ed 100644 (file)
--- a/.emacs.d/lisp/bandali-gnus.el
+++ b/.emacs.d/lisp/bandali-gnus.el
@@ -46,8 +46,14 @@
 
  gnus-select-method '(nnnil "")
  gnus-secondary-select-methods
 
  gnus-select-method '(nnnil "")
  gnus-secondary-select-methods

- `(,@(cond
-      ((string= (system-name) "langa")
+ `(,@(if (string= (system-name) "darya")
+         '((nnimap
+            "canonical"
+            (nnimap-stream plain)
+            (nnimap-address "127.0.0.1")
+            (nnimap-server-port 143)
+            (nnimap-authenticator plain)
+            (nnimap-user "bandali@canonical.local")))

        '((nnimap
           "kelar"
           (nnimap-stream plain)
        '((nnimap
           "kelar"
           (nnimap-stream plain)


@@ -149,13 +155,13 @@
             ;; spam
             ("X-Spam-Flag" "YES" "Junk")
             ;; catch-all
             ;; spam
             ("X-Spam-Flag" "YES" "Junk")
             ;; catch-all

-            "INBOX")))))
-      ((string= (system-name) "jirud")
-       '((nnimap
-         "sfl"
-         (nnimap-stream tls)
-         (nnimap-address "mail.savoirfairelinux.com")
-         (nnimap-user "amin.bandali"))))))
+            "INBOX")))
+         ;; (nnimap
+         ;;  "sfl"
+         ;;  (nnimap-stream tls)
+         ;;  (nnimap-address "mail.savoirfairelinux.com")
+         ;;  (nnimap-user "amin.bandali"))
+         )))

  gnus-message-archive-group "nnimap+gnu:INBOX"
  gnus-parameters
  '(("l\\.deepspec"
  gnus-message-archive-group "nnimap+gnu:INBOX"
  gnus-parameters
  '(("l\\.deepspec"


@@ -171,10 +177,6 @@
     (to-list    . "haskell-cafe@haskell.org")
     (list-identifier . "\\[Haskell-cafe\\]"))
    ("gnu.*"
     (to-list    . "haskell-cafe@haskell.org")
     (list-identifier . "\\[Haskell-cafe\\]"))
    ("gnu.*"

-    (gcc-self . t))
-   ;; ("l\\."
-   ;;  (subscribed . t))
-   ("nnimap\\+uwaterloo:.*"

     (gcc-self . t)))
  ;; nnimap-record-commands t
  ;; gnus-large-newsgroup  50
     (gcc-self . t)))
  ;; nnimap-record-commands t
  ;; gnus-large-newsgroup  50


@@ -245,7 +247,7 @@
                              ;; "^References:"
                              "^List-Id:"
                              "^Gnus-Warning:")
                              ;; "^References:"
                              "^List-Id:"
                              "^Gnus-Warning:")

-   gnus-visible-headers (mapconcat 'identity
+   gnus-visible-headers (mapconcat #'identity

                                    gnus-sorted-header-list
                                    "\\|")
   ;; local-lapsed article dates
                                    gnus-sorted-header-list
                                    "\\|")
   ;; local-lapsed article dates


@@ -290,49 +292,49 @@
 
 (defvar b/sfl-p nil)
 (with-eval-after-load 'gnus-msg
 
 (defvar b/sfl-p nil)
 (with-eval-after-load 'gnus-msg

-  (defvar b/shemshak-signature "Amin Bandali
-https://shemshak.org/~bandali")
-  (defvar b/uwaterloo-signature "Amin Bandali, MMath
-https://shemshak.org/~bandali")
-  (defvar b/csc-signature "Amin Bandali (https://shemshak.org/~bandali)
-Systems Committee <syscom@csclub.uwaterloo.ca>
-Computer Science Club of the University of Waterloo")
-  (defvar b/sfl-signature "Amin Bandali
-Free Software Consultant
-Savoir-faire Linux
-jami:bandali")
+  (let ((bandali "Amin Bandali (https://kelar.org/~bandali)"))
+    (defvar b/canonical-signature
+      (mapconcat
+       #'identity
+       `(,bandali
+         "Software Engineer (Desktop), Canonical")
+       "\n"))
+    (defvar b/csc-signature
+      (mapconcat
+       #'identity
+       `(,bandali
+         "Systems Committee <syscom@csclub.uwaterloo.ca>"
+         "Computer Science Club of the University of Waterloo")
+       "\n"))
+    (defvar b/sfl-signature
+      (mapconcat
+       #'identity
+       `(,bandali
+         "Volunteer, Savoir-faire Linux"
+         "jami:bandali")
+       "\n")))

   (setq
    gnus-message-replysign t
    gnus-posting-styles
    '((".*"
       (address "bandali@gnu.org")
       ("X-Message-SMTP-Method" "smtp fencepost.gnu.org 587"))
   (setq
    gnus-message-replysign t
    gnus-posting-styles
    '((".*"
       (address "bandali@gnu.org")
       ("X-Message-SMTP-Method" "smtp fencepost.gnu.org 587"))

-     ;; ("nnimap\\+gnu:l\\..*"
-     ;;  (signature nil))

      ((header "subject" "ThankCRM")
       (to "webmasters-comment@gnu.org")
      ((header "subject" "ThankCRM")
       (to "webmasters-comment@gnu.org")

-      (body "")
-      (eval (setq b/message-cite-say-hi nil)))
+      (body ""))

      ("nnimap\\+kelar:.*"
       (address "bandali@kelar.org")
       ("X-Message-SMTP-Method" "smtp mail.kelar.org 587")
      ("nnimap\\+kelar:.*"
       (address "bandali@kelar.org")
       ("X-Message-SMTP-Method" "smtp mail.kelar.org 587")

-      (body "\nBest,\n")
-      (gcc "nnimap+kelar:Sent")
-      (eval (setq b/message-cite-say-hi t)))
+      (gcc "nnimap+kelar:Sent"))

      ("nnimap\\+shemshak:.*"
       (address "amin@shemshak.org")
       ("X-Message-SMTP-Method" "smtp mail.shemshak.org 587")
      ("nnimap\\+shemshak:.*"
       (address "amin@shemshak.org")
       ("X-Message-SMTP-Method" "smtp mail.shemshak.org 587")

-      (body "\nBest,\n")
-      (signature b/shemshak-signature)
-      (gcc "nnimap+shemshak:Sent")
-      (eval (setq b/message-cite-say-hi t)))
-     ("nnimap\\+uwaterloo:.*"
-      (address "bandali@uwaterloo.ca")
-      ("X-Message-SMTP-Method" "smtp connect.uwaterloo.ca 587")
-      (body "\nBest,\n")
-      (signature b/uwaterloo-signature))
-     ("nnimap\\+uwaterloo:INBOX"
-      (gcc "\"nnimap+uwaterloo:Sent Items\""))
+      (gcc "nnimap+shemshak:Sent"))
+     ("nnimap\\+canonical:.*"
+      (address "amin.bandali@canonical.com")
+      ("X-Message-SMTP-Method" "smtp smtp.canonical.com 587")
+      (signature b/canonical-signature)
+      (gcc "nnimap+canonical:Sent"))

      ("nnimap\\+csc:.*"
       (address "bandali@csclub.uwaterloo.ca")
       ("X-Message-SMTP-Method" "smtp mail.csclub.uwaterloo.ca 587")
      ("nnimap\\+csc:.*"
       (address "bandali@csclub.uwaterloo.ca")
       ("X-Message-SMTP-Method" "smtp mail.csclub.uwaterloo.ca 587")


@@ -340,10 +342,10 @@ jami:bandali")
       (gcc "nnimap+csc:Sent"))
      ("nnimap\\+sfl:.*"
       (address "amin.bandali@savoirfairelinux.com")
       (gcc "nnimap+csc:Sent"))
      ("nnimap\\+sfl:.*"
       (address "amin.bandali@savoirfairelinux.com")

-      (signature b/sfl-signature)

       ("X-Message-SMTP-Method" "smtp mail.savoirfairelinux.com 587")
       ("X-Message-SMTP-Method" "smtp mail.savoirfairelinux.com 587")

-      (gcc "nnimap+sfl:Sent")
-      (eval (setq-local b/sfl-p t))))))
+      (signature b/sfl-signature)
+      (eval (setq-local b/sfl-p t))
+      (gcc "nnimap+sfl:Sent")))))

 ;; hooks
 ;; (with-eval-after-load 'gnus
 ;;   (add-hook 'gnus-message-setup-hook
 ;; hooks
 ;; (with-eval-after-load 'gnus
 ;;   (add-hook 'gnus-message-setup-hook


@@ -358,16 +360,15 @@ jami:bandali")
    gnus-topic-topology
    `(("Gnus" visible nil nil)
      (("misc" visible nil nil))
    gnus-topic-topology
    `(("Gnus" visible nil nil)
      (("misc" visible nil nil))

-     ,@(cond
-        ((string= (system-name) "jirud")
-         '((("sfl" visible nil nil))))
-        ((string= (system-name) "langa")
+     ,@(if (string= (system-name) "darya")
+           '((("canonical" visible nil nil)))

          '((("csc" visible nil nil))
            (("uwaterloo" visible nil nil))
            (("kelar" visible nil nil))
            (("shemshak" visible nil nil))
            (("gnu" visible nil nil))
          '((("csc" visible nil nil))
            (("uwaterloo" visible nil nil))
            (("kelar" visible nil nil))
            (("shemshak" visible nil nil))
            (("gnu" visible nil nil))

-           (("old-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))
 
 (with-eval-after-load 'gnus-agent
   (setq gnus-agent-synchronize-flags 'ask))