about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--init.el52
1 files changed, 41 insertions, 11 deletions
diff --git a/init.el b/init.el index d8570c4..38df4a1 100644 --- a/init.el +++ b/init.el
@@ -432,7 +432,7 @@
432(setup kmacro 432(setup kmacro
433 (:also-load +kmacro) 433 (:also-load +kmacro)
434 (with-eval-after-load '+kmacro 434 (with-eval-after-load '+kmacro
435 (+kmacro-recording-indicator-mode +1) 435 ;; (+kmacro-recording-indicator-mode +1)
436 (+kmacro-block-undo-mode +1))) 436 (+kmacro-block-undo-mode +1)))
437 437
438(setup minibuffer 438(setup minibuffer
@@ -462,23 +462,53 @@
462 )) 462 ))
463 463
464(setup notmuch 464(setup notmuch
465 (:load-from "/usr/share/emacs/site-lisp/elpa-src/notmuch-0.31.4/") 465 (add-to-list 'load-path
466 (:require notmuch) 466 (car (file-expand-wildcards "/usr/share/emacs/site-lisp/elpa-src/notmuch*")))
467 (:option notmuch-address-save-filename (.etc "notmuch/addresses" t) 467 (require 'notmuch)
468 (require '+notmuch)
469 (+define-dir notmuch/ (private/ "notmuch")
470 "Notmuch configuration and data.")
471 (:option notmuch-init-file (notmuch/ "init.el" t)
472 notmuch-address-save-filename (notmuch/ "addresses" t)
468 notmuch-address-use-company (featurep 'company) 473 notmuch-address-use-company (featurep 'company)
469 ;; notmuch-fcc-dirs 474 notmuch-search-oldest-first nil
470 ;; (list (cons chd/email (concat "\"" chd/sent-dir "\"" 475 notmuch-saved-searches (list
471 ;; " +sent +work -inbox")) 476 (list :name "next"
472 ;; (cons ".*" "\"fastmail/Sent\" +sent +personal -inbox")) 477 :query (+notmuch-query-concat "tag:inbox"
473 notmuch-search-oldest-first nil) 478 "NOT tag:/List/")
479 :key "n")
480 (list :name "lists"
481 :query (+notmuch-query-concat "tag:/List/")
482 :key "l")
483 ;; original
484 (list :name "inbox"
485 :query (+notmuch-query-concat "tag:inbox"
486 "NOT tag:Spam")
487 :key "i")
488 (list :name "unread"
489 :query (+notmuch-query-concat "tag:unread"
490 "NOT tag:Spam")
491 :key "u")
492 (list :name "flagged" :query "tag:flagged" :key "f")
493 (list :name "sent" :query "tag:sent" :key "t")
494 (list :name "drafts" :query "tag:draft" :key "d")
495 (list :name "all mail" :query "*" :key "a")))
496 ;; I don't know why or how this isn't properly loaded, but here we are.
497 (with-eval-after-load 'notmuch (load notmuch-init-file :noerror))
474 ;; Composing mail 498 ;; Composing mail
475 (:option message-kill-buffer-on-exit t) 499 (:option message-kill-buffer-on-exit t)
476 ;; Sending mail 500 ;; Sending mail
477 (:option send-mail-function #'sendmail-send-it 501 (:option send-mail-function #'sendmail-send-it
478 sendmail-program (executable-find "msmtp")
479 mail-specify-envelope-from t 502 mail-specify-envelope-from t
480 message-sendmail-envelope-from 'header 503 message-sendmail-envelope-from 'header
481 mail-envelope-from 'header)) 504 mail-envelope-from 'header)
505 ;; Extras and fixes
506 ;; +send-mail-dispatch is defined in notmuch/init.el
507 (add-hook 'notmuch-show-mode-hook #'visual-fill-column-mode)
508 (add-hook 'message-send-hook #'+send-mail-dispatch)
509 (advice-add 'notmuch-tag :filter-args #'+notmuch-correct-tags)
510 (:+leader "m" #'+notmuch-goto
511 "C-m" #'+notmuch-goto))
482 512
483(setup org 513(setup org
484 ;; Plain org with the `setup' form for sorting, but I install with straight. 514 ;; Plain org with the `setup' form for sorting, but I install with straight.