fix(aerc): update aerc configs to work on git HEAD

5 files changed, 17 insertions, 18 deletions

diff --git a/aerc/.config/aerc/accounts.conf b/aerc/.config/aerc/accounts.conf
index d525331..d02c81a 100644
--- a/aerc/.config/aerc/accounts.conf
+++ b/aerc/.config/aerc/accounts.conf
@@ -1,25 +1,19 @@
-[tobyv@tobyvin.dev]
 source = notmuch://~/.local/share/mail
 maildir-store = ~/.local/share/mail
-maildir-account-path = porkbun
-check-mail-cmd = mbsync -c $XDG_CONFIG_HOME/mbsync/mbsyncrc porkbun
 copy-to = "Sent"
 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,Junk,Trash,Archive
+
+[porkbun]
+maildir-account-path = porkbun
+check-mail-cmd = mbsync -c $XDG_CONFIG_HOME/mbsync/mbsyncrc porkbun
+from = Toby Vincent <tobyv@tobyvin.dev>
 address-book-cmd="grep -iPm 100 --color=never %s /home/tobyv/.local/share/mail/porkbun/addressbook.tsv"
 
-[tobyv13@gmail.com]
-source = notmuch://~/.local/share/mail
-maildir-store = ~/.local/share/mail
+[gmail]
 maildir-account-path = gmail
 check-mail-cmd = mbsync -c $XDG_CONFIG_HOME/mbsync/mbsyncrc gmail
-copy-to = "Sent"
-outgoing = /usr/sbin/sendmail
 from = Toby Vincent <tobyv13@gmail.com>
-signature-file = ~/.config/aerc/default.sig
-pgp-auto-sign = true
-folders-sort = INBOX,Sent,Drafts,Junk,Trash,Archive
 address-book-cmd="grep -iPm 100 --color=never %s /home/tobyv/.local/share/mail/gmail/addressbook.tsv"
diff --git a/aerc/.config/aerc/aerc.conf b/aerc/.config/aerc/aerc.conf
index cee0742..dc4b1ec 100644
--- a/aerc/.config/aerc/aerc.conf
+++ b/aerc/.config/aerc/aerc.conf
@@ -1,5 +1,7 @@
 [general]
 enable-osc8 = true
+disable-ipc-mailto = true
+default-menu-cmd = fzf
 
 [ui]
 mouse-enabled = true
@@ -21,9 +23,9 @@ header-layout = From,To,Cc,Bcc,Date,Subject
 always-show-mime = true
 
 [compose]
-address-book-cmd="grep -iPm 100 --color=never %s /home/tobyv/.cache/maildir-rank-addr/addressbook.tsv"
 edit-headers = true
-file-picker-cmd = fd --type=file --unrestricted %s
+address-book-cmd = notmuch address "%s"
+file-picker-cmd = fd --type=file --unrestricted "%s"
 empty-subject-warning = true
 no-attachment-warning = ^[^>]*attach(ed|ment)
 
@@ -42,4 +44,4 @@ application/pdf=pdftotext - -l 10 -nopgbrk -q  - | fmt -w 100
 image/* = catimg -w$(tput cols) -
 
 [hooks]
-aerc-shutdown = systemctl --user --no-block start mbsync@porkbun.service mbsync@gmail.service
+flag-changed = systemctl --user --no-block start mbsync@$AERC_ACCOUNT:$AERC_FOLDER.service
diff --git a/mbsync/.config/systemd/user/maildir-notify@.service b/mbsync/.config/systemd/user/maildir-notify@.service
index a6b87b5..6d2d3e0 100644
--- a/mbsync/.config/systemd/user/maildir-notify@.service
+++ b/mbsync/.config/systemd/user/maildir-notify@.service
@@ -5,3 +5,6 @@ Description=Notify on new mail in MailDir %i
 Type=simple
 ExecStart=%h/.local/bin/maildir-notify ${XDG_DATA_HOME}/mail/%i/INBOX
 RestartSec=10
+
+[Install]
+WantedBy=default.target
diff --git a/mbsync/.config/systemd/user/mbsync@.service b/mbsync/.config/systemd/user/mbsync@.service
index 86a51f2..f0476b3 100644
--- a/mbsync/.config/systemd/user/mbsync@.service
+++ b/mbsync/.config/systemd/user/mbsync@.service
@@ -1,9 +1,8 @@
 [Unit]
 Description=Mailbox synchronization service
 Documentation=man:mbsync(1)
-Wants=network-online.target maildir-notify@%i.service
+Wants=network-online.target
 After=network-online.target network.target
-Before=maildir-notify@%i.service
 
 [Service]
 Type=oneshot
diff --git a/mbsync/install.sh b/mbsync/install.sh
index 0f295a0..79e0fd5 100755
--- a/mbsync/install.sh
+++ b/mbsync/install.sh
@@ -10,5 +10,6 @@ fi
 printf "%s: Installing services\n" "$0"
 
 for instance in gmail porkbun; do
-	systemctl --user enable --now --no-block $pkgname@"$instance".service
+	systemctl --user enable --now --no-block mbsync@"$instance".service
+	systemctl --user enable --now --no-block maildir-notify@"$instance".service
 done