From 6451081c5f3add596398cb30286aff7baa5757a0 Mon Sep 17 00:00:00 2001
From: Antoine Martin <antoine@alarsyo.net>
Date: Sun, 15 May 2022 07:06:56 +0200
Subject: [PATCH 1/3] Enable Org info and DOI links

---
 config.org | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/config.org b/config.org
index d76aa9c..2c818ca 100644
--- a/config.org
+++ b/config.org
@@ -40,6 +40,7 @@
     - [[#org-roam-ui][org-roam-ui]]
   - [[#export-backends][Export backends]]
   - [[#doom-specific][Doom specific]]
+    - [[#enable-some-link-modules-that-doom-disables-by-default][Enable some link modules that doom disables by default]]
     - [[#bugfix][Bugfix]]
 - [[#magit][Magit]]
   - [[#gitlab-ci-skip-flag][Gitlab CI skip flag]]
@@ -506,6 +507,13 @@ one. Taken from [[https://github.com/hlissner/doom-emacs/tree/develop/modules/la
   (remove-hook 'org-tab-first-hook #'+org-cycle-only-current-subtree-h))
 #+END_SRC
 
+*** Enable some link modules that doom disables by default
+
+#+begin_src emacs-lisp
+(add-to-list 'org-modules 'ol-info)
+(add-to-list 'org-modules 'ol-doi)
+#+end_src
+
 *** Bugfix
 
 Fix a bug with capture mode not working correctly when agenda is opened, stolen

From 090b9c08f708d65c1adf6d852180ee138b554c9d Mon Sep 17 00:00:00 2001
From: Antoine Martin <antoine@alarsyo.net>
Date: Sun, 15 May 2022 07:29:03 +0200
Subject: [PATCH 2/3] Fix signature export in org-msg mode

---
 config.org | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/config.org b/config.org
index 2c818ca..0f48d0b 100644
--- a/config.org
+++ b/config.org
@@ -48,7 +48,7 @@
   - [[#account-configuration][Account configuration]]
   - [[#sending-mail][Sending mail]]
   - [[#reading-plain-text][Reading plain text]]
-  - [[#disable-org-msg-by-default][Disable =org-msg= by default]]
+  - [[#org-msg-setup][=org-msg= setup]]
   - [[#message-quoting-style][Message quoting style]]
   - [[#disable-formatflowed][Disable format=flowed]]
   - [[#dont-permanently-delete-when-trashing-mails][Don't permanently delete when trashing mails]]
@@ -617,14 +617,20 @@ possible.
 (add-to-list 'mm-discouraged-alternatives "text/richtext")
 #+end_src
 
-** Disable =org-msg= by default
+** =org-msg= setup
 
 Doom adds a hook, making it impossible to disable. This allows us to toggle it
 manually.
 
-#+begin_src emacs-lisp
-(after! org-msg
-  (setq +mu4e-compose-org-msg-toggle-next nil))
+#+begin_src emacs-lisp :noweb-ref after-mu4e :tangle no
+(setq +mu4e-compose-org-msg-toggle-next nil)
+#+end_src
+
+Add =-:nil= to the export options list, otherwise the =--= in the signature gets
+converted to a single hyphen when exporting to utf-8. See [[info:org#Export settings]]
+
+#+begin_src emacs-lisp :noweb-ref after-mu4e :tangle no
+(setq org-msg-options (concat org-msg-options " -:nil"))
 #+end_src
 
 ** Message quoting style

From 9cb5cdc6b2fa5076bb78187e1aa4aa25d33bf40b Mon Sep 17 00:00:00 2001
From: Antoine Martin <antoine@alarsyo.net>
Date: Sun, 15 May 2022 07:51:21 +0200
Subject: [PATCH 3/3] Make org-msg the default mu4e compose mode

---
 config.org | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/config.org b/config.org
index 0f48d0b..ae4496a 100644
--- a/config.org
+++ b/config.org
@@ -619,13 +619,6 @@ possible.
 
 ** =org-msg= setup
 
-Doom adds a hook, making it impossible to disable. This allows us to toggle it
-manually.
-
-#+begin_src emacs-lisp :noweb-ref after-mu4e :tangle no
-(setq +mu4e-compose-org-msg-toggle-next nil)
-#+end_src
-
 Add =-:nil= to the export options list, otherwise the =--= in the signature gets
 converted to a single hyphen when exporting to utf-8. See [[info:org#Export settings]]
 
@@ -633,6 +626,22 @@ converted to a single hyphen when exporting to utf-8. See [[info:org#Export sett
 (setq org-msg-options (concat org-msg-options " -:nil"))
 #+end_src
 
+Setup signature as well. The double backslashes are there to make sure that the
+linebreak is preserved even in the html export, which otherwise wraps the
+signature lines as a single paragraph.
+
+#+begin_src emacs-lisp :noweb-ref after-mu4e :tangle no
+(setq org-msg-signature "\n#+begin_signature\n-- \\\\\nAntoine Martin\n#+end_signature")
+#+end_src
+
+I don't want to send HTML emails at all unless I choose to explicitely.
+
+#+begin_src emacs-lisp :noweb-ref after-mu4e :tangle no
+(setq org-msg-default-alternatives '((new utf-8)
+                                     (reply-to-text utf-8)
+                                     (reply-to-html utf-8)))
+#+end_src
+
 ** Message quoting style
 
 Has to be duplicated because =mu4e= doesn't use ~message-cite-style~'s values.