[emacs,rc] update mail and gpg key

diff --git a/.mailmap b/.mailmap
index 310e4de..5753c4e 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -1,3 +1,4 @@
-<mab@gnu.org>    <aminb@gnu.org>
-<mab@gnu.org>    <amin@gnu.org>
-<amin@aminb.org> <me@aminb.org>
+<bandali@gnu.org> <aminb@gnu.org>
+<bandali@gnu.org> <amin@gnu.org>
+<bandali@gnu.org> <mab@gnu.org>
+<amin@aminb.org>  <me@aminb.org>

diff --git a/init.org b/init.org
index d54b9af..0dcec85 100644 (file)
--- a/init.org
+++ b/init.org
@@ -1576,9 +1576,10 @@ See [[notmuch:id:87muuqsvci.fsf@fencepost.gnu.org][bug follow-up]].
         notmuch-hello-thousands-separator ","
         notmuch-fcc-dirs
         '(("amin@aminb.org"        . "amin/Sent")
-          ("amin@gnu.org"          . "gnu/Sent")
+          ("bandali@gnu.org"       . "gnu/Sent")
           ("abandali@uwaterloo.ca" . "\"uwaterloo/Sent Items\"")
           ("mab@gnu.org"           . "gnu/Sent")
+          ("amin@gnu.org"          . "gnu/Sent")
           ("aminb@gnu.org"         . "gnu/Sent")
           (".*"                    . "sent"))
         notmuch-search-result-format

diff --git a/rc.org b/rc.org
index 1fc1276..bdc4947 100644 (file)
--- a/rc.org
+++ b/rc.org
@@ -701,8 +701,8 @@ WantedBy=timers.target
 #+begin_src conf
 [user]
     name = Amin Bandali
-    email = mab@gnu.org
-    signingkey = CDDE75F903538E71813CDA27D1FBA36627D65876
+    email = bandali@gnu.org
+    signingkey = BE6273738E616D6D1B3A08E8A21A020248816103
 #+end_src
 
 **** signing
@@ -1546,19 +1546,15 @@ passwordeval gpg2 --no-tty -q -d ~/.passwd/amin.gpg
 account gnu
 host fencepost.gnu.org
 # use `msmtp -a gnu --serverinfo --tls --tls-certcheck=off --tls-fingerprint=` to get the current fingerprint
-tls_fingerprint 28:70:42:76:1C:EC:91:5F:D1:B3:27:A1:CD:3B:32:A4:8B:0B:DC:3A:CD:CA:F6:6F:E4:61:BA:69:D7:4D:0D:0B
+tls_fingerprint 34:60:91:B5:71:5B:76:87:50:F3:83:13:26:0F:EE:75:42:83:93:9A:E2:AF:1E:87:72:02:C9:61:CE:28:1B:8E
 tls_starttls on
 from aminb@gnu.org
 user aminb
 passwordeval gpg2 --no-tty -q -d ~/.passwd/gnu.gpg
 
-# gnu (amin)
-account gnu-amin : gnu
-from amin@gnu.org
-
-# gnu (mab)
-account gnu-mab : gnu
-from mab@gnu.org
+# gnu (bandali)
+account gnu-bandali : gnu
+from bandali@gnu.org
 
 # uwaterloo
 account uwaterloo
@@ -2191,7 +2187,7 @@ path=/home/amin/mail
 [user]
 name=Amin Bandali
 primary_email=amin@aminb.org
-other_email=mab@gnu.org;abandali@uwaterloo.ca;amin@gnu.org;aminb@gnu.org;
+other_email=bandali@gnu.org;abandali@uwaterloo.ca;
 
 # Configuration for "notmuch new"
 #
@@ -2277,7 +2273,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:amin@gnu.org or from:mab@gnu.org or from:aminb@gnu.org or from:abandali@uwaterloo.ca
+notmuch tag -new +sent -- from:amin@aminb.org or from:bandali@gnu.org or from:aminb@gnu.org or from:amin@gnu.org or from:mab@gnu.org or from:abandali@uwaterloo.ca
 
 # initial tagging
 notmuch tag -latest                     -- tag:latest
@@ -5188,7 +5184,7 @@ zhighlighters=(main brackets pattern)
 #
 
 # Load these ssh identities with the ssh module
-zssh_ids=(id_ed25519_mab)
+zssh_ids=(id_ed25519_bandali)
 
 
 #