1 files changed, 67 insertions, 60 deletions

diff --git a/.emacs.d/jd/jd-mu4e.el b/.emacs.d/jd/jd-mu4e.el
index e97c4fc..cb81c5c 100755
--- a/.emacs.d/jd/jd-mu4e.el
+++ b/.emacs.d/jd/jd-mu4e.el
@@ -3,77 +3,84 @@
 
 (jd/use-package htmlize "emacs-htmlize")
 
-; (jd/add-package-to-manifest "mbsync") ;; TODO: Define guix mbsync package?
+(jd/add-package-to-manifest "isync")
 
 (jd/use-package mu4e "mu"
-  :defer 10
-  :ensure nil
-  :config
-  (require 'org-mu4e)
+                :defer 10
+                :ensure nil
+                :bind
+                ("C-c M" . mu4e)
+                :config
+                                        ;a  (require 'org-mu4e)
 
-  (setq mu4e-mu-binary "/usr/local/bin/mu")
-  (setq mu4e-update-interval (* 10 60))
-  (setq mu4e-get-mail-command "mbsync -a")
-  (setq mu4e-maildir "~/Mail")
+                (if jd/guix-p
+                    (setq mu4e-mu-binary "/home/jakub/.guix-extra-profiles/emacs/emacs/bin/mu")
+                  (setq mu4e-mu-binary "/usr/local/bin/mu"))
 
-  (setq mu4e-completing-read-function #'ivy-completing-read)
+                (setq mu4e-update-interval (* 10 60))
+                (setq mu4e-get-mail-command "mbsync -a")
+                (setq mu4e-maildir "~/Mail")
 
-  (setq mu4e-change-filenames-when-moving t)
+                (setq mu4e-completing-read-function #'ivy-completing-read)
 
-  (setq mu4e-contexts
-        `(,(make-mu4e-context
-            :name "Abaks"
-            :match-func (lambda (msg) (when msg
-                                        (string-prefix-p "/abaks" (mu4e-message-field msg :maildir))))
-            :vars '(
-                    (user-full-name . "Jakub Dlugosz")
-                    (user-mail-address . "jakub@abaks.pl")
-                    (mu4e-sent-folder . "/abaks/Sent Items")
-                    (mu4e-trash-folder . "/abaks/Trash")
-                    (mu4e-drafts-folder . "/abaks/Drafts")
-                    (mu4e-refile-folder . "/abaks/Archive")
-                    (smtpmail-local-domain . "pl")
-                    (smtpmail-smtp-server . "smtp.abaks.pl")
-                    (mu4e-sent-messages-behavior . sent)
-                    ))
-          ,(make-mu4e-context
-            :name "Gmail"
-            :match-func (lambda (msg) (when msg
-                                        (string-prefix-p "/gmail" (mu4e-message-field msg :maildir))))
-            :vars '(
-                    (user-full-name . "Jakub Dlugosz")
-                    (user-mail-address . "jdlugosz963@gmail.com")
-                    (mu4e-sent-folder . "/gmail/\[Gmail\]/Wys\&AUI-ane")
-                    (mu4e-trash-folder . "/gmail/\[Gmail\]/Kosz")
-                    (mu4e-drafts-folder . "/gmail/\[Gmail\]/Wersje\ robocze")
-                    (mu4e-refile-folder . "/gmail/Archive")
-                    (smtpmail-local-domain . "com")
-                    (smtpmail-smtp-server . "smtp.gmail.com")
-                    (mu4e-sent-messages-behavior . sent)
-                    ))))
+                (setq mu4e-change-filenames-when-moving t)
 
-  (setq mail-user-agent 'mu4e-user-agent
-        mail-host-address nil
-        message-send-mail-function 'smtpmail-send-it
-        smtpmail-smtp-service 465
-        smtpmail-stream-type  'ssl)
+                (setq mu4e-contexts
+                      `(,(make-mu4e-context
+                          :name "Abaks"
+                          :match-func (lambda (msg) (when msg
+                                                 (string-prefix-p "/abaks" (mu4e-message-field msg :maildir))))
+                          :vars '(
+                                  (user-full-name . "Jakub Dlugosz")
+                                  (user-mail-address . "jakub@abaks.pl")
+                                  (mu4e-sent-folder . "/abaks/Sent Items")
+                                  (mu4e-trash-folder . "/abaks/Trash")
+                                  (mu4e-drafts-folder . "/abaks/Drafts")
+                                  (mu4e-refile-folder . "/abaks/Archive")
+                                  (mu4e-sent-messages-behavior . sent)
+                                  (smtpmail-local-domain . "pl")
+                                  (smtpmail-smtp-server . "smtp.abaks.pl")
+                                  (smtpmail-smtp-user . "jakub@abaks.pl")))
+                        ,(make-mu4e-context
+                          :name "Gmail"
+                          :match-func (lambda (msg) (when msg
+                                                 (string-prefix-p "/gmail" (mu4e-message-field msg :maildir))))
+                          :vars '(
+                                  (user-full-name . "Jakub Dlugosz")
+                                  (user-mail-address . "jdlugosz963@gmail.com")
+                                  (mu4e-sent-folder . "/gmail/\[Gmail\]/Wys\&AUI-ane")
+                                  (mu4e-trash-folder . "/gmail/\[Gmail\]/Kosz")
+                                  (mu4e-drafts-folder . "/gmail/\[Gmail\]/Wersje\ robocze")
+                                  (mu4e-refile-folder . "/gmail/Archive")
+                                  (smtpmail-local-domain . "com")
+                                  (smtpmail-smtp-server . "smtp.gmail.com")
+                                  (smtpmail-smtp-user . "jdlugosz963@gmail.com")
+                                  (mu4e-sent-messages-behavior . sent)))))
 
-  (setq mu4e-compose-signature (concat
-                                "Pozdrawiam,\n"
-                                "Jakub Długosz"))
+                (setq mail-user-agent 'mu4e-user-agent
+                      mail-host-address nil
+                      message-send-mail-function 'smtpmail-send-it
+                      smtpmail-smtp-service 465
+                      smtpmail-stream-type  'ssl
+                      smtpmail-servers-requiring-authorization ".*")
 
-  (mu4e t))
+                (setq mu4e-compose-signature (concat
+                                              "Pozdrawiam,\n"
+                                              "Jakub Długosz"))
+
+                (mu4e t)
+                (mu4e-modeline-mode nil))
 
 (jd/use-package mu4e-alert "emacs-mu4e-alert"
-  :defer 20
-  :config
-  (mu4e-alert-set-default-style 'libnotify)
-  (mu4e-alert-enable-mode-line-display)
-  (mu4e-alert-enable-notifications)
+                :defer 20
+                :config
+                (mu4e-alert-set-default-style 'libnotify)
+                (mu4e-alert-enable-mode-line-display)
+                (mu4e-alert-enable-notifications)
 
-  (jd/leader-key-def
-   "m"  '(:ignore t :which-key "mail")
-   "mm" 'mu4e
-   "mc" 'mu4e-compose-new))
+                (jd/leader-key-def
+                  "m"  '(:ignore t :which-key "mail")
+                  "mm" 'mu4e
+                  "mc" 'mu4e-compose-new))
 
 (provide 'jd-mu4e)