6 files changed, 30 insertions, 29 deletions
diff --git a/notmuch/.config/afew/config b/notmuch/.config/afew/config
index e19a3b4..b1cc796 100644
--- a/notmuch/.config/afew/config
+++ b/notmuch/.config/afew/config
@@ -2,8 +2,6 @@
 
 [KillThreadsFilter]
 
-[ListMailsFilter]
-
 [ArchiveSentMailsFilter]
 sent_tag = sent
 
diff --git a/notmuch/.config/environment.d/20-mail.conf b/notmuch/.config/environment.d/20-mail.conf
index 1c12b82..d65f71a 100644
--- a/notmuch/.config/environment.d/20-mail.conf
+++ b/notmuch/.config/environment.d/20-mail.conf
@@ -1 +1 @@
-MAIL=$XDG_DATA_HOME/mail/porkbun/INBOX
+MAIL=$XDG_DATA_HOME/mail/tobyvin.dev/tobyv/INBOX
diff --git a/notmuch/.config/goimapnotify/goimapnotify.conf b/notmuch/.config/goimapnotify/goimapnotify.conf
index f1be213..ddc6871 100644
--- a/notmuch/.config/goimapnotify/goimapnotify.conf
+++ b/notmuch/.config/goimapnotify/goimapnotify.conf
@@ -1,17 +1,14 @@
 [
   {
-    "host": "imap.porkbun.com",
+    "host": "mail.tobyvin.dev",
     "port": 993,
     "tls": true,
-    "tlsOptions": {
-      "reject_unauthorized": false
-    },
-    "username": "tobyv@tobyvin.dev",
-    "passwordCmd": "pass tobyv@tobyvin.dev | head -n1",
+    "username": "tobyv",
+    "passwordCmd": "pass mail.tobyvin.dev/tobyv/imap",
     "boxes": [
       {
         "mailbox": "INBOX",
-        "onNewMail": "MAILDIR=porkbun:INBOX notmuch new"
+        "onNewMail": "MAILDIR=personal:INBOX notmuch new"
       }
     ]
   },
@@ -23,7 +20,7 @@
       "reject_unauthorized": false
     },
     "username": "tobyv13@gmail.com",
-    "passwordCmd": "pass gmail | head -n1",
+    "passwordCmd": "pass gmail.com/tobyv13@gmail.com",
     "boxes": [
       {
         "mailbox": "INBOX",
diff --git a/notmuch/.config/isyncrc b/notmuch/.config/isyncrc
index 0a69881..0705062 100644
--- a/notmuch/.config/isyncrc
+++ b/notmuch/.config/isyncrc
@@ -2,29 +2,29 @@ Create Both
 Expunge Both
 SyncState *
 
-IMAPAccount porkbun
-Host imap.porkbun.com
-User tobyv@tobyvin.dev
-PassCmd "pass tobyv@tobyvin.dev"
+IMAPAccount personal
+Host mail.tobyvin.dev
+User tobyv
+PassCmd "pass mail.tobyvin.dev/tobyv/imap"
 TLSType IMAPS
 CertificateFile /etc/ssl/certs/ca-certificates.crt
 
-IMAPStore porkbun-remote
-Account porkbun
+IMAPStore personal-remote
+Account personal
 
-MaildirStore porkbun-local
-Path ~/.local/share/mail/porkbun/
-Inbox ~/.local/share/mail/porkbun/INBOX
+MaildirStore personal-local
+Path ~/.local/share/mail/tobyvin.dev/tobyv/
+Inbox ~/.local/share/mail/tobyvin.dev/tobyv/INBOX
 
-Channel porkbun
-Far :porkbun-remote:
-Near :porkbun-local:
+Channel personal
+Far :personal-remote:
+Near :personal-local:
 Patterns *
 
 IMAPAccount gmail
 Host imap.gmail.com
 User tobyv13@gmail.com
-PassCmd "pass gmail"
+PassCmd "pass gmail.com/tobyv13@gmail.com"
 TLSType IMAPS
 CertificateFile /etc/ssl/certs/ca-certificates.crt
 
@@ -32,8 +32,8 @@ IMAPStore gmail-remote
 Account gmail
 
 MaildirStore gmail-local
-Path ~/.local/share/mail/gmail/
-Inbox ~/.local/share/mail/gmail/INBOX
+Path ~/.local/share/mail/gmail.com/tobyv13/
+Inbox ~/.local/share/mail/gmail.com/tobyv13/INBOX
 
 Channel gmail
 Far :gmail-remote:
diff --git a/notmuch/.config/notmuch/default/config b/notmuch/.config/notmuch/default/config
index ab4b3c6..75f4f5f 100644
--- a/notmuch/.config/notmuch/default/config
+++ b/notmuch/.config/notmuch/default/config
@@ -3,7 +3,7 @@ path=/home/tobyv/.local/share/mail
 [user]
 name=Toby Vincent
 primary_email=tobyv@tobyvin.dev
-other_email=tobyv13@gmail.com;tovince@siue.edu;
+other_email=postmaster@tobyvin.dev;hostmaster@tobyvin.dev;webmaster@tobyvin.dev;tobyv13@gmail.com;tovince@siue.edu;
 [new]
 tags=new
 ignore=.mbsyncstate;.uidvalidity;addressbook.tsv;mujmap.toml;
diff --git a/notmuch/.config/notmuch/default/hooks/post-insert b/notmuch/.config/notmuch/default/hooks/post-insert
index e1cff7e..add9d52 100755
--- a/notmuch/.config/notmuch/default/hooks/post-insert
+++ b/notmuch/.config/notmuch/default/hooks/post-insert
@@ -1,5 +1,11 @@
 #!/bin/sh
 
-for maildir in ${XDG_DATA_HOME}/mail/${MAILDIR:-*}/INBOX; do
-	maildir-rank-addr --maildir="$maildir"/INBOX --outputpath="${maildir%/INBOX}"/addressbook.tsv
+case "${MAILDIR%:*}" in
+personal) MAILDIR=tobyvin.dev/tobyv ;;
+gmail) MAILDIR=gmail.com/tobyv13 ;;
+*:*) MAILDIR=${MAILDIR%:*} ;;
+esac
+
+for maildir in ${XDG_DATA_HOME}/mail/${MAILDIR:-*}; do
+	maildir-rank-addr --maildir="$maildir" --outputpath="$maildir"/addressbook.tsv
 done