From 164110a45a1b4c2fe720426eae19a4cf0e763152 Mon Sep 17 00:00:00 2001
From: jao <jao@gnu.org>
Date: Sun, 30 Jan 2022 19:02:31 +0000
Subject: mail: notmuch has a better attachment checker

---
 email.org   | 10 +++++-----
 exwm.org    |  2 +-
 notmuch.org | 30 ++++++++++++++++--------------
 3 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/email.org b/email.org
index ba0ba05..cc28b73 100644
--- a/email.org
+++ b/email.org
@@ -1,12 +1,12 @@
 #+property: header-args:emacs-lisp :lexical t :tangle yes :comments yes :results silent :shebang ";; -*- lexical-binding: t; -*-" :tangle-mode (identity #o644)
 #+title: email handling (message mode, bbdb, gnus, notmuch)
 
-* personal emails
+* personal emails and others
   #+begin_src emacs-lisp
     (defvar jao-mails)
     (defvar jao-extra-mails)
-    (defvar jao-mails-regexp)
-    (setq jao-mails-regexp (regexp-opt jao-mails))
+    (defvar jao-mails-regexp (regexp-opt jao-mails))
+    (defvar jao-notmuch-enabled (eq jao-afio-mail-function 'notmuch))
   #+end_src
 * gnus
 *** directories
@@ -208,10 +208,11 @@
 *** Send mail hooks
     #+begin_src emacs-lisp
       (dolist (h '(jao-message-check-gcc
-                   jao-message-check-attachment
                    jao-message-check-recipient
                    jao-message-maybe-sign))
         (add-hook 'message-send-hook h))
+      (unless jao-notmuch-enabled
+        (add-hook 'message-send-hook #'jao-message-check-attachment))
     #+end_src
 *** Keybindings
     #+begin_src emacs-lisp
@@ -381,6 +382,5 @@
   #+end_src
 * notmuch
   #+begin_src emacs-lisp
-    (defvar jao-notmuch-enabled-p (eq jao-afio-mail-function 'notmuch))
     (jao-load-org "notmuch")
   #+end_src
diff --git a/exwm.org b/exwm.org
index a1345b7..4c8a658 100644
--- a/exwm.org
+++ b/exwm.org
@@ -254,7 +254,7 @@
     (jao-def-exwm-runner jao-exwm-vlc 4 "VLC" "vlc")
 
     (jao-def-exwm-runner jao-exwm-deezer 5 "Deezer" "deezer-desktop")
-    (defalias 'jao-spotify-list #'jao-exwm-deezer)
+    (defalias 'jao-streaming-list #'jao-exwm-deezer)
 
     (jao-def-exwm-runner jao-exwm-slack 0 "Slack" "slack")
     (jao-def-exwm-runner jao-exwm-signal 0 "Signal" "signal-desktop")
diff --git a/notmuch.org b/notmuch.org
index d433ecb..9fb3556 100644
--- a/notmuch.org
+++ b/notmuch.org
@@ -38,7 +38,7 @@
                          " "))
         (jao-minibuffer-refresh)))
 
-    (when jao-notmuch-enabled-p
+    (when jao-notmuch-enabled
       (jao-minibuffer-add-variable 'jao-notmuch-minibuffer-string -20))
   #+end_src
 * saved searches
@@ -198,21 +198,23 @@
 
     (use-package notmuch
       :init
-      :custom
-      ((notmuch-address-use-company nil)
-       (notmuch-address-command (if jao-notmuch-enabled-p 'internal 'as-is))
-       (notmuch-draft-folder "drafts")
-       (notmuch-draft-quoted-tags '("part"))
-       (notmuch-address-internal-completion '(received nil))
-       (notmuch-fcc-dirs
-        '(("\\(support\\|education\\)@bigml.com" . nil)
-          (".*@bigml.com" . "bigml/sent +bigml +sent -new")
-          (".*" . "jao/trove +jao +sent +trove -new")))
-       (notmuch-maildir-use-notmuch-insert t))
+      (setq notmuch-address-use-company nil
+            notmuch-address-command (if jao-notmuch-enabled 'internal 'as-is)
+            notmuch-always-prompt-for-sender t
+            notmuch-draft-folder "drafts"
+            notmuch-draft-quoted-tags '("part")
+            notmuch-address-internal-completion '(received nil)
+            notmuch-fcc-dirs
+            '(("\\(support\\|education\\)@bigml.com" . nil)
+              (".*@bigml.com" . "bigml/sent +bigml +sent -new")
+              (".*" . "jao/trove +jao +sent +trove -new"))
+            notmuch-maildir-use-notmuch-insert t)
 
       :config
 
-      (when jao-notmuch-enabled-p
+      (add-hook 'message-send-hook #'notmuch-mua-attachment-check)
+
+      (when jao-notmuch-enabled
         (define-key message-mode-map (kbd "C-c C-d") #'notmuch-draft-postpone)
         (setq message-directory "~/var/mail/"
               message-auto-save-directory "/tmp"
@@ -564,7 +566,7 @@
     #+end_src
 * html render
   #+begin_src emacs-lisp
-    (when jao-notmuch-enabled-p (setq mm-text-html-renderer 'shr))
+    (when jao-notmuch-enabled (setq mm-text-html-renderer 'shr))
   #+end_src
 * consult
   #+begin_src emacs-lisp
-- 
cgit v1.2.3