rename a few accounts and filenames

5 files changed, 36 insertions, 36 deletions

diff --git a/.bashrc b/.bashrc
index bc59480..13ba8ce 100644
--- a/.bashrc
+++ b/.bashrc
@@ -37,7 +37,7 @@ alias scl=systemctl
 alias jcl=journalctl
 alias mbsync='mbsync -c "$XDG_CONFIG_HOME"/isync/mbsyncrc'
 alias getmail='getmail --getmaildir "$XDG_CONFIG_HOME"/getmail --rcfile getmailrc'
-alias mb="mbsync csclub; mbsync uwaterloo; mbsync amin"
+alias mb="mbsync csclub; mbsync uwaterloo; mbsync shemshak"
 alias gm="getmail"
 alias m="mb; gm"
 alias best="youtube-dl -f best"
diff --git a/.config/getmail/getmailrc b/.config/getmail/getmailrc
index e89702a..4bb3cd4 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/amin/.passwd/gnu.gpg")
+password_command = ("gpg", "--no-tty", "-q", "-d", "/home/mab/.passwd/gnu.gpg")
 port = 995
 use_apop = True
 
diff --git a/.config/isync/mbsyncrc b/.config/isync/mbsyncrc
index ba696ca..fe6815c 100644
--- a/.config/isync/mbsyncrc
+++ b/.config/isync/mbsyncrc
@@ -4,28 +4,28 @@ Create Both
 Expunge Both
 
 ######
-IMAPAccount amin
+IMAPAccount shemshak
 Host mail.shemshak.org
-User amin@shemshak.org
-PassCmd "gpg -q --for-your-eyes-only --no-tty -d ~/.passwd/amin.gpg"
+User mab@shemshak.org
+PassCmd "gpg -q --for-your-eyes-only --no-tty -d ~/.passwd/shemshak.gpg"
 SSLType IMAPS
 
-IMAPStore amin-remote
-Account amin
+IMAPStore shemshak-remote
+Account shemshak
 
-IMAPAccount amin-dovecot
+IMAPAccount shemshak-local
 Host 127.0.0.1
 Port 143
-User amin@shemshak.local
-PassCmd "gpg -q --for-your-eyes-only --no-tty -d ~/.passwd/amin-dovecot.gpg"
+User mab@shemshak.local
+PassCmd "gpg -q --for-your-eyes-only --no-tty -d ~/.passwd/shemshak-local.gpg"
 SSLType None
 
-IMAPStore amin-local
-Account amin-dovecot
+IMAPStore shemshak-local
+Account shemshak-local
 
-Channel amin
-Master :amin-remote:
-Slave :amin-local:
+Channel shemshak
+Master :shemshak-remote:
+Slave :shemshak-local:
 Patterns *
 
 ######
@@ -38,15 +38,15 @@ SSLType IMAPS
 IMAPStore uwaterloo-remote
 Account uwaterloo
 
-IMAPAccount uwaterloo-dovecot
+IMAPAccount uwaterloo-local
 Host 127.0.0.1
 Port 143
 User abandali@uw.local
-PassCmd "gpg -q --for-your-eyes-only --no-tty -d ~/.passwd/uwaterloo-dovecot.gpg"
+PassCmd "gpg -q --for-your-eyes-only --no-tty -d ~/.passwd/uwaterloo-local.gpg"
 SSLType None
 
 IMAPStore uwaterloo-local
-Account uwaterloo-dovecot
+Account uwaterloo-local
 
 Channel uwaterloo
 Master :uwaterloo-remote:
@@ -63,15 +63,15 @@ SSLType IMAPS
 IMAPStore csclub-remote
 Account csclub
 
-IMAPAccount csclub-dovecot
+IMAPAccount csclub-local
 Host 127.0.0.1
 Port 143
 User abandali@csc.uw.local
-PassCmd "gpg -q --for-your-eyes-only --no-tty -d ~/.passwd/csclub-dovecot.gpg"
+PassCmd "gpg -q --for-your-eyes-only --no-tty -d ~/.passwd/csclub-local.gpg"
 SSLType None
 
 IMAPStore csclub-local
-Account csclub-dovecot
+Account csclub-local
 
 Channel csclub
 Master :csclub-remote:
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 66980c5..371a9a3 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -18,7 +18,7 @@
 ;;; Commentary:
 
 ;; Emacs configuration of Amin Bandali, computer scientist, functional
-;; programmer, and free software advocate.  Uses straight.el for
+;; programmer, and free software activist.  Uses straight.el for
 ;; purely functional and fully reproducible package management.
 
 ;; Over the years, I've taken inspiration from configurations of many
