.

2 files changed, 25 insertions, 37 deletions

diff --git a/home/dots/.emacs b/home/dots/.emacs
index 1835e6f..65c4ad1 100644
--- a/home/dots/.emacs
+++ b/home/dots/.emacs
@@ -263,6 +263,7 @@
   ;; (corfu-quit-no-match nil)      ;; Never quit, even if there is no match
   ;; (corfu-preview-current nil)    ;; Disable current candidate preview
   (corfu-preselect 'prompt)      ;; Preselect the prompt
+  (corfu-quit-no-match t)
   ;; (corfu-on-exact-match nil)     ;; Configure handling of exact matches
 
   ;; Recommended: Enable Corfu globally.  This is recommended since Dabbrev can
@@ -1162,29 +1163,16 @@
 
 (use-package sendmail
   :defer t
-  :init
-  (defun marc/set-msmtp-account ()
-    (if (message-mail-p)
-	(save-excursion
-          (let*
-              ((from (save-restriction
-                       (message-narrow-to-headers)
-                       (message-fetch-field "from")))
-               (account
-		(cond
-		 ((string-match "marcc@fastmail.fr" from) "home")
-		 ((string-match "marc.coquand@sustainably.app" from) "work")
-		 ((string-match "marc@coquand.email" from) "home")
-		 ((string-match "marc@mccd.space" from) "home"))))
-            (setq message-sendmail-extra-arguments (list '"-a" account))))))
   :hook
-  (message-send-mail . marc/set-msmtp-account)
-  (message-send-mail . flyspell-mode)
+;;  (message-send . marc/set-msmtp-account)
+  (message-setup . flyspell-mode)
   (message-setup . mail-abbrevs-setup)
   :custom
-
-  (send-mail-function 'sendmail-send-it)
   (sendmail-program (executable-find "msmtp"))
+  (send-mail-function 'smtpmail-send-it)
+  (message-sendmail-f-is-evil t)
+  (message-sendmail-extra-arguments '("--read-envelope-from"))
+  (message-send-mail-function 'message-send-mail-with-sendmail)
   (mail-user-agent 'message-user-agent))
 
 (use-package rmail
@@ -1213,19 +1201,18 @@
   
   (defun mail-work ()
     (interactive)
-    (setenv "MAILHOST" "imap.fastmail.com")
-    (setenv "MAIL"
-	    (concat "imaps://"
-		    "marc.coquand%40sustainably.app"
-		    ":"
-		    piva-password
-		    "@imap.gmail.com:993"))
     (setq
+     rmail-primary-inbox-list (list (concat "imaps://"
+					    "marc.coquand%40piva.earth"
+					    ":"
+					    piva-password
+					    "@imap.gmail.com:993"))
      rmail-default-file "~/personal-db/mail/work/RMAIL"
      rmail-remote-password-required nil
+     rmail-preserve-inbox nil
      rmail-secondary-file-regexp "~/personal-db/mail/work/archives"
      rmail-file-name "~/personal-db/mail/work/RMAIL"
-     user-mail-address "marc.coquand@sustainably.app"
+     user-mail-address "marc.coquand@piva.earth"
      unrmail-mbox-format 'mboxo
      user-full-name "Marc Coquand"
      message-default-headers "FCC: ~/personal-db/mail/work/out/sent.mbox"
@@ -1234,22 +1221,23 @@
 
   (defun mail-home ()
     (interactive)
-    (setenv "MAILHOST" "imap.fastmail.com")
-    (setenv "MAIL"
-	    (concat "imaps://"
-		    "marcc%40fastmail.fr"
-		    ":"
-		    fastmail-password
-		    "@imap.fastmail.com:993"))
     (setq
      rmail-default-file "~/personal-db/mail/home/RMAIL"
      rmail-remote-password-required nil
+     rmail-preserve-inbox nil
+     rmail-primary-inbox-list (list (concat "imaps://"
+					    "marcc%40fastmail.fr"
+					    ":"
+					    fastmail-password
+					    "@imap.fastmail.com:993"))
      rmail-secondary-file-regexp "~/personal-db/mail/home/archives/*.mbox"
      rmail-output-file-alist '(("\\[PATCH.*\\]" . "patch.mbox")
 			       ("[rR]eceipt"        . "receipt.mbox")
 			       ("[oO]rder"        . "receipt.mbox")
                                (".*"        . "archive.mbox"))
      rmail-file-name "~/personal-db/mail/home/RMAIL"
+     ;; In case there are errors, you can set '("--set=onerror=delete")
+     rmail-movemail-flags nil
      user-mail-address "marc@mccd.space"
      unrmail-mbox-format 'mboxo
      user-full-name "Marc Coquand"
diff --git a/home/dots/.msmtprc b/home/dots/.msmtprc
index cbf4533..e7ef768 100644
--- a/home/dots/.msmtprc
+++ b/home/dots/.msmtprc
@@ -9,9 +9,9 @@ logfile        ~/.msmtp.log
 account        work
 host           smtp.gmail.com
 port           587
-from           marc.coquand@sustainably.app
-user           marc.coquand@sustainably.app
-passwordeval   "pass sustainably/gmail"
+from           marc.coquand@piva.earth
+user           marc.coquand@piva.earth
+passwordeval   "pass piva/gmail"
 
 # Home
 account        home