From fe20453fee5d8956e3a88767fcf96bfd582cf8a3 Mon Sep 17 00:00:00 2001 From: Timo Wilken Date: Mon, 12 Aug 2024 15:34:34 +0200 Subject: Upgrade aerc configuration for 0.18.1 --- tw/packages/catppuccin.scm | 6 +++--- tw/services/desktop.scm | 2 ++ tw/services/files/aerc/accounts.conf | 26 +++++++------------------- tw/services/files/aerc/accounts.work.conf | 1 + tw/services/files/aerc/aerc.conf | 15 ++++++++++++--- tw/services/files/aerc/catppuccin.conf | 3 +++ 6 files changed, 28 insertions(+), 25 deletions(-) diff --git a/tw/packages/catppuccin.scm b/tw/packages/catppuccin.scm index 85a92630..8d065f3d 100644 --- a/tw/packages/catppuccin.scm +++ b/tw/packages/catppuccin.scm @@ -156,9 +156,9 @@ Catppuccin color palette.")) (define-public catppuccin-aerc-theme (catppuccin-theme-package #:program "aerc" - #:revision "23" ; total number of commits since repo beginning - #:commit "c077726d2833852f324d1b2bd5b7f4be02ce0978" - #:repo-hash "1z3sfx1q8qw56pai1pxc55d86v31xx9vkh1g5sr4i5hhk8db92l9" + #:revision "24" ; total number of commits since repo beginning + #:commit "478050d979aa8db8eda2d6d23a365823ab67e539" + #:repo-hash "0q9a818rwsqx5kvln5zzfan54xaw9yqbbm5hjbrwzdl5q8g28qir" #:install-plan '(("dist/" "share/catppuccin/aerc/")))) (define-public catppuccin-dunst-theme diff --git a/tw/services/desktop.scm b/tw/services/desktop.scm index 5b2d1bc9..4f2e3aff 100644 --- a/tw/services/desktop.scm +++ b/tw/services/desktop.scm @@ -897,6 +897,8 @@ proprietary NVIDIA driver?")) ("aerc/aerc.conf" ,(local-file "files/aerc/aerc.conf")) ("aerc/binds.conf" ,(local-file "files/aerc/binds.conf")) ("aerc/filters" ,(local-file "files/aerc/filters" #:recursive? #t)) + ;; I could also use the upstream catppuccin/aerc theme here (packaged as + ;; catppuccin-aerc), but it's a bit too colourless for me. ("aerc/stylesets/catppuccin" ,(local-file "files/aerc/catppuccin.conf")) ("aerc/templates" ,(local-file "files/aerc/templates" #:recursive? #t)) ("vdirsyncer/config" ,(if work? diff --git a/tw/services/files/aerc/accounts.conf b/tw/services/files/aerc/accounts.conf index 3febf651..db03bad3 100644 --- a/tw/services/files/aerc/accounts.conf +++ b/tw/services/files/aerc/accounts.conf @@ -1,6 +1,13 @@ # Note: when adding/removing/editing an account name here, edit # [messages:account=] and [messages:folder=] sections in binds.conf to match! +# Global options +cache-headers = true +pgp-auto-sign = true +pgp-self-encrypt = true +pgp-key-id = 53EC3C06856883DD92355BC22FC78504681F69B0 +pgp-opportunistic-encrypt = true + [Mythic] source = imaps://timo%40twilken.net@oncilla.mythic-beasts.com outgoing = smtps+plain://timo%40twilken.net@smtp-auth.mythic-beasts.com @@ -12,10 +19,6 @@ archive = Archive copy-to = Sent postpone = Drafts folders-sort = INBOX,Archive,Sent,Drafts -cache-headers = true -pgp-auto-sign = true -pgp-key-id = 53EC3C06856883DD92355BC22FC78504681F69B0 -pgp-opportunistic-encrypt = true [CERN] # https://man.sr.ht/~rjarry/aerc/providers/microsoft.md#office365-with-xoauth2 @@ -38,8 +41,6 @@ copy-to = Sent Items postpone = Drafts folders-sort = INBOX,Archive,Sent Items,Drafts folders-exclude = Calendar,~Calendar/.*,Contacts,Conversation History,Journal,Notes,Tasks -cache-headers = true -pgp-auto-sign = true pgp-key-id = C2249BBE5E8761C943A0CFA1B7B3914BF63ACD7C # Don't auto-encrypt mail, even if we have the keys of all recipients. pgp-opportunistic-encrypt = false @@ -56,11 +57,7 @@ copy-to = [Gmail]/Sent Mail postpone = [Gmail]/Drafts folders-sort = INBOX,[Gmail]/All Mail,[Gmail]/Sent Mail,[Gmail]/Drafts folders-exclude = [Gmail],[Gmail]/Chats,[Gmail]/Important -cache-headers = true trusted-authres = mx.google.com -pgp-auto-sign = true -pgp-key-id = 53EC3C06856883DD92355BC22FC78504681F69B0 -pgp-opportunistic-encrypt = true [Cantab] source = imaps+xoauth2://tw466%40cantab.ac.uk@outlook.office365.com?client_id=9e5f94bc-e8a4-4e73-b8be-63364c29d753&token_endpoint=https://login.microsoftonline.com/common/oauth2/v2.0/token&scope=https://outlook.office.com/SMTP.Send https://outlook.office.com/IMAP.AccessAsUser.All offline_access @@ -74,10 +71,6 @@ copy-to = Sent Items postpone = Drafts folders-sort = INBOX,Archive,Sent Items,Drafts folders-exclude = Calendar,~Calendar/.*,Contacts,Conversation History,Journal,Notes,Tasks -cache-headers = true -pgp-auto-sign = true -pgp-key-id = 53EC3C06856883DD92355BC22FC78504681F69B0 -pgp-opportunistic-encrypt = true [UTA] source = imaps+xoauth2://timo.wilken%40uta.edu@outlook.office365.com?client_id=9e5f94bc-e8a4-4e73-b8be-63364c29d753&token_endpoint=https://login.microsoftonline.com/common/oauth2/v2.0/token&scope=https://outlook.office.com/SMTP.Send https://outlook.office.com/IMAP.AccessAsUser.All offline_access @@ -91,7 +84,6 @@ copy-to = Sent Items postpone = Drafts folders-sort = INBOX,Archive,Sent Items,Drafts folders-exclude = Calendar,~Calendar/.*,Contacts,Conversation History,Journal,Notes,Tasks -cache-headers = true [Outlook] source = imaps+xoauth2://timo_wilken%40live.co.uk@outlook.office365.com?client_id=9e5f94bc-e8a4-4e73-b8be-63364c29d753&token_endpoint=https://login.microsoftonline.com/common/oauth2/v2.0/token&scope=https://outlook.office.com/SMTP.Send https://outlook.office.com/IMAP.AccessAsUser.All offline_access @@ -105,7 +97,3 @@ copy-to = Sent postpone = Drafts folders-sort = INBOX,Archive,Sent,Drafts folders-exclude = Notes -cache-headers = true -pgp-auto-sign = true -pgp-key-id = 53EC3C06856883DD92355BC22FC78504681F69B0 -pgp-opportunistic-encrypt = true diff --git a/tw/services/files/aerc/accounts.work.conf b/tw/services/files/aerc/accounts.work.conf index 5d2fa7c7..16b5b110 100644 --- a/tw/services/files/aerc/accounts.work.conf +++ b/tw/services/files/aerc/accounts.work.conf @@ -21,6 +21,7 @@ folders-sort = INBOX,Archive,Sent Items,Drafts folders-exclude = Calendar,~Calendar/.*,Contacts,Conversation History,Journal,Notes,Tasks cache-headers = true pgp-auto-sign = true +pgp-self-encrypt = true pgp-key-id = C2249BBE5E8761C943A0CFA1B7B3914BF63ACD7C # Don't auto-encrypt mail, even if we have the keys of all recipients. pgp-opportunistic-encrypt = false diff --git a/tw/services/files/aerc/aerc.conf b/tw/services/files/aerc/aerc.conf index 7473bc8b..ea55e049 100644 --- a/tw/services/files/aerc/aerc.conf +++ b/tw/services/files/aerc/aerc.conf @@ -9,15 +9,17 @@ unsafe-accounts-conf=true [ui] # Describes the format for each row in a mailbox view. This field is compatible # with mutt's printf-like syntax. -index-columns=num>4,flags>4,date<21,peers<17,subject<* -column-num={{.Number}} +index-columns=flags:4,peers<17,subject,date>= column-flags={{.Flags | join ""}} column-date={{.DateAutoFormat .Date.Local}} column-peers={{.Peer | names | join ", "}} column-subject={{.ThreadPrefix}}{{.Subject}} # See time.Time#Format at https://godoc.org/time#Time.Format -timestamp-format=Mon _2 Jan 2006 15:04 +this-day-time-format=15:04 +this-week-time-format=_2 Jan 15:04 +this-year-time-format=_2 Jan 15:04 +timestamp-format=_2 Jan 2006 15:04 # List of space-separated criteria to sort the messages by, see *sort* # command in *aerc*(1) for reference. Prefixing a criterion with "-r " @@ -75,6 +77,13 @@ alternatives=text/plain,text/html #header-layout=From|To,Cc|Bcc,Date,Subject [compose] +# Edit headers directly into the text editor instead of having separate UI text inputs. +# When this is set to true, the :cc, :bcc and :header commands do not work, +# editing email headers are left to the text editor. address-book-cmd is not +# supported and address completion is left to the editor itself. header-layout +# is ignored. +edit-headers=true + # Default header fields to display when composing a message. To display # multiple headers in the same row, separate them with a pipe, e.g. "To|From". #header-layout=To|From,Subject diff --git a/tw/services/files/aerc/catppuccin.conf b/tw/services/files/aerc/catppuccin.conf index 8e355691..30e7367c 100644 --- a/tw/services/files/aerc/catppuccin.conf +++ b/tw/services/files/aerc/catppuccin.conf @@ -1,3 +1,6 @@ +*.default=true +*.normal=true + *.selected.reverse = false *.selected.bg = #585b70 error.fg = #eba0ac -- cgit v1.2.3