Move mu4e config into main body

One less require to deal with.

diff --git a/config.org b/config.org
index 4be482fb10b04a1ec685007c65a4d2799646f430..8aaf5b517732af5a61826881d2d5e8c37787d5ec 100644 (file)
--- a/config.org
+++ b/config.org
@@ -21,7 +21,6 @@ Libraries Not from the package manager
   (setq w32-recognize-altgr 'nil)
 
   (unless (equal system-type 'windows-nt)
-    (require 're-mu4e)
     (setq trash-directory "~/Trash/")
     (defun doas ()
       "Use TRAMP to reopen the current buffer as root using doas."
@@ -482,6 +481,42 @@ Shows the trash file as a dired buffer
        trashed-sort-key '("Date deleted" . t)
        trashed-date-format "%Y-%m-%d %H:%M:%S"))
 #+END_SRC
+* Use mu4e on my home pcs
+#+BEGIN_SRC emacs-lisp
+(unless (equal system-type 'windows-nt)
+  (use-package mu4e
+    :ensure nil
+    :config
+    (setq mail-user-agent 'message-user-agent
+         message-send-mail-function 'smtpmail-send-it
+         message-citation-line-format "Quoth %f :\n"
+         smtpmail-default-smtp-server "mail.earman.xyz"
+         smtpmail-smtp-server "mail.earman.xyz"
+         smtpmail-smtp-service 587
+         smtpmail-stream-type 'starttls
+         smtpmail-local-domain "earman.xyz"
+         smtpmail-queue-mail nil
+         smtpmail-queue-dir "~/mail/iv/outbox/cur"
+         user-mail-address "iv@earman.xyz"
+         user-full-name "Rush N. Earman IV"
+         message-signature "Rush Earman IV, PE"
+         message-kill-buffer-on-exit t
+         mu4e-get-mail-command "mbsync -a"
+         mu4e-update-interval (* 10 60)
+         mu4e-change-filenames-when-moving t
+         mu4e-use-fancy-chars t
+         mu4e-attachment-dir "~/downloads"
+         mu4e-compose-reply-to-address "iv@earman.xyz"
+         mu4e-maildir "~/mail"
+         mu4e-drafts-folder "/iv/Drafts"
+         mu4e-sent-folder "/iv/Sent"
+         mu4e-trash-folder "/iv/Trash"
+         mu4e-maildir-shortcuts '((:maildir "/iv/inbox" :key ?i)
+                                  (:maildir "/iv/Sent" :key ?s)
+                                  (:maildir "/iv/Trash" :key ?t)
+                                  (:maildir "/iv/Drafts" :key ?d)))))
+
+#+END_SRC
 * Editing
 ** UNIX/vi-like bindings
 =C-h=, =C-w=, =C-u=, et. al to work as I expect.  Some functions get re-bound when these take over a default.

diff --git a/re/re-mu4e.el b/re/re-mu4e.el
deleted file mode 100644 (file)
index 8c9c526..0000000
--- a/re/re-mu4e.el
+++ /dev/null
@@ -1,41 +0,0 @@
-;;; re-mu4e.el --- Setup mu4e --- -*- lexical-binding: t; -*-
-;; This file is not part of GNU Emacs
-
-;;; Code:
-
-(use-package mu4e
-  :ensure nil
-  :config
-  (setq mu4e-get-mail-command "mbsync -a"
-       mu4e-update-interval (* 10 60)
-       mu4e-change-filenames-when-moving t
-       mu4e-use-fancy-chars t
-       mu4e-attachment-dir "~/downloads"
-       mu4e-compose-reply-to-address "iv@earman.xyz"
-       mu4e-maildir "~/mail"
-       mu4e-drafts-folder "/iv/Drafts"
-       mu4e-sent-folder "/iv/Sent"
-       mu4e-trash-folder "/iv/Trash"
-       mu4e-maildir-shortcuts '((:maildir "/iv/inbox" :key ?i)
-                                (:maildir "/iv/Sent" :key ?s)
-                                (:maildir "/iv/Trash" :key ?t)
-                                (:maildir "/iv/Drafts" :key ?d))))
-
-(setq mail-user-agent 'message-user-agent
-      message-send-mail-function 'smtpmail-send-it
-      message-citation-line-format "Quoth %f :\n"
-      smtpmail-default-smtp-server "mail.earman.xyz"
-      smtpmail-smtp-server "mail.earman.xyz"
-      smtpmail-smtp-service 587
-      smtpmail-stream-type 'starttls
-      smtpmail-local-domain "earman.xyz"
-      smtpmail-queue-mail nil
-      smtpmail-queue-dir "~/mail/iv/outbox/cur")
-
-(setq user-mail-address "iv@earman.xyz"
-      user-full-name "Rush N. Earman IV"
-      message-signature "Rush Earman IV, PE"
-      message-kill-buffer-on-exit t)
-
-(provide 're-mu4e)
-;;; re-mu4e.el ends here