From 79eeec6253370fa1c226a8bdd770ddcc0c1b01a9 Mon Sep 17 00:00:00 2001 From: Daniel Fichtinger Date: Thu, 20 Mar 2025 14:15:46 -0400 Subject: [PATCH] AutoYADM commit: 2025-03-20 14:15:46 --- .config/aerc/accounts.conf | 42 +++++++++++++++++++++++++++++--------- .config/aerc/aerc.conf | 14 ++++++------- .config/aerc/binds.conf | 8 ++++---- .config/helix/config.toml | 6 ++---- .mbsyncrc | 33 ------------------------------ 5 files changed, 45 insertions(+), 58 deletions(-) diff --git a/.config/aerc/accounts.conf b/.config/aerc/accounts.conf index 1b8143cc..d0ff78b2 100644 --- a/.config/aerc/accounts.conf +++ b/.config/aerc/accounts.conf @@ -55,13 +55,35 @@ # # cache-headers = true # # signature-file = /home/fic/mail/daniel@ficd.ca.sig -# # [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 -# # # source-cred-cmd = /home/fic/tools/mutt_oauth2.py /home/fic/tools/tokenfile-test -# # source-cred-cmd = gpg --decrypt --quiet /home/fic/tools/tokenfile-test | jq -r '.refresh_token' -# # outgoing = smtp+xoauth2://18daf3%40queensu.ca@outlook.office365.com:587 -# # outgoing-cred-cmd = /home/fic/tools/mutt_oauth2.py /home/fic/tools/tokenfile-test -# # from = Daniel Fichtinger -# # default = INBOX -# # copy-to = Sent -# # signature-file = /home/fic/mail/fichtinger.d@queensu.ca.sig +[Fastmail] +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 +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 +pgp-auto-sign = true +pgp-self-encrypt = true +pgp-attach-key = true +pgp-opportunistic-encrypt = false +pgp-error-level = warn +pgp-key-id = 965699C862DA92143CDE2877D1B0947B25420214 + + +[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 +# source-cred-cmd = /home/fic/tools/mutt_oauth2.py /home/fic/tools/tokenfile-test +source-cred-cmd = gpg --decrypt --quiet /home/fic/tools/tokenfile-test | jq -r '.refresh_token' +outgoing = smtp+xoauth2://18daf3%40queensu.ca@outlook.office365.com:587 +outgoing-cred-cmd = /home/fic/tools/mutt_oauth2.py /home/fic/tools/tokenfile-test +from = Daniel Fichtinger +default = INBOX +copy-to = Sent +signature-file = /home/fic/mail/fichtinger.d@queensu.ca.sig diff --git a/.config/aerc/aerc.conf b/.config/aerc/aerc.conf index 12d9156f..3b2d4e0c 100644 --- a/.config/aerc/aerc.conf +++ b/.config/aerc/aerc.conf @@ -824,37 +824,37 @@ message/rfc822=betterbird mail-received=notify-send "[$AERC_ACCOUNT/$AERC_FOLDER] New mail from $AERC_FROM_NAME" "$AERC_SUBJECT" # Executed when an email is sent from the client ( # does not guarantee successful send server-side!) -mail-sent=/home/fic/.config/mail/async-mail.sh +# mail-sent=/home/fic/.config/mail/async-mail.sh # # Executed when mail is deleted from a folder # mail-deleted=mbsync "$AERC_ACCOUNT:$AERC_FOLDER" & -mail-deleted=/home/fic/.config/mail/async-mail.sh +# mail-deleted=/home/fic/.config/mail/async-mail.sh # # Executed when aerc adds mail to a folder #mail-added=mbsync "$AERC_ACCOUNT:$AERC_FOLDER" & -mail-added=/home/fic/.config/mail/async-mail.sh +# mail-added=/home/fic/.config/mail/async-mail.sh # # Executed when aerc starts #aerc-startup=aerc :terminal calcurse && aerc :next-tab -aerc-startup=/home/fic/.config/mail/async-mail.sh +# aerc-startup=/home/fic/.config/mail/async-mail.sh # # Executed when aerc shuts down. #aerc-shutdown= # aerc-shutdown=/home/fic/.config/mail/mail-sync.sh & -aerc-shutdown=/home/fic/.config/mail/async-mail.sh +# aerc-shutdown=/home/fic/.config/mail/async-mail.sh # # Executed when notmuch tags are modified. # tag-modified=nohup /home/fic/.config/mail/mail-sync.sh >/dev/null 2>&1 & -tag-modified=/home/fic/.config/mail/async-mail.sh +# tag-modified=/home/fic/.config/mail/async-mail.sh # # Executed when flags are changed on a message. # flag-changed=nohup /home/fic/.config/mail/mail-sync.sh >/dev/null 2>&1 & -flag-changed=/home/fic/.config/mail/async-mail.sh +# flag-changed=/home/fic/.config/mail/async-mail.sh [templates] # Templates are used to populate email bodies automatically. diff --git a/.config/aerc/binds.conf b/.config/aerc/binds.conf index aaf25e2b..abcdbe2c 100644 --- a/.config/aerc/binds.conf +++ b/.config/aerc/binds.conf @@ -17,16 +17,16 @@ I = :next-tab = :reload [messages] -o = :exec /home/fic/.config/mail/mail-sync.sh +# o = :exec /home/fic/.config/mail/mail-sync.sh q = :prompt 'Quit?' quit t = :toggle-threads mr = :read -mR = :tag +recipt +# mR = :tag +recipt mu = :unread d = :modify-labels +deleted -mm = :tag -a = :tag +archive:archive flat +# mm = :tag +a = :archive flat \- = :tag - + = :tag + ff = :flag diff --git a/.config/helix/config.toml b/.config/helix/config.toml index 7c61f68c..04a0e8c7 100644 --- a/.config/helix/config.toml +++ b/.config/helix/config.toml @@ -113,11 +113,9 @@ A-N = "join_selections_space" C-q = ":qa" C-S-q = ":qa!" C-m = ":bp" +M = ":bp" C-i = ":bn" -M = "jump_view_left" -C-n = "jump_view_down" -C-e = "jump_view_up" -I = "jump_view_right" +I = ":bn" X = "extend_line_above" x = "extend_line" # A-x = "toggle_line_select" diff --git a/.mbsyncrc b/.mbsyncrc index 15fe58f9..330c28a4 100644 --- a/.mbsyncrc +++ b/.mbsyncrc @@ -1,10 +1,3 @@ -IMAPAccount protonmail -Host 127.0.0.1 -Port 1143 -User daniel@ficd.ca -PassCmd "pass show proton/bridge" -SSLType NONE - IMAPAccount outlook Host outlook.office365.com Port 993 @@ -16,32 +9,10 @@ PassCmd "~/tools/mutt_oauth2.py ~/tools/tokenfile-test" IMAPStore outlook-remote Account outlook -IMAPStore pm-remote -Account protonmail - MaildirStore outlook-local Path ~/Maildir/school/ Inbox ~/Maildir/school/INBOX/ -MaildirStore pm-local -Path ~/Maildir/personal/ -Inbox ~/Maildir/personal/INBOX/ - -Channel pm-inbox -Far :pm-remote: -Near :pm-local: -Patterns "INBOX" -Create Both -Expunge Both -SyncState * - -Channel pm-sent -Far :pm-remote:"Sent" -Near :pm-local:"sent" -Create Both -Expunge Both -SyncState * - Channel outlook-inbox Far :outlook-remote: Near :outlook-local: @@ -57,10 +28,6 @@ Create Both Expunge Both SyncState * -Group personal -Channel pm-inbox -Channel pm-sent - Group school Channel outlook-inbox Channel outlook-sent