feat(mail): add new email address and host

7 files changed, 33 insertions, 19 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