@@ -74,7 +74,7 @@
 ;;; whoami
 
 (setq user-full-name "Amin Bandali"
-      user-mail-address "amin@shemshak.org")
+      user-mail-address "mab@shemshak.org")
 
 
 ;;; comment macro
@@ -1675,12 +1675,12 @@ For disabling the behaviour for certain buffers and/or modes."
   (setq
    gnus-select-method '(nnnil "")
    gnus-secondary-select-methods
-   '((nnimap "amin"
+   '((nnimap "shemshak"
             (nnimap-stream plain)
             (nnimap-address "127.0.0.1")
             (nnimap-server-port 143)
             (nnimap-authenticator plain)
-            (nnimap-user "amin@shemshak.local"))
+            (nnimap-user "mab@shemshak.local"))
      (nnimap "gnu"
             (nnimap-stream plain)
             (nnimap-address "127.0.0.1")
@@ -1750,7 +1750,7 @@ For disabling the behaviour for certain buffers and/or modes."
              (nnimap-server-port 143)
              (nnimap-authenticator plain)
              (nnimap-user "abandali@csc.uw.local")))
-   gnus-message-archive-group "nnimap+amin:Sent"
+   gnus-message-archive-group "nnimap+shemshak:Sent"
    gnus-parameters
    '(("l\\.deepspec"
       (to-address . "deepspec@lists.cs.princeton.edu")
@@ -1926,18 +1926,18 @@ 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/~amin")
+https://shemshak.org/~mab")
   (defvar mab/uw-signature "Amin Bandali, MMath Student
 Cheriton School of Computer Science
 University of Waterloo
-https://shemshak.org/~amin")
+https://shemshak.org/~mab")
   (defvar mab/csc-signature "Amin Bandali
 Termcom, Computer Science Club
 University of Waterloo
-https://shemshak.org/~amin")
+https://shemshak.org/~mab")
   (setq gnus-posting-styles
         '((".*"
-           (address "amin@shemshak.org")
+           (address "mab@shemshak.org")
            (body "\nBest,\n")
            (signature mab/signature)
            (eval (setq mab/message-cite-say-hi t)))
@@ -2030,7 +2030,7 @@ https://shemshak.org/~amin")
         message-subscribed-address-functions
         '(gnus-find-subscribed-addresses)
         message-dont-reply-to-names
-        "\\(\\(amin@\\(shemshak\\|bndl\\)\\.org\\)\\|\\(.*@aminb\\.org\\)\\|\\(\\(mab\\|bandali\\|aminb?\\)@gnu\\.org\\)\\|\\(a\\(min\\.\\)?bandali@uwaterloo\\.ca\\)\\|\\(abandali@csclub\\.uwaterloo\\.ca\\)\\)")
+        "\\(\\(\\(mab\\|amin\\)@shemshak\\.org\\)\\|\\(amin@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)
@@ -2198,7 +2198,7 @@ https://shemshak.org/~amin")
   :after erc)
 
 (use-package znc
-  :straight (:host nil :repo "https://git.shemshak.org/amin/znc.el")
+  :straight (:host nil :repo "https://git.shemshak.org/mab/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/~amin")
                 (t (funcall (plist-get (car auth) :secret)))))))
     (setq znc-servers
           `(("znc.shemshak.org" 1337 t
-             ((freenode "amin/freenode" ,pwd)))
+             ((freenode "mab/freenode" ,pwd)))
             ("znc.shemshak.org" 1337 t
-             ((moznet "amin/moznet" ,pwd)))
+             ((moznet "mab/moznet" ,pwd)))
             ("znc.shemshak.org" 1337 t
-             ((oftc "amin/oftc" ,pwd)))))))
+             ((oftc "mab/oftc" ,pwd)))))))
 
 
 ;;; Post initialization
diff --git a/.emacs.d/var/eshell/alias b/.emacs.d/var/eshell/alias
index 0cc10a0..5d2f768 100644
--- a/.emacs.d/var/eshell/alias
+++ b/.emacs.d/var/eshell/alias
@@ -16,6 +16,6 @@ alias vi find-file $1
 alias vim find-file $1
 alias mbsync mbsync -c $XDG_CONFIG_HOME/isync/mbsyncrc $*
 alias getmail getmail --getmaildir $XDG_CONFIG_HOME/getmail --rcfile getmailrc $*
-alias mb mbsync csclub; mbsync uwaterloo; mbsync amin
+alias mb mbsync csclub; mbsync uwaterloo; mbsync shemshak
 alias gm getmail
 alias m mb; gm