Commit 4451569475f8

Vincent Demeester <vincent@sbr.pm>
2020-03-10 21:14:13
mails: updates on notmuch
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
1 parent 7ec52c7
config/setup-mails.el
@@ -173,9 +173,22 @@
   (setq message-sendmail-f-is-evil 't)
   (setq message-sendmail-extra-arguments '("--read-envelope-from")))
 
+(use-package sendmail
+  :defer t
+  :commands (mail-mode mail-text)
+  :defines (send-mail-function)
+  :config
+  (setq send-mail-function 'sendmail-send-it
+        sendmail-program "/home/vincent/bin/msmtp"))
+
 (use-package message
+  :commands (message-mode message-cite-original-without-signature)
   :config
   (setq mail-user-agent 'message-user-agent
         message-wide-reply-confirm-recipients t
-        message-default-charset 'utf-8)
-  (add-to-list 'mm-body-charset-encoding-alist '(utf-8 . base64)))
+        message-default-charset 'utf-8
+        message-default-mail-headers "Cc: \nBcc: \n"
+        message-kill-buffer-on-exit t
+        message-generate-headers-first t)
+  (add-to-list 'mm-body-charset-encoding-alist '(utf-8 . base64))
+  (add-hook 'message-mode-hook 'turn-on-auto-fill))
config/setup-notmuch.el
@@ -1,33 +1,17 @@
-(setenv "NOTMUCH_CONFIG" (expand-file-name ".config/notmuch/notmuchrc" (getenv "HOME")))
-(use-package notmuch
-  :defer t
-  :bind ("<f6>" . notmuch)
-  :config
-  (setq notmuch-search-oldest-first nil
-        mail-user-agent 'message-user-agent
-        notmuch-tree-show-out t)
-  (setq notmuch-saved-searches
-        '((:key "i" :name "inbox" :query "tag:Inbox")
-          (:key "r" :name "redhat inbox folder" :query "folder:redhat/Inbox")
-          (:key "p" :name "perso inbox folder" :query "folder:perso/Inbox")
-          (:key "u" :name "unread" :query "tag:unread")
-          (:key "F" :name "flagged" :query "tag:flagged")
-          (:key "S" :name "sent" :query "tag:Sent Mail"))))
-
-(use-package sendmail
-  :defer t
-  :commands (mail-mode mail-text)
-  :defines (send-mail-function)
-  :config
-  (setq send-mail-function 'sendmail-send-it
-        sendmail-program "/home/vincent/bin/msmtp"))
-
-(use-package message
-  :commands (message-mode message-cite-original-without-signature)
-  :config
-  (add-hook 'message-mode-hook 'turn-on-auto-fill)
-  (setq  message-default-mail-headers "Cc: \nBcc: \n"
-         message-kill-buffer-on-exit t
-         message-generate-headers-first t))
-
-(provide 'setup-notmuch)
+(if *sys/full*
+    (progn
+      (setenv "NOTMUCH_CONFIG" (expand-file-name ".config/notmuch/notmuchrc" (getenv "HOME")))
+      (use-package notmuch
+        :defer t
+        :bind ("<f6>" . notmuch)
+        :config
+        (setq notmuch-search-oldest-first nil
+              mail-user-agent 'message-user-agent
+              notmuch-tree-show-out t)
+        (setq notmuch-saved-searches
+              '((:key "i" :name "inbox" :query "tag:Inbox")
+                (:key "r" :name "redhat inbox folder" :query "folder:redhat/Inbox")
+                (:key "p" :name "perso inbox folder" :query "folder:perso/Inbox")
+                (:key "u" :name "unread" :query "tag:unread")
+                (:key "F" :name "flagged" :query "tag:flagged")
+                (:key "S" :name "sent" :query "tag:Sent Mail"))))))
emacs.org
@@ -497,7 +497,7 @@
   "Do we have git?")
 
 (defvar *sys/full*
-  (member (vde/short-hostname) '("naruhodo")) ; "wakasu" <- put wakasu back in
+  (member (vde/short-hostname) '("wakasu")) ; "naruhodo" <- put naruhodo back in
   "Is it a full system ?")
 (defvar *sys/light*
   (not *sys/full*)
@@ -520,18 +520,6 @@
     (load-file (downcase (concat user-emacs-directory "/hosts/" (vde/short-hostname) ".el"))))
 #+end_src
 
-*** Pinentry
-:PROPERTIES:
-:CUSTOM_ID: h:1f016a1a-f4ef-4ef0-be01-1fd68ca0d951
-:END:
-
-#+begin_src emacs-lisp :tangle init.el
-(use-package pinentry
-  :config
-  (setenv "INSIDE_EMACS" (format "%s,comint" emacs-version))
-  (pinentry-start))
-#+end_src
-
 *** Counting the time of loading
 :PROPERTIES:
 :CUSTOM_ID: h:2b645e95-6776-4f5b-a318-e5a915943881
@@ -1789,15 +1777,28 @@
   (setq sendmail-program "msmtp")
   (setq message-sendmail-f-is-evil 't)
   (setq message-sendmail-extra-arguments '("--read-envelope-from")))
+
+(use-package sendmail
+  :defer t
+  :commands (mail-mode mail-text)
+  :defines (send-mail-function)
+  :config
+  (setq send-mail-function 'sendmail-send-it
+        sendmail-program "/home/vincent/bin/msmtp"))
 #+end_src
 
 #+begin_src emacs-lisp
 (use-package message
+  :commands (message-mode message-cite-original-without-signature)
   :config
   (setq mail-user-agent 'message-user-agent
         message-wide-reply-confirm-recipients t
-        message-default-charset 'utf-8)
-  (add-to-list 'mm-body-charset-encoding-alist '(utf-8 . base64)))
+        message-default-charset 'utf-8
+        message-default-mail-headers "Cc: \nBcc: \n"
+        message-kill-buffer-on-exit t
+        message-generate-headers-first t)
+  (add-to-list 'mm-body-charset-encoding-alist '(utf-8 . base64))
+  (add-hook 'message-mode-hook 'turn-on-auto-fill))
 #+end_src
 
 * User interface and interactions
@@ -3384,39 +3385,23 @@
 :END:
 
 #+begin_src emacs-lisp :tangle config/setup-notmuch.el
-(setenv "NOTMUCH_CONFIG" (expand-file-name ".config/notmuch/notmuchrc" (getenv "HOME")))
-(use-package notmuch
-  :defer t
-  :bind ("<f6>" . notmuch)
-  :config
-  (setq notmuch-search-oldest-first nil
-        mail-user-agent 'message-user-agent
-        notmuch-tree-show-out t)
-  (setq notmuch-saved-searches
-        '((:key "i" :name "inbox" :query "tag:Inbox")
-          (:key "r" :name "redhat inbox folder" :query "folder:redhat/Inbox")
-          (:key "p" :name "perso inbox folder" :query "folder:perso/Inbox")
-          (:key "u" :name "unread" :query "tag:unread")
-          (:key "F" :name "flagged" :query "tag:flagged")
-          (:key "S" :name "sent" :query "tag:Sent Mail"))))
-
-(use-package sendmail
-  :defer t
-  :commands (mail-mode mail-text)
-  :defines (send-mail-function)
-  :config
-  (setq send-mail-function 'sendmail-send-it
-        sendmail-program "/home/vincent/bin/msmtp"))
-
-(use-package message
-  :commands (message-mode message-cite-original-without-signature)
-  :config
-  (add-hook 'message-mode-hook 'turn-on-auto-fill)
-  (setq  message-default-mail-headers "Cc: \nBcc: \n"
-         message-kill-buffer-on-exit t
-         message-generate-headers-first t))
-
-(provide 'setup-notmuch)
+(if *sys/full*
+    (progn
+      (setenv "NOTMUCH_CONFIG" (expand-file-name ".config/notmuch/notmuchrc" (getenv "HOME")))
+      (use-package notmuch
+        :defer t
+        :bind ("<f6>" . notmuch)
+        :config
+        (setq notmuch-search-oldest-first nil
+              mail-user-agent 'message-user-agent
+              notmuch-tree-show-out t)
+        (setq notmuch-saved-searches
+              '((:key "i" :name "inbox" :query "tag:Inbox")
+                (:key "r" :name "redhat inbox folder" :query "folder:redhat/Inbox")
+                (:key "p" :name "perso inbox folder" :query "folder:perso/Inbox")
+                (:key "u" :name "unread" :query "tag:unread")
+                (:key "F" :name "flagged" :query "tag:flagged")
+                (:key "S" :name "sent" :query "tag:Sent Mail"))))))
 #+end_src
 
 *** ~setup-org.el~