Update primary Canonical mail and a few other small tweaks

5 files changed, 21 insertions, 6 deletions

diff --git a/.config/darya.profile b/.config/darya.profile
index 84135a6..8ef422d 100644
--- a/.config/darya.profile
+++ b/.config/darya.profile
@@ -1,6 +1,6 @@
 # -*- mode: sh; sh-shell: sh -*-
 
 export DEBFULLNAME="Amin Bandali"
-export DEBEMAIL="amin.bandali@canonical.com"
-export UBUMAIL="Amin Bandali <amin.bandali@canonical.com>"
+export DEBEMAIL="bandali@canonical.com"
+export UBUMAIL="Amin Bandali <bandali@canonical.com>"
 export UBUNTUTOOLS_BUILDER=sbuild
diff --git a/.config/dovecot/canonical.sieve b/.config/dovecot/canonical.sieve
index 70ffe5f..ef510a4 100644
--- a/.config/dovecot/canonical.sieve
+++ b/.config/dovecot/canonical.sieve
@@ -41,7 +41,9 @@ if address :is "from" "notifications@github.com" {
   stop;
 }
 
-if header :regex "list-id" "<([a-z_0-9-]+)[.@]" {
+if allof (header :regex "list-id" "<([a-z_0-9-]+)[.@]",
+  not address :regex :localpart "from" "^(no)?reply")
+{
   set :lower "listname" "${1}";
   fileinto :create "l.${listname}";
   stop;
diff --git a/.config/git/config.canonical b/.config/git/config.canonical
index d88fe03..6d276f5 100644
--- a/.config/git/config.canonical
+++ b/.config/git/config.canonical
@@ -1,2 +1,2 @@
 [user]
-	email = amin.bandali@canonical.com
+	email = bandali@canonical.com
diff --git a/.emacs.d/lisp/bandali-gnus.el b/.emacs.d/lisp/bandali-gnus.el
index e09fa30..63c7c00 100644
--- a/.emacs.d/lisp/bandali-gnus.el
+++ b/.emacs.d/lisp/bandali-gnus.el
@@ -257,6 +257,8 @@
   (setq gnus-thread-sort-functions '(gnus-thread-sort-by-number
                                      gnus-thread-sort-by-subject
                                      gnus-thread-sort-by-date))
+  (with-eval-after-load 'message
+    (setq gnus-ignored-from-addresses message-dont-reply-to-names))
   ;; local key bindings
   (define-key gnus-summary-mode-map (kbd "M-L") #'org-store-link)
   ;; (define-key gnus-summary-mode-map (kbd "r")
@@ -311,7 +313,7 @@
       ("X-Message-SMTP-Method" "smtp mail.shemshak.org 587")
       (gcc "nnimap+shemshak:Sent"))
      ("nnimap\\+canonical:.*"
-      (address "amin.bandali@canonical.com")
+      (address "bandali@canonical.com")
       ("X-Message-SMTP-Method" "smtp smtp.canonical.com 587")
       (signature nil)
       (gcc "nnimap+canonical:Sent"))
@@ -366,6 +368,9 @@
    'mm-archive-decoders
    '("application/gzip" nil "gunzip" "-S" ".zip" "-kd" "%f" "-r")))
 
+(with-eval-after-load 'gnus-start
+  (add-hook 'gnus-after-getting-new-news-hook #'gnus-notifications))
+
 (with-eval-after-load 'mm-decode
   (setq
    ;; mm-attachment-override-types `("text/x-diff" "text/x-patch"
diff --git a/.emacs.d/lisp/bandali-message.el b/.emacs.d/lisp/bandali-message.el
index 137e3b3..8e13d73 100644
--- a/.emacs.d/lisp/bandali-message.el
+++ b/.emacs.d/lisp/bandali-message.el
@@ -59,7 +59,15 @@
    message-subscribed-address-functions
    '(gnus-find-subscribed-addresses)
    message-dont-reply-to-names
-   "\\(\\(bandali@kelar\\.org\\)\\|\\(amin@shemshak\\.org\\)\\|\\(\\(bandali\\|mab\\|aminb?\\)@gnu\\.org\\)\\|\\(a?bandali@\\(csclub\\.\\)?uwaterloo\\.ca\\)\\|amin\\.bandali@\\(canonical\\|savoirfairelinux\\)\\.com\\)")
+   (mapconcat
+    #'identity
+    '("\\(bandali\\|mab\\|aminb?\\)@gnu\\.org"
+      "bandali@kelar\\.org"
+      "amin@shemshak\\.org"
+      "a?bandali@\\(csclub\\.\\)?uwaterloo\\.ca"
+      "amin\\.bandali@savoirfairelinux\\.com"
+      "\\(amin\\.\\)?bandali@canonical\\.com")
+    "\\|"))
   ;; (custom-set-faces
   ;;  '(message-header-subject
   ;;    ((t (:foreground "#111" :weight semi-bold))))