diff options
Diffstat (limited to 'modules/emacs')
| -rw-r--r-- | modules/emacs/default.nix | 4 | ||||
| -rw-r--r-- | modules/emacs/doom/config.el | 15 | ||||
| -rw-r--r-- | modules/emacs/doom/init.el | 3 |
3 files changed, 12 insertions, 10 deletions
diff --git a/modules/emacs/default.nix b/modules/emacs/default.nix index 3e59ce8..1e575ed 100644 --- a/modules/emacs/default.nix +++ b/modules/emacs/default.nix @@ -227,6 +227,10 @@ in (mu4e-drafts-folder . "/${name}/${folders.drafts}") (mu4e-trash-folder . "/${name}/${folders.trash}") (mu4e-refile-folder . "/${name}/Archive") + ${ + optionalString (signature.showSignature != "none") + ''(mu4e-compose-signature . "${replaceStrings [ "\n" ] [ "\\n" ] signature.text}")'' + } (+mu4e-personal-addresses . (${personalAddresses}))) t) '' diff --git a/modules/emacs/doom/config.el b/modules/emacs/doom/config.el index 1926627..51d1c47 100644 --- a/modules/emacs/doom/config.el +++ b/modules/emacs/doom/config.el @@ -196,13 +196,14 @@ ;;; mu4e ;; -(setq-hook! 'mu4e-main-mode-hook - mu4e-update-interval 30 - message-send-mail-function #'message-send-mail-with-sendmail - message-sendmail-extra-arguments '("--read-envelope-from") - message-sendmail-f-is-evil t - send-mail-function #'sendmail-send-it - sendmail-program (executable-find "msmtp")) +(after! mu4e + (setq sendmail-program (executable-find "msmtp") + send-mail-function #'smtpmail-send-it + message-sendmail-f-is-evil t + message-sendmail-extra-arguments '("--read-envelope-from") + message-send-mail-function #'message-send-mail-with-sendmail)) + +(setq-hook! 'mu4e-main-mode-hook mu4e-update-interval 30) ;; ;;; Circe diff --git a/modules/emacs/doom/init.el b/modules/emacs/doom/init.el index 8b04fa7..5788fcc 100644 --- a/modules/emacs/doom/init.el +++ b/modules/emacs/doom/init.el @@ -68,14 +68,11 @@ :lang (cc +lsp +tree-sitter) data - dhall emacs-lisp (go +lsp +tree-sitter) (haskell +lsp +tree-sitter) - java javascript (json +lsp +tree-sitter) - kotlin (latex +latexmk +cdlatex +lsp) markdown (nix +lsp +tree-sitter) |