From 76f073544438037516bb9f995525d4d0fbb65fdc Mon Sep 17 00:00:00 2001
From: Maxime Wack <maximewack@free.Fr>
Date: Mon, 16 Sep 2019 15:12:20 +0200
Subject: [PATCH] Configure APHP email

---
 .emacs | 43 +++++++++++++++++++++++++++----------------
 1 file changed, 27 insertions(+), 16 deletions(-)

diff --git a/.emacs b/.emacs
index 6f8ff99..c01ba9a 100644
--- a/.emacs
+++ b/.emacs
@@ -1380,22 +1380,10 @@
   :config
   (add-to-list 'evil-emacs-state-modes 'mu4e-main-mode)
 
-  ;; Mail accounts
-  (cond ((equal (system-name) "hegp")
-         (setq mu4e-maildir (expand-file-name "~/Mail/aphp")
-               mu4e-get-mail-command "mbsync aphp"
-               ))
-        ((equal (system-name) "laptop")
-         (setq mu4e-maildir (expand-file-name "~/Mail/free")
-               mu4e-get-mail-command "mbsync free"
-               mu4e-compose-signature "Maxime"
-               )))
-
   ;; Folders
   (setq mu4e-sent-folder "/Inbox"
         mu4e-drafts-folder "/Drafts"
-        mu4e-trash-folder "/Trash"
-        mu4e-refile-folder "/Archives")
+        mu4e-trash-folder "/Trash")
 
   ;; and their shortcuts
   (setq mu4e-maildir-shortcuts
@@ -1405,6 +1393,29 @@
           ("/Junk"     . ?j)
           ("/Sent"     . ?s)))
 
+  ;; Mail accounts
+  (cond ((equal (system-name) "hegp")
+         (setq mu4e-maildir (expand-file-name "~/Mail/aphp")
+               mu4e-get-mail-command "mbsync aphp"
+               mu4e-refile-folder "/Inbox/Archives"
+               mu4e-maildir-shortcuts
+               '(("/Inbox"          . ?i)
+                 ("/Inbox/Archives" . ?a)
+                 ("/Trash"          . ?t)
+                 ("/Junk"           . ?j)
+                 ("/Sent"           . ?s))
+               mu4e-compose-signature "Dr Maxime Wack, MD, MSc
+Assistant Hospitalo-Universitaire
+Pôle Informatique et Santé Publique
+Hôpital Européen Georges Pompidou
+tel: 01 56 09 23 63"))
+        ((equal (system-name) "laptop")
+         (setq mu4e-maildir (expand-file-name "~/Mail/free")
+               mu4e-get-mail-command "mbsync free"
+               mu4e-refile-folder "/Archives"
+               mu4e-compose-signature "Maxime"
+               )))
+
   ;; Options
   (setq mu4e-view-prefer-html t
         mu4e-update-interval 180
@@ -1496,11 +1507,11 @@
     ;; Mail accounts
   (cond ((equal (system-name) "laptop")
          (setq smtpmail-smtp-server "smtp.free.fr"
-               auth-sources '(password-store)
-               ))
+               auth-sources '(password-store)))
         ((equal (system-name) "hegp")
          (setq smtpmail-smtp-server "localhost"
-               ))))
+               auth-sources '(password-store)
+               smtpmail-smtp-service 1025))))
 
 ;;;;; Org-mime