diff options
| -rw-r--r-- | .config/git/config | 2 | ||||
| -rw-r--r-- | .config/git/mailmap | 6 | ||||
| -rw-r--r-- | .emacs.d/init.el | 25 |
3 files changed, 17 insertions, 16 deletions
diff --git a/.config/git/config b/.config/git/config index 9b9c776..bf797ab 100644 --- a/.config/git/config +++ b/.config/git/config @@ -1,6 +1,6 @@ [user] name = Amin Bandali - email = bandali@gnu.org + email = mab@gnu.org signingkey = BE6273738E616D6D1B3A08E8A21A020248816103 [commit] diff --git a/.config/git/mailmap b/.config/git/mailmap index 5753c4e..24bc10c 100644 --- a/.config/git/mailmap +++ b/.config/git/mailmap @@ -1,4 +1,4 @@ -<bandali@gnu.org> <aminb@gnu.org> -<bandali@gnu.org> <amin@gnu.org> -<bandali@gnu.org> <mab@gnu.org> +<mab@gnu.org> <bandali@gnu.org> +<mab@gnu.org> <aminb@gnu.org> +<mab@gnu.org> <amin@gnu.org> <amin@aminb.org> <me@aminb.org> diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 490df15..0443445 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 <bandali@gnu.org> +;; Copyright (C) 2018-2019 Amin Bandali <mab@gnu.org> ;; 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 @@ -1877,23 +1877,22 @@ For disabling the behaviour for certain buffers and/or modes." (use-feature gnus-msg :config - (defvar a/gnu-signature "Amin Bandali | GNU Webmaster -https://www.gnu.org/people/webmeisters.html#bandali -GPG Key: BE62 7373 8E61 6D6D 1B3A 08E8 A21A 0202 4881 6103") - (defvar a/uw-signature "Amin Bandali | https://aminb.org -Master of Mathematics Student + (defvar a/uw-signature "Amin Bandali, MMath Student Cheriton School of Computer Science -University of Waterloo") - (defvar a/csc-signature "Amin Bandali | Termcom, CSC -https://csclub.uwaterloo.ca/~abandali") +University of Waterloo +https://shemshak.org/~amin") + (defvar a/csc-signature "Amin Bandali +Termcom, Computer Science Club +University of Waterloo +https://shemshak.org/~amin") (setq gnus-posting-styles '((".*" (address "amin@shemshak.org") (body "\nBest,\n") (eval (setq a/message-cite-say-hi t))) ("nnimap\\+gnu:.*" - (address "bandali@gnu.org") - (signature a/gnu-signature) + (address "mab@gnu.org") + (organization "GNU Project") (eval (set (make-local-variable 'message-user-fqdn) "fencepost.gnu.org"))) ((header "subject" "ThankCRM") (to "webmasters-comment@gnu.org") @@ -1901,11 +1900,13 @@ https://csclub.uwaterloo.ca/~abandali") (eval (setq a/message-cite-say-hi nil))) ("nnimap\\+uw:.*" (address "abandali@uwaterloo.ca") + (organization "University of Waterloo") (signature a/uw-signature)) ("nnimap\\+uw:INBOX" (gcc "\"nnimap+uw:Sent Items\"")) ("nnimap\\+csc:.*" (address "abandali@csclub.uwaterloo.ca") + (organization "Computer Science Club, University of Waterloo") (signature a/csc-signature) (gcc "nnimap+csc:Sent"))))) @@ -1976,7 +1977,7 @@ https://csclub.uwaterloo.ca/~abandali") message-subscribed-address-functions '(gnus-find-subscribed-addresses) message-dont-reply-to-names - "\\(\\(amin@\\(shemshak\\|bndl\\)\\.org\\)\\|\\(.*@aminb\\.org\\)\\|\\(\\(bandali\\|aminb?\\|mab\\)@gnu\\.org\\)\\|\\(a\\(min\\.\\)?bandali@uwaterloo\\.ca\\)\\|\\(abandali@csclub\\.uwaterloo\\.ca\\)\\)") + "\\(\\(amin@\\(shemshak\\|bndl\\)\\.org\\)\\|\\(.*@aminb\\.org\\)\\|\\(\\(mab\\|bandali\\|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) |