13 files changed, 86 insertions, 27 deletions
diff --git a/aerc/.config/aerc/accounts.conf b/aerc/.config/aerc/accounts.conf
index 7c99e39..b4ceca7 100644
--- a/aerc/.config/aerc/accounts.conf
+++ b/aerc/.config/aerc/accounts.conf
@@ -1,11 +1,22 @@
-[Gmail]
+[tobyv@tobyvin.dev]
+source = maildir://~/.local/share/mail/porkbun
+check-mail-cmd = mbsync -c $XDG_CONFIG_HOME/mbsync/mbsyncrc porkbun
+outgoing = /usr/sbin/sendmail
+from = Toby Vincent <tobyv@tobyvin.dev>
+signature-file = ~/.config/aerc/default.sig
+pgp-auto-sign = true
+folders-sort = INBOX,Sent,Drafts,Trash
+address-book-cmd="grep -iPm 100 --color=never %s /home/tobyv/.local/share/mail/porkbun/addressbook.tsv"
+
+[tobyv13@gmail.com]
 source = maildir://~/.local/share/mail/gmail
 check-mail-cmd = mbsync -c $XDG_CONFIG_HOME/mbsync/mbsyncrc gmail
 outgoing = /usr/sbin/sendmail
-from = Toby Vincent <tobyv@tobyvin.dev>
-signature-file = ~/.config/aerc/gmail.sig
+from = Toby Vincent <tobyv13@gmail.com>
+signature-file = ~/.config/aerc/default.sig
 pgp-auto-sign = true
 folders-sort = INBOX,Sent,Drafts,Trash
+address-book-cmd="grep -iPm 100 --color=never %s /home/tobyv/.local/share/mail/gmail/addressbook.tsv"
 
 [Feeds]
 source = maildir://~/.local/share/mail/feeds
diff --git a/aerc/.config/aerc/binds.conf b/aerc/.config/aerc/binds.conf
index 2a69b57..ad7b00e 100644
--- a/aerc/.config/aerc/binds.conf
+++ b/aerc/.config/aerc/binds.conf
@@ -1,7 +1,7 @@
-gn = :next-folder<Enter>
-gp = :prev-folder<Enter>
-gt = :next-tab<Enter>
-gT = :prev-tab<Enter>
+<C-n> = :next-folder<Enter>
+gn = :next-tab<Enter>
+<C-p> = :prev-folder<Enter>
+gp = :prev-tab<Enter>
 <C-h> = :help keys<Enter>
 
 [messages]
@@ -9,14 +9,12 @@ q = :quit<Enter>
 
 j = :next<Enter>
 <Down> = :next<Enter>
-<C-n> = :next<Enter>
 <C-d> = :next 50%<Enter>
 <C-f> = :next 100%<Enter>
 <PgDn> = :next 100%<Enter>
 
 k = :prev<Enter>
 <Up> = :prev<Enter>
-<C-p> = :prev<Enter>
 <C-u> = :prev 50%<Enter>
 <C-b> = :prev 100%<Enter>
 <PgUp> = :prev 100%<Enter>
diff --git a/aerc/.config/aerc/gmail.sig b/aerc/.config/aerc/default.sig
index e46e800..e46e800 100644
--- a/aerc/.config/aerc/gmail.sig
+++ b/aerc/.config/aerc/default.sig
diff --git a/aerc/.config/maildir-rank-addr/config.toml b/aerc/.config/maildir-rank-addr/config.toml
new file mode 100644
index 0000000..139faba
--- /dev/null
+++ b/aerc/.config/maildir-rank-addr/config.toml
@@ -0,0 +1,5 @@
+addresses = [
+    "tobyv@tobyvin.dev",
+    "tobyv13@gmail.com"
+]
+template = "{{.Address}}\t{{.Name}}\t{{.NormalizedName}}"
diff --git a/aerc/.config/systemd/user/maildir-rank-addr.service b/aerc/.config/systemd/user/maildir-rank-addr.service
deleted file mode 100644
index b9fcf24..0000000
--- a/aerc/.config/systemd/user/maildir-rank-addr.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Generates a ranked addressbook from a maildir folder
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/maildir-rank-addr --maildir=${MAIL} --addresses="tobyv@tobyvin.dev,tobyv13@gmail.com" --template='{{.Address}}\t{{.Name}}\t{{.NormalizedName}}'
-
-[Install]
-WantedBy=default.target
diff --git a/aerc/.config/systemd/user/maildir-rank-addr@.service b/aerc/.config/systemd/user/maildir-rank-addr@.service
new file mode 100644
index 0000000..03436a3
--- /dev/null
+++ b/aerc/.config/systemd/user/maildir-rank-addr@.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Generates a ranked addressbook from a maildir folder
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/maildir-rank-addr --maildir=${XDG_DATA_HOME}/mail/%i/INBOX --outputpath=${XDG_DATA_HOME}/mail/%i/addressbook.tsv
+
+[Install]
+WantedBy=default.target
diff --git a/aerc/.config/systemd/user/maildir-rank-addr.timer b/aerc/.config/systemd/user/maildir-rank-addr@.timer
index 24c6b7e..d8542ab 100644
--- a/aerc/.config/systemd/user/maildir-rank-addr.timer
+++ b/aerc/.config/systemd/user/maildir-rank-addr@.timer
@@ -3,7 +3,7 @@ Description=Addressbook generation timer
 
 [Timer]
 OnUnitActiveSec=12h
-Unit=maildir-rank-addr.service
+Unit=maildir-rank-addr@%i.service
 
 [Install]
 WantedBy=timers.target
