summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--init.org3
-rw-r--r--rc.org18
2 files changed, 11 insertions, 10 deletions
diff --git a/init.org b/init.org
index 251e587..795f6fc 100644
--- a/init.org
+++ b/init.org
@@ -1214,6 +1214,7 @@ See [[notmuch:id:87muuqsvci.fsf@fencepost.gnu.org][bug follow-up]].
;; :ensure nil
:config
(setq sendmail-program "/usr/bin/msmtp"
+ ; message-sendmail-extra-arguments '("-v" "-d")
mail-specify-envelope-from t
mail-envelope-from 'header))
@@ -1262,7 +1263,7 @@ See [[notmuch:id:87muuqsvci.fsf@fencepost.gnu.org][bug follow-up]].
notmuch-fcc-dirs
'(("amin@aminb.org" . "amin/Sent")
("abandali@uwaterloo.ca" . "\"uwaterloo/Sent Items\"")
- ("amin.bandali@uwaterloo.ca" . "\"uwaterloo/Sent Items\"")
+ ("mab@gnu.org" . "gnu/Sent")
("aminb@gnu.org" . "gnu/Sent")
(".*" . "sent"))
notmuch-search-result-format
diff --git a/rc.org b/rc.org
index d1155f1..5327f2a 100644
--- a/rc.org
+++ b/rc.org
@@ -643,7 +643,7 @@ timeout = 0
#+begin_src conf
[user]
name = Amin Bandali
- email = amin@aminb.org
+ email = mab@gnu.org
signingkey = 4E05246AB0BF7FFB
#+end_src
@@ -721,8 +721,8 @@ timeout = 0
**** send-email
#+begin_src conf
[sendemail]
- smtpuser = amin@aminb.org
- smtpserver = nix.aminb.org
+ smtpuser = aminb
+ smtpserver = fencepost.gnu.org
smtpserverport = 587
smtpencryption = tls
annotate = yes
@@ -1475,6 +1475,10 @@ from aminb@gnu.org
user aminb
passwordeval gpg2 --no-tty -q -d ~/.passwd/gnu.gpg
+# gnu (new address)
+account gnu-mab : gnu
+from mab@gnu.org
+
# uwaterloo
account uwaterloo
host connect.uwaterloo.ca
@@ -1484,10 +1488,6 @@ user abandali
passwordeval gpg2 --no-tty -q -d ~/.passwd/uwaterloo.gpg
tls_trust_file /etc/ssl/certs/ca-certificates.crt
-# uwaterloo (friendly address)
-account uwaterloo-friendly : uwaterloo
-from amin.bandali@uwaterloo.ca
-
# Set a default account
account default : aminb
#+end_src
@@ -2110,7 +2110,7 @@ path=/home/amin/mail
[user]
name=Amin Bandali
primary_email=amin@aminb.org
-other_email=abandali@uwaterloo.ca;amin.bandali@uwaterloo.ca;aminb@gnu.org;
+other_email=abandali@uwaterloo.ca;mab@gnu.org;aminb@gnu.org;
# Configuration for "notmuch new"
#
@@ -2196,7 +2196,7 @@ sieve-filter -eW -o postmaster_address=postmaster@aminb.org \
#+begin_src sh
# apply sent tag to messages sent by me
-notmuch tag -new +sent -- from:amin@aminb.org or from:aminb@gnu.org or from:abandali@uwaterloo.ca or from:amin.bandali@uwaterloo.ca
+notmuch tag -new +sent -- from:amin@aminb.org or from:mab@gnu.org or from:aminb@gnu.org or from:abandali@uwaterloo.ca
# initial tagging
notmuch tag -latest -- tag:latest