BREAKING: revise the email setup for the accounts in use

2026-09-10 15:26:26 -04:00 · 2024-11-20 08:27:11 +02:00 · 2024-11-20 08:27:11 +02:00 · 27b3d81b9b
parent a903f5df5e
commit 27b3d81b9b
4 changed files with 112 additions and 112 deletions
--- a/emacs/.emacs.d/prot-emacs-modules/prot-emacs-notmuch.el
+++ b/emacs/.emacs.d/prot-emacs-modules/prot-emacs-notmuch.el
@ -20,9 +20,9 @@
                    (format "%s <%s>" user-full-name str))
                  (list prv pub inf))
          notmuch-fcc-dirs
-          `((,prv . "prv/Sent")
-            (,inf . "inf/Sent")
-            (,pub . "pub/Sent")))))
+          `((,prv . "mailbox/Sent")
+            (,inf . "mailbox/Sent")
+            (,pub . "mailbox/Sent")))))

 ;;;; General UI
 (use-package notmuch
--- a/emacs/.emacs.d/prot-emacs.org
+++ b/emacs/.emacs.d/prot-emacs.org
@ -8926,11 +8926,11 @@ user option ~auth-sources~. I set it to a single GPG-encrypted entry.
 The contents of that file look like this:

 #+begin_example
-machine pub port 993 login SOME-USER-NAME-HERE password SOME-PASSWORD-HERE
-machine inf port 993 login SOME-USER-NAME-HERE password SOME-PASSWORD-HERE
+machine pub port 993 login SOME-USER-NAME-HERE-1 password SOME-PASSWORD-HERE
+machine inf port 993 login SOME-USER-NAME-HERE-2 password SOME-PASSWORD-HERE

-machine mail.gandi.net port 465 login SOME-USER-NAME-HERE password SOME-PASSWORD-HERE
-machine mail.gandi.net port 465 login SOME-USER-NAME-HERE password SOME-PASSWORD-HERE
+machine smtp.some-server.com port 465 login SOME-USER-NAME-HERE-1 password SOME-PASSWORD-HERE
+machine mail.other-server.com port 465 login SOME-USER-NAME-HERE-2 password SOME-PASSWORD-HERE
 #+end_example

 Each line can be read as a map of key-value pairs. Think of it like this:
@ -8938,8 +8938,8 @@ Each line can be read as a map of key-value pairs. Think of it like this:
 #+begin_example
 machine pub
 port 993
-login SOME-USER-NAME-HERE
-password SOME-PASSWORD-HERE
+login SOME-USER-NAME-HERE-1
+password SOME-PASSWORD-HERE-1
 #+end_example

 Depending on the settings and the applicable program, Emacs reads this
@ -9236,6 +9236,26 @@ in nature and may be used by other Elisp snippets of mine ([[#h:3fccfadf-22e9-45
 Doing things this way ensures that I do not share the details about
 the accounts I set.

+At any rate, the format of ~notmuch-identities~ is like this:
+
+#+begin_example emacs-lisp
+(setq notmuch-identities '("Protesilaos Stavrou <someone@somewhere.com>" "Prot <just-my-nickname@somewhere.com>"))
+#+end_example
+
+While the corresponding ~notmuch-fcc-dirs~ map those accounts to the
+relative path of their local sent mail folder (it is relative to the
+root of the directory that ~notmuch~ indexes, so something like
+=~/.mail/pub/Sent= needs to be written as =pub/Sent=). The data
+structure looks like this:
+
+#+begin_example emacs-lisp
+(setq notmuch-fcc-dirs
+      '(("someone@somewhere.com" . "someone/Sent")
+        ("nickname@somewhere.com" . "nickname/Sent")))
+#+end_example
+
+Now the actual code I use:
+
 #+begin_src emacs-lisp :tangle "prot-emacs-modules/prot-emacs-notmuch.el" :mkdirp yes
 ;;; Account settings
 (use-package notmuch
@ -9249,9 +9269,9 @@ the accounts I set.
                    (format "%s <%s>" user-full-name str))
                  (list prv pub inf))
          notmuch-fcc-dirs
-          `((,prv . "prv/Sent")
-            (,inf . "inf/Sent")
-            (,pub . "pub/Sent")))))
+          `((,prv . "mailbox/Sent")
+            (,inf . "mailbox/Sent")
+            (,pub . "mailbox/Sent")))))
 #+end_src

 **** The =prot-emacs-notmuch.el= section about the general user interface
@ -10254,6 +10274,37 @@ What you see there is three separate email accounts.
 # I know about the Org '#+include' directive but this file rarely
 # changes so I do not mind copying it here directly.

