files/emacs: replace msmtp with smtpmail

2 files changed, 26 insertions, 6 deletions

diff --git a/epistemia/files/emacs/.config/emacs/init.el b/epistemia/files/emacs/.config/emacs/init.el
index c11e2ec..297f4cd 100644
--- a/epistemia/files/emacs/.config/emacs/init.el
+++ b/epistemia/files/emacs/.config/emacs/init.el
@@ -104,14 +104,35 @@
    (append woman-special-characters
            '(("dq" "\"" "\""))))
 
+  :bind ([remap list-buffers] . ibuffer))
 
-  ;; mail stuff
-  (send-mail-function 'sendmail-send-it)
-  (sendmail-program "msmtp")
+(defun vin/set-smtp-for-from ()
+  "Set SMTP user and server based on the From: address."
+  (let ((from (message-field-value "From")))
+    (cond
+     ((string-match "@vineetk.net" from)
+      (setq smtpmail-smtp-user "me@vineetk.net")
+      (setq smtpmail-smtp-server "mail.vineetk.net"))
+     ((string-match "@13f0.net" from)
+      (setq smtpmail-smtp-user "me@13f0.net")
+      (setq smtpmail-smtp-server "mail.vineetk.net"))
+     ((string-match "@vinbiz.ca" from)
+      (setq smtpmail-smtp-user "vineet@vinbiz.ca")
+      (setq smtpmail-smtp-server "mail.vineetk.net"))
+     (t
+      (setq smtpmail-smtp-user "me@vineetk.net")
+      (setq smtpmail-smtp-server "mail.vineetk.net")))))
+
+;; email config
+(use-package emacs
+  :custom
+  (send-mail-function 'smtpmail-send-it)
+  (smtpmail-smtp-server "mail.vineetk.net")
+  (smtpmail-smtp-service 465)
+  (smtpmail-stream-type 'tls)
   (mail-specify-envelope-from t)
-  (message-sendmail-envelope-from 'header)
   (mail-envelope-from 'header)
-  :bind ([remap list-buffers] . ibuffer))
+  :hook (message-send . vin/set-smtp-for-from))
 
 ;; eshell config
 (use-package eshell
diff --git a/epistemia/home/config.scm b/epistemia/home/config.scm
index 358d688..c89a390 100644
--- a/epistemia/home/config.scm
+++ b/epistemia/home/config.scm
@@ -142,7 +142,6 @@
 
                    ;; email
                    isync
-                   msmtp
                    notmuch
                    oauth2ms