diff options
Diffstat (limited to 'custom/jao-custom-gnus.el')
| -rw-r--r-- | custom/jao-custom-gnus.el | 58 |
1 files changed, 9 insertions, 49 deletions
diff --git a/custom/jao-custom-gnus.el b/custom/jao-custom-gnus.el index ec6c761..97201ad 100644 --- a/custom/jao-custom-gnus.el +++ b/custom/jao-custom-gnus.el @@ -127,49 +127,8 @@ gnus-permanently-visible-groups "^nnselect:.*" gnus-search-ignored-newsgroups "nndraft.*\\|nnselect.*") -(with-eval-after-load "gnus-search" - (defclass gnus-search-recoll (gnus-search-indexed) - ((separator :type string :initform ".") - (program :initform "recoll") - (raw-queries-p :initform t))) - - (cl-defmethod gnus-search-indexed-extract ((_engine gnus-search-recoll)) - (prog1 (and (looking-at "^file://\\(.+\\)$") (list (match-string 1) 100)) - (forward-line 1))) - - (cl-defmethod gnus-search-transform-expression ((_engine gnus-search-recoll) - expr) - expr) - - (cl-defmethod gnus-search-indexed-search-command ((engine gnus-search-recoll) - (qstring string) - query - &optional groups) - (let* ((subdir (slot-value engine 'remove-prefix)) - (sep (slot-value engine 'separator)) - (gdirs (mapcar (lambda (g) - (let ((g (gnus-group-short-name g))) - (replace-regexp-in-string "\\." sep g))) - (or groups - (and (not (string= "" subdir)) (list subdir))))) - (dirsq (and gdirs - (concat "(" - (mapconcat (lambda (d) (format "dir:%s" d)) - gdirs " OR ") - ")"))) - (qstring (if (string-prefix-p "id:" qstring) - (replace-regexp-in-string "<\\|>" "\"" qstring) - qstring)) - (qstring (if (cdr (assoc 'thread query)) - (concat qstring " OR " - (replace-regexp-in-string "id:\"" "ref:\"" - qstring)) - qstring)) - (qstring (replace-regexp-in-string " or " " OR " qstring)) - (qstring (replace-regexp-in-string " and " " AND " qstring)) - (q (format "mime:message %s (%s)" dirsq qstring))) - ;; (message "query is: %s -- %S" q query) - `("-b" "-t" "-q" ,q)))) +(use-package jao-recoll + :if (jao-is-linux)) ;; (add-to-list 'gnus-parameters '("^nnselect:.*" (nnselect-rescan . t))) @@ -230,7 +189,7 @@ '("local/" "feeds/"))) (ims (mapcar (lambda (b) `(imap :server "127.0.0.1" :port 1143 - :user "mail@jao.io" :password ,pwd + :user "jaor@pm.me" :password ,pwd :stream starttls :predicate "1:*" :fetchflag "\\Deleted \\Seen" :mailbox ,(concat "Labels/#" b))) @@ -240,11 +199,12 @@ (when jao-gnus-use-nnml (add-to-list + ;; `(nnml "" ,(jao-recoll-gnus-search-engine (jao-gnus-dir "Mail/"))) 'gnus-secondary-select-methods - ;; `(nnml "" (gnus-search-engine gnus-search-recoll - ;; (remove-prefix ,(jao-gnus-dir "Mail/")))) - `(nnml "" (gnus-search-engine gnus-search-notmuch - (remove-prefix "/home/jao/var/mail/gnus"))))) + `(nnml "" + (gnus-search-engine gnus-search-notmuch + (remove-prefix + ,(expand-file-name "gnus" jao-maildir)))))) (when jao-gnus-use-nnml (dolist (p jao-gnus-nnml-group-params) @@ -817,7 +777,7 @@ (use-package consult-notmuch :ensure t - :bind (:map gnus-group-mode-map ("S" . #'jao-gnus-consult-notmuch))) + :bind (:map gnus-group-mode-map ("/" . #'jao-gnus-consult-notmuch))) ;;; keyboard shortcuts (define-key gnus-article-mode-map "i" 'jao-gnus-show-images) |