+#+begin_example sh
+IMAPAccount mailbox
+Host imap.mailbox.org
+UserCmd "gpg -q --for-your-eyes-only -d ~/.authinfo.gpg | awk -F ' ' '/mailbox/ { print $(NF-2); exit; }'"
+PassCmd "gpg -q --for-your-eyes-only -d ~/.authinfo.gpg | awk -F ' ' '/mailbox/ { print $NF; exit; }'"
+SSLType IMAPS
+
+IMAPStore mailbox-remote
+Account mailbox
+
+MaildirStore mailbox-local
+Subfolders Verbatim
+# The trailing "/" is important
+Path ~/.mail/mailbox/
+Inbox ~/.mail/mailbox/Inbox
+
+Channel mailbox
+Far :mailbox-remote:
+Near :mailbox-local:
+# Include everything
+Patterns *
+Sync All
+Create Both
+Remove Both
+Expunge Both
+SyncState *
+#+end_example
+
+Below is an older version of this file (as of 2024-11-20) that shows
+how to make things work with multiple accounts:
+
 #+begin_example sh
 IMAPAccount pub
 Host mail.gandi.net
@ -10348,6 +10399,30 @@ change the XDG directory but then you know what you are doing). Just
 as with ~mbsync~, I retrieve the user name and password via commands
 that read from the =~/.authinfo= file ([[#h:bf540a85-12a6-4005-bf00-2ff3370e5adb][Contents of my =.mbsyncrc=]]).

+#+begin_example sh
+# See my mbsync config, which is reflected here.
+# https://github.com/protesilaos/dotfiles
+
+defaults
+auth on
+protocol smtp
+tls on
+tls_starttls off
+host smtp.mailbox.org
+port 465
+
+account mailbox
+eval echo from $(gpg -q --for-your-eyes-only -d ~/.authinfo.gpg | awk -F ' ' '/mailbox/ { print $(NF-2); exit; }')
+eval echo user $(gpg -q --for-your-eyes-only -d ~/.authinfo.gpg | awk -F ' ' '/mailbox/ { print $(NF-2); exit; }')
+passwordeval "gpg -q --for-your-eyes-only -d ~/.authinfo.gpg | awk -F ' ' '/mailbox/ { print $NF; exit; }'"
+
+# Set a default account (I copied from man msmtp)
+account default : mailbox
+#+end_example
+
+Below is an older version of this file (as of 2024-11-20) that shows
+how to make things work with multiple accounts:
+
 #+begin_example sh
 # See my mbsync config, which is reflectd here.
 # https://github.com/protesilaos/dotfiles
@ -10356,11 +10431,9 @@ defaults
 auth on
 protocol smtp
 tls on
-# FIXME 2023-08-08: I cannot send the message if `tls_starttls' is on.
-# Why?
-tls_starttls off
+tls_starttls on
 host mail.gandi.net
-port 465
+port 587

 # pub
 account pub
--- a/mbsync/.mbsyncrc
+++ b/mbsync/.mbsyncrc
@ -1,82 +1,25 @@
-IMAPAccount pub
-Host mail.gandi.net
-UserCmd "gpg -q --for-your-eyes-only -d ~/.authinfo.gpg | awk -F ' ' '/pub/ { print $(NF-2); exit; }'"
-PassCmd "gpg -q --for-your-eyes-only -d ~/.authinfo.gpg | awk -F ' ' '/pub/ { print $NF; exit; }'"
+IMAPAccount mailbox
+Host imap.mailbox.org
+UserCmd "gpg -q --for-your-eyes-only -d ~/.authinfo.gpg | awk -F ' ' '/mailbox/ { print $(NF-2); exit; }'"
+PassCmd "gpg -q --for-your-eyes-only -d ~/.authinfo.gpg | awk -F ' ' '/mailbox/ { print $NF; exit; }'"
 SSLType IMAPS

-IMAPStore pub-remote
-Account pub
+IMAPStore mailbox-remote
+Account mailbox

-MaildirStore pub-local
+MaildirStore mailbox-local
 Subfolders Verbatim
 # The trailing "/" is important
-Path ~/.mail/pub/
-Inbox ~/.mail/pub/Inbox
+Path ~/.mail/mailbox/
+Inbox ~/.mail/mailbox/Inbox

-Channel pub
-Far :pub-remote:
-Near :pub-local:
+Channel mailbox
+Far :mailbox-remote:
+Near :mailbox-local:
 # Include everything
 Patterns *
 Sync All
-Create Near
-Remove Near
-Expunge Near
+Create Both
+Remove Both
+Expunge Both
 SyncState *
-
-##########
-
-IMAPAccount inf
-Host mail.gandi.net
-UserCmd "gpg -q --for-your-eyes-only -d ~/.authinfo.gpg | awk -F ' ' '/inf/ { print $(NF-2); exit; }'"
-PassCmd "gpg -q --for-your-eyes-only -d ~/.authinfo.gpg | awk -F ' ' '/inf/ { print $NF; exit; }'"
-SSLType IMAPS
-
-IMAPStore inf-remote
-Account inf
-
-MaildirStore inf-local
-Subfolders Verbatim
-# The trailing "/" is important
-Path ~/.mail/inf/
-Inbox ~/.mail/inf/Inbox
-
-Channel inf
-Far :inf-remote:
-Near :inf-local:
-# Include everything
-Pattern *
-Sync All
-Create Near
-Remove Near
-Expunge Near
-SyncState *
-
-##########
-
-IMAPAccount prv
-Host mail.gandi.net
-UserCmd "gpg -q --for-your-eyes-only -d ~/.authinfo.gpg | awk -F ' ' '/prv/ { print $(NF-2); exit; }'"
-PassCmd "gpg -q --for-your-eyes-only -d ~/.authinfo.gpg | awk -F ' ' '/prv/ { print $NF; exit; }'"
-SSLType IMAPS
-
-IMAPStore prv-remote
-Account prv
-
-MaildirStore prv-local
-Subfolders Verbatim
-# The trailing "/" is important
-Path ~/.mail/prv/
-Inbox ~/.mail/prv/Inbox
-
-Channel prv
-Far :prv-remote:
-Near :prv-local:
-# Include everything
-Patterns *
-Sync All
-Create Near
-Remove Near
-Expunge Near
-SyncState *
-
--- a/msmtp/.config/msmtp/config
+++ b/msmtp/.config/msmtp/config
@ -5,30 +5,14 @@ defaults
 auth on
 protocol smtp
 tls on
-tls_starttls on
-host mail.gandi.net
-port 587
+tls_starttls off
+host smtp.mailbox.org
+port 465

-# pub
-account pub
-# FIXME 2023-08-08: Optimise this?
-eval echo from $(gpg -q --for-your-eyes-only -d ~/.authinfo.gpg | awk -F ' ' '/pub/ { print $(NF-2); exit; }')
-eval echo user $(gpg -q --for-your-eyes-only -d ~/.authinfo.gpg | awk -F ' ' '/pub/ { print $(NF-2); exit; }')
-passwordeval "gpg -q --for-your-eyes-only -d ~/.authinfo.gpg | awk -F ' ' '/pub/ { print $NF; exit; }'"
-
-# inf
-account inf
-# FIXME 2023-08-08: Optimise this?
-eval echo from $(gpg -q --for-your-eyes-only -d ~/.authinfo.gpg | awk -F ' ' '/inf/ { print $(NF-2); exit; }')
-eval echo user $(gpg -q --for-your-eyes-only -d ~/.authinfo.gpg | awk -F ' ' '/inf/ { print $(NF-2); exit; }')
-passwordeval "gpg -q --for-your-eyes-only -d ~/.authinfo.gpg | awk -F ' ' '/inf/ { print $NF; exit; }'"
-
-# prv
-account prv
-# FIXME 2023-08-08: Optimise this?
-eval echo from $(gpg -q --for-your-eyes-only -d ~/.authinfo.gpg | awk -F ' ' '/prv/ { print $(NF-2); exit; }')
-eval echo user $(gpg -q --for-your-eyes-only -d ~/.authinfo.gpg | awk -F ' ' '/prv/ { print $(NF-2); exit; }')
-passwordeval "gpg -q --for-your-eyes-only -d ~/.authinfo.gpg | awk -F ' ' '/prv/ { print $NF; exit; }'"
+account mailbox
+eval echo from $(gpg -q --for-your-eyes-only -d ~/.authinfo.gpg | awk -F ' ' '/mailbox/ { print $(NF-2); exit; }')
+eval echo user $(gpg -q --for-your-eyes-only -d ~/.authinfo.gpg | awk -F ' ' '/mailbox/ { print $(NF-2); exit; }')
+passwordeval "gpg -q --for-your-eyes-only -d ~/.authinfo.gpg | awk -F ' ' '/mailbox/ { print $NF; exit; }'"

 # Set a default account (I copied from man msmtp)
-account default : pub
+account default : mailbox