From 4ed3a945254d0ad4dc646d6a1816bd92236ccc66 Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Fri, 19 Jul 2019 11:37:40 -0400 Subject: [PATCH] hold off on using mab as primary for now --- .config/getmail/getmailrc | 2 +- .config/git/config | 2 +- .config/git/mailmap | 9 +++++---- .config/isync/mbsyncrc | 4 ++-- .config/msmtp/config | 8 ++++---- .emacs.d/init.el | 26 +++++++++++++------------- 6 files changed, 26 insertions(+), 25 deletions(-) diff --git a/.config/getmail/getmailrc b/.config/getmail/getmailrc index 4bb3cd4..e89702a 100644 --- a/.config/getmail/getmailrc +++ b/.config/getmail/getmailrc @@ -2,7 +2,7 @@ type = SimplePOP3SSLRetriever server = fencepost.gnu.org username = bandali -password_command = ("gpg", "--no-tty", "-q", "-d", "/home/mab/.passwd/gnu.gpg") +password_command = ("gpg", "--no-tty", "-q", "-d", "/home/amin/.passwd/gnu.gpg") port = 995 use_apop = True diff --git a/.config/git/config b/.config/git/config index bf797ab..9b9c776 100644 --- a/.config/git/config +++ b/.config/git/config @@ -1,6 +1,6 @@ [user] name = Amin Bandali - email = mab@gnu.org + email = bandali@gnu.org signingkey = BE6273738E616D6D1B3A08E8A21A020248816103 [commit] diff --git a/.config/git/mailmap b/.config/git/mailmap index 24bc10c..2c03291 100644 --- a/.config/git/mailmap +++ b/.config/git/mailmap @@ -1,4 +1,5 @@ - - - - + + + + + diff --git a/.config/isync/mbsyncrc b/.config/isync/mbsyncrc index fe6815c..5b9f8d1 100644 --- a/.config/isync/mbsyncrc +++ b/.config/isync/mbsyncrc @@ -6,7 +6,7 @@ Expunge Both ###### IMAPAccount shemshak Host mail.shemshak.org -User mab@shemshak.org +User amin@shemshak.org PassCmd "gpg -q --for-your-eyes-only --no-tty -d ~/.passwd/shemshak.gpg" SSLType IMAPS @@ -16,7 +16,7 @@ Account shemshak IMAPAccount shemshak-local Host 127.0.0.1 Port 143 -User mab@shemshak.local +User amin@shemshak.local PassCmd "gpg -q --for-your-eyes-only --no-tty -d ~/.passwd/shemshak-local.gpg" SSLType None diff --git a/.config/msmtp/config b/.config/msmtp/config index a863c09..bd508ee 100644 --- a/.config/msmtp/config +++ b/.config/msmtp/config @@ -11,16 +11,16 @@ host mail.shemshak.org # use `msmtp -a amin --serverinfo --tls --tls-certcheck=off --tls-fingerprint=` to get the current fingerprint tls_fingerprint 2F:48:C6:F4:BA:AB:3F:52:84:06:56:33:4B:29:57:84:0F:74:1B:DB:C1:83:25:03:67:05:9A:D4:2A:CE:D4:00 tls_starttls on -from mab@shemshak.org -user mab@shemshak.org +from amin@shemshak.org +user amin@shemshak.org passwordeval gpg2 --no-tty -q -d ~/.passwd/shemshak.gpg account aminb : shemshak from amin@aminb.org account bndl : shemshak from amin@bndl.org -account amin : shemshak -from amin@shemshak.org +account mab : shemshak +from mab@shemshak.org account gnu host fencepost.gnu.org diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 371a9a3..6b10ce0 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -1,6 +1,6 @@ ;;; init.el --- Amin Bandali's Emacs config -*- lexical-binding: t -*- -;; Copyright (C) 2018-2019 Amin Bandali +;; Copyright (C) 2018-2019 Amin Bandali ;; This program is free software: you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by @@ -74,7 +74,7 @@ ;;; whoami (setq user-full-name "Amin Bandali" - user-mail-address "mab@shemshak.org") + user-mail-address "amin@shemshak.org") ;;; comment macro @@ -1680,7 +1680,7 @@ For disabling the behaviour for certain buffers and/or modes." (nnimap-address "127.0.0.1") (nnimap-server-port 143) (nnimap-authenticator plain) - (nnimap-user "mab@shemshak.local")) + (nnimap-user "amin@shemshak.local")) (nnimap "gnu" (nnimap-stream plain) (nnimap-address "127.0.0.1") @@ -1926,23 +1926,23 @@ For disabling the behaviour for certain buffers and/or modes." (defvar mab/signature "Amin Bandali Free Software Activist | GNU Webmaster & Volunteer GPG: BE62 7373 8E61 6D6D 1B3A 08E8 A21A 0202 4881 6103 -https://shemshak.org/~mab") +https://shemshak.org/~amin") (defvar mab/uw-signature "Amin Bandali, MMath Student Cheriton School of Computer Science University of Waterloo -https://shemshak.org/~mab") +https://shemshak.org/~amin") (defvar mab/csc-signature "Amin Bandali Termcom, Computer Science Club University of Waterloo -https://shemshak.org/~mab") +https://shemshak.org/~amin") (setq gnus-posting-styles '((".*" - (address "mab@shemshak.org") + (address "amin@shemshak.org") (body "\nBest,\n") (signature mab/signature) (eval (setq mab/message-cite-say-hi t))) ("nnimap\\+gnu:.*" - (address "mab@gnu.org") + (address "bandali@gnu.org") (organization "GNU Project") (eval (set (make-local-variable 'message-user-fqdn) "fencepost.gnu.org"))) ((header "subject" "ThankCRM") @@ -2030,7 +2030,7 @@ https://shemshak.org/~mab") message-subscribed-address-functions '(gnus-find-subscribed-addresses) message-dont-reply-to-names - "\\(\\(\\(mab\\|amin\\)@shemshak\\.org\\)\\|\\(amin@bndl\\.org\\)\\|\\(.*@aminb\\.org\\)\\|\\(\\(mab\\|bandali\\|aminb?\\)@gnu\\.org\\)\\|\\(a\\(min\\.\\)?bandali@uwaterloo\\.ca\\)\\|\\(abandali@csclub\\.uwaterloo\\.ca\\)\\)") + "\\(\\(\\(amin\\|mab\\)@shemshak\\.org\\)\\|\\(amin@bndl\\.org\\)\\|\\(.*@aminb\\.org\\)\\|\\(\\(bandali\\|mab\\|aminb?\\)@gnu\\.org\\)\\|\\(a\\(min\\.\\)?bandali@uwaterloo\\.ca\\)\\|\\(abandali@csclub\\.uwaterloo\\.ca\\)\\)") (require 'company-ebdb) :hook (;; (message-setup . mml-secure-message-sign-pgpmime) (message-mode . flyspell-mode) @@ -2198,7 +2198,7 @@ https://shemshak.org/~mab") :after erc) (use-package znc - :straight (:host nil :repo "https://git.shemshak.org/mab/znc.el") + :straight (:host nil :repo "https://git.shemshak.org/amin/znc.el") :bind (("C-c a e e" . znc-erc) ("C-c a e a" . znc-all)) :config @@ -2208,11 +2208,11 @@ https://shemshak.org/~mab") (t (funcall (plist-get (car auth) :secret))))))) (setq znc-servers `(("znc.shemshak.org" 1337 t - ((freenode "mab/freenode" ,pwd))) + ((freenode "amin/freenode" ,pwd))) ("znc.shemshak.org" 1337 t - ((moznet "mab/moznet" ,pwd))) + ((moznet "amin/moznet" ,pwd))) ("znc.shemshak.org" 1337 t - ((oftc "mab/oftc" ,pwd))))))) + ((oftc "amin/oftc" ,pwd))))))) ;;; Post initialization -- 2.20.1