From 07f9ee6bb95853a30bb455362c53a992fc332d68 Mon Sep 17 00:00:00 2001 From: Daniel Fichtinger Date: Thu, 20 Mar 2025 14:20:17 -0400 Subject: [PATCH] AutoYADM commit: 2025-03-20 14:20:17 --- .config/aerc/accounts.conf | 71 ++++------------------------------ .config/aerc/old-accounts.conf | 57 +++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 63 deletions(-) create mode 100644 .config/aerc/old-accounts.conf diff --git a/.config/aerc/accounts.conf b/.config/aerc/accounts.conf index d0ff78b2..3d349886 100644 --- a/.config/aerc/accounts.conf +++ b/.config/aerc/accounts.conf @@ -1,81 +1,26 @@ -# [personal] -# source = notmuch://~/Maildir/ -# maildir-store = ~/Maildir/ -# maildir-account-path = personal -# query-map = ~/.config/aerc/personal-map.conf -# outgoing = smtp+plain://daniel%40ficd.ca@127.0.0.1:1025 -# outgoing-cred-cmd = pass show proton/bridge -# default = inbox -# from = Daniel Fichtinger -# # copy-to = sent -# cache-headers = true -# signature-file = /home/fic/mail/daniel@ficd.ca.sig -# # check-mail-cmd = /home/fic/.config/mail/mail-sync.sh -# check-mail = 0 -# exclude-tags = spam,deleted -# postpone = drafts -# folders = inbox, auto, sent, to-me, sr.ht, git, archive, promo, recipts -# folders-sort = inbox, auto, sent, to-me, sr.ht, git, archive, promo, recipts -# archive = archive -# # pgp-auto-sign = true -# # # pgp-self-encrypt = true -# # pgp-attach-key = true -# # pgp-opportunistic-encrypt = false -# # # pgp-error-level = none -# # # pgp-key-id = 965699C862DA92143CDE2877D1B0947B25420214 -# pgp-key-id = CA6508D8DF8BB80342D52C046899D55791C30C54 -# # 965699C862DA92143CDE2877D1B0947B25420214 -# [school] -# archive = archive -# source = notmuch://~/Maildir/ -# maildir-store = ~/Maildir/ -# maildir-account-path = school -# query-map = ~/.config/aerc/school-map.conf -# outgoing = smtp+xoauth2://18daf3%40queensu.ca@outlook.office365.com:587 -# outgoing-cred-cmd = /home/fic/tools/mutt_oauth2.py /home/fic/tools/tokenfile-test -# default = inbox -# from = Daniel Fichtinger -# postpone = drafts -# # copy-to = sent -# signature-file = /home/fic/mail/fichtinger.d@queensu.ca.sig -# # check-mail-cmd = /home/fic/.config/mail/mail-sync.sh -# check-mail = 0 -# exclude-tags = spam,deleted -# folders = inbox, auto, sent, to-me, archive -# folders-sort = inbox, auto, sent, to-me, archive - -# # [Personal-IMAP] -# # source = imap://daniel%40ficd.ca@127.0.0.1:1143 -# # source-cred-cmd = pass show proton/bridge -# # outgoing = smtp+plain://daniel%40ficd.ca@127.0.0.1:1025 -# # outgoing-cred-cmd = pass show proton/bridge -# # default = INBOX -# # from = Daniel Fichtinger -# # copy-to = Sent -# # cache-headers = true -# # signature-file = /home/fic/mail/daniel@ficd.ca.sig - [Fastmail] +# server stuff source = jmap+oauthbearer://@api.fastmail.com/jmap/session source-cred-cmd = pass show fastmail/aerc outgoint = jmap:// default = Inbox folders-sort = Inbox -from = Daniel Fichtinger +# JMAP stuff use-labels = true cache-state = true cache-blobs = true -# Address Book -carddav-source = https://daniel%40ficd.ca@carddav.fastmail.com/dav/addressbooks/user/address@fastmail.com/Default -carddav-source-cred-cmd = pass show fastmail/carddav -address-book-cmd = carddav-query -S fastmail %s +# Identity stuff +from = Daniel Fichtinger pgp-auto-sign = true pgp-self-encrypt = true pgp-attach-key = true pgp-opportunistic-encrypt = false pgp-error-level = warn pgp-key-id = 965699C862DA92143CDE2877D1B0947B25420214 - +# Address Book +carddav-source = https://daniel%40ficd.ca@carddav.fastmail.com/dav/addressbooks/user/address@fastmail.com/Default +carddav-source-cred-cmd = pass show fastmail/carddav +address-book-cmd = carddav-query -S fastmail %s [School-IMAP] source = imaps+xoauth2://18daf3%40queensu.ca@outlook.office365.com?token_endpoint=https://login.microsoftonline.com/common/oauth2/v2.0/token&client_id=9e5f94bc-e8a4-4e73-b8be-63364c29d753 diff --git a/.config/aerc/old-accounts.conf b/.config/aerc/old-accounts.conf new file mode 100644 index 00000000..f7707287 --- /dev/null +++ b/.config/aerc/old-accounts.conf @@ -0,0 +1,57 @@ +[personal] +source = notmuch://~/Maildir/ +maildir-store = ~/Maildir/ +maildir-account-path = personal +query-map = ~/.config/aerc/personal-map.conf +outgoing = smtp+plain://daniel%40ficd.ca@127.0.0.1:1025 +outgoing-cred-cmd = pass show proton/bridge +default = inbox +from = Daniel Fichtinger +# copy-to = sent +cache-headers = true +signature-file = /home/fic/mail/daniel@ficd.ca.sig +# check-mail-cmd = /home/fic/.config/mail/mail-sync.sh +check-mail = 0 +exclude-tags = spam,deleted +postpone = drafts +folders = inbox, auto, sent, to-me, sr.ht, git, archive, promo, recipts +folders-sort = inbox, auto, sent, to-me, sr.ht, git, archive, promo, recipts +archive = archive +# pgp-auto-sign = true +# # pgp-self-encrypt = true +# pgp-attach-key = true +# pgp-opportunistic-encrypt = false +# # pgp-error-level = none +# # pgp-key-id = 965699C862DA92143CDE2877D1B0947B25420214 +pgp-key-id = CA6508D8DF8BB80342D52C046899D55791C30C54 +# 965699C862DA92143CDE2877D1B0947B25420214 +[school] +archive = archive +source = notmuch://~/Maildir/ +maildir-store = ~/Maildir/ +maildir-account-path = school +query-map = ~/.config/aerc/school-map.conf +outgoing = smtp+xoauth2://18daf3%40queensu.ca@outlook.office365.com:587 +outgoing-cred-cmd = /home/fic/tools/mutt_oauth2.py /home/fic/tools/tokenfile-test +default = inbox +from = Daniel Fichtinger +postpone = drafts +# copy-to = sent +signature-file = /home/fic/mail/fichtinger.d@queensu.ca.sig +# check-mail-cmd = /home/fic/.config/mail/mail-sync.sh +check-mail = 0 +exclude-tags = spam,deleted +folders = inbox, auto, sent, to-me, archive +folders-sort = inbox, auto, sent, to-me, archive + +# [Personal-IMAP] +# source = imap://daniel%40ficd.ca@127.0.0.1:1143 +# source-cred-cmd = pass show proton/bridge +# outgoing = smtp+plain://daniel%40ficd.ca@127.0.0.1:1025 +# outgoing-cred-cmd = pass show proton/bridge +# default = INBOX +# from = Daniel Fichtinger +# copy-to = Sent +# cache-headers = true +# signature-file = /home/fic/mail/daniel@ficd.ca.sig +