diff --git a/mbsync/.config/environment.d/20-mail.conf b/mbsync/.config/environment.d/20-mail.conf
index e3e2599..1c12b82 100644
--- a/mbsync/.config/environment.d/20-mail.conf
+++ b/mbsync/.config/environment.d/20-mail.conf
@@ -1 +1 @@
-MAIL=$XDG_DATA_HOME/mail/gmail/INBOX
+MAIL=$XDG_DATA_HOME/mail/porkbun/INBOX
diff --git a/mbsync/.config/imapnotify/porkbun.conf b/mbsync/.config/imapnotify/porkbun.conf
new file mode 100644
index 0000000..60b71f9
--- /dev/null
+++ b/mbsync/.config/imapnotify/porkbun.conf
@@ -0,0 +1,14 @@
+{
+    "host": "imap.porkbun.com",
+    "port": 993,
+    "tls": true,
+    "tlsOptions": {
+        "rejectUnauthorized": false
+    },
+    "username": "tobyv@tobyvin.dev",
+    "passwordCmd": "pass tobyv@tobyvin.dev | head -n1",
+    "onNewMail": "mbsync -c $XDG_CONFIG_HOME/mbsync/mbsyncrc porkbun",
+    "boxes": [
+        "INBOX"
+    ]
+}
diff --git a/mbsync/.config/mbsync/mbsyncrc b/mbsync/.config/mbsync/mbsyncrc
index 32b6305..2fc8de6 100644
--- a/mbsync/.config/mbsync/mbsyncrc
+++ b/mbsync/.config/mbsync/mbsyncrc
@@ -2,6 +2,25 @@ Create Both
 Expunge Both
 SyncState *
 
+IMAPAccount porkbun
+Host imap.porkbun.com
+User tobyv@tobyvin.dev
+PassCmd "pass tobyv@tobyvin.dev"
+SSLType IMAPS
+CertificateFile /etc/ssl/certs/ca-certificates.crt
+
+IMAPStore porkbun-remote
+Account porkbun
+
+MaildirStore porkbun-local
+Path ~/.local/share/mail/porkbun/
+Inbox ~/.local/share/mail/porkbun/INBOX
+
+Channel porkbun
+Far :porkbun-remote:
+Near :porkbun-local:
+Patterns *
+
 IMAPAccount gmail
 Host imap.gmail.com
 User tobyv13@gmail.com
diff --git a/mbsync/.config/systemd/user/maildir-notify.service b/mbsync/.config/systemd/user/maildir-notify.service
index 59dc969..3c57b06 100644
--- a/mbsync/.config/systemd/user/maildir-notify.service
+++ b/mbsync/.config/systemd/user/maildir-notify.service
@@ -3,7 +3,7 @@ Description=Watches Maildir for new mail and sends notifications
 
 [Service]
 Type=simple
-ExecStart=%h/.local/bin/maildir-notify %h/.local/share/mail/gmail/INBOX %h/.local/share/mail/feeds/INBOX
+ExecStart=%h/.local/bin/maildir-notify
 RestartSec=10
 
 [Install]
diff --git a/mbsync/.local/bin/maildir-notify b/mbsync/.local/bin/maildir-notify
index 198046e..065339f 100755
--- a/mbsync/.local/bin/maildir-notify
+++ b/mbsync/.local/bin/maildir-notify
@@ -1,7 +1,9 @@
 #!/bin/sh
 
 if [ $# = 0 ]; then
-	set -- "$MAIL"
+	for d in "$XDG_DATA_HOME"/mail/*; do
+		set -- "$@" "${d}/INBOX"
+	done
 fi
 
 for i; do
@@ -9,10 +11,12 @@ for i; do
 	shift
 done
 
+echo "Watching $*"
+
 inotifywait --monitor --event create --event moved_to "$@" |
 	while read -r dir _action file; do
 		inbox="$(dirname "$dir")"
-		catagory="$(dirname "$inbox" | xargs basename)"
+		category="$(dirname "$inbox" | xargs basename)"
 		from="$(grep -m1 -oP '(?<=^From: ).*' "${dir}${file}")"
 		subject="$(grep -m1 -oP '(?<=^Subject: ).*' "${dir}${file}")"
 
@@ -26,6 +30,6 @@ inotifywait --monitor --event create --event moved_to "$@" |
 			fi
 		fi
 
-		echo "Catagory: $catagory, From: $from, Subject: $subject"
-		notify-send -a "Mail" -c "$catagory" "From: $from" "$subject"
+		echo "Category: $category, From: $from, Subject: $subject"
+		notify-send -a "Mail" -c "$category" "From: $from" "$subject"
 	done
diff --git a/msmtp/.config/msmtp/config b/msmtp/.config/msmtp/config
index 8dee3e8..f39a3ea 100644
--- a/msmtp/.config/msmtp/config
+++ b/msmtp/.config/msmtp/config
@@ -4,12 +4,20 @@ tls on
 tls_trust_file /etc/ssl/certs/ca-certificates.crt
 syslog on
 
-account tobyvin
+account porkbun
 from tobyv@tobyvin.dev
+host smtp.porkbun.com
+user tobyv@tobyvin.dev
+passwordeval "pass tobyv@tobyvin.dev"
+port 587
+tls_starttls on
+
+account gmail
+from tobyv13@gmail.com
 host smtp.gmail.com
 user tobyv13
 passwordeval "pass gmail"
 port 587
 tls_starttls on
 
-account default: tobyvin
+account default: porkbun