diff options
| -rw-r--r-- | completion.org | 124 | ||||
| -rw-r--r-- | lib/eos/jao-mode-line.el | 2 |
2 files changed, 62 insertions, 64 deletions
diff --git a/completion.org b/completion.org index 439ff47..42d3d5b 100644 --- a/completion.org +++ b/completion.org @@ -98,7 +98,6 @@ #+end_src * mct #+begin_src emacs-lisp - ;; (jao-load-path "mct") (use-package mct :ensure t :init @@ -121,7 +120,6 @@ vc-retrieve-tag))) (mct-minibuffer-mode 1) - ;; (mct-region-mode 1) #+end_src * marginalia @@ -262,67 +260,6 @@ (("C-x C-d" . consult-dir) ("C-x C-j" . consult-dir-jump-file)))) #+end_src -*** recoll - #+begin_src emacs-lisp - (jao-load-path "consult-recoll") - - (defun jao-recoll-format (title url mtype) - (let* ((u (replace-regexp-in-string "/home/jao/" "" url)) - (u (replace-regexp-in-string - "\\(doc\\|org/doc\\|.emacs.d/gnus/Mail\\)/" "" u))) - (format "%s (%s, %s)" - title - (propertize u 'face 'jao-themes-f00) - (propertize mtype 'face 'jao-themes-f01)))) - - (defun jao-recoll-open-html (file) - (jao-afio--goto-www) - (eww-open-file file)) - - (defun jao-recoll-consult-messages () - (interactive) - (consult-recoll "mime:message ")) - - (defun jao-recoll-consult-docs () - (interactive) - (consult-recoll (format "dir:%s/doc " jao-org-dir))) - - (defun jao-recoll-messages () - (interactive) - (jao-recoll "mime:message ")) - - (defun jao-recoll-docs () - (interactive) - (jao-recoll (format "dir:%s/doc " jao-org-dir))) - - (defun jao-recoll-notes () - "Use consult-recoll to search notes." - (interactive) - (jao-recoll (format "dir:%s " jao-org-notes-dir))) - - (use-package consult-recoll - :init (setq consult-recoll-open-fns - '(("application/pdf" . jao-open-doc) - ("message/rfc822" . jao-org-links-open-mail) - ("text/html" . jao-recoll-open-html)) - consult-recoll-search-flags nil - consult-recoll-format-candidate #'jao-recoll-format) - :config - (transient-define-prefix jao-recoll-transient () - [["Consult recoll queries" - ("r" "consult recoll query" consult-recoll) - ("n" "consult recoll on notes" jao-org-notes-consult-recoll) - ("d" "consult recoll on docs" jao-recoll-consult-docs) - ("m" "consult recoll on messages" jao-recoll-consult-messages)] - ["Recoll queries" - ("R" "recoll query" jao-recoll) - ("N" "recoll on notes" jao-recoll-notes) - ("D" "consult recoll on docs" jao-recoll-docs) - ("M" "consult recoll on messages" jao-recoll-messages)]]) - - :bind (("s-r" . #'jao-recoll-transient))) - - #+end_src *** dh-diff hunks #+begin_src emacs-lisp (defun jao-consult--diff-lines (&optional backward) @@ -632,3 +569,64 @@ ("C-x C-l" . recenter-top-bottom))) #+end_src +* recoll + #+begin_src emacs-lisp + (jao-load-path "consult-recoll") + + (defun jao-recoll-format (title url mtype) + (let* ((u (replace-regexp-in-string "/home/jao/" "" url)) + (u (replace-regexp-in-string + "\\(doc\\|org/doc\\|.emacs.d/gnus/Mail\\)/" "" u))) + (format "%s (%s, %s)" + title + (propertize u 'face 'jao-themes-f00) + (propertize mtype 'face 'jao-themes-f01)))) + + (defun jao-recoll-open-html (file) + (jao-afio--goto-www) + (eww-open-file file)) + + (defun jao-recoll-consult-messages () + (interactive) + (consult-recoll "mime:message ")) + + (defun jao-recoll-consult-docs () + (interactive) + (consult-recoll (format "dir:%s/doc " jao-org-dir))) + + (defun jao-recoll-messages () + (interactive) + (jao-recoll "mime:message ")) + + (defun jao-recoll-docs () + (interactive) + (jao-recoll (format "dir:%s/doc " jao-org-dir))) + + (defun jao-recoll-notes () + "Use consult-recoll to search notes." + (interactive) + (jao-recoll (format "dir:%s " jao-org-notes-dir))) + + (use-package consult-recoll + :init (setq consult-recoll-open-fns + '(("application/pdf" . jao-open-doc) + ("message/rfc822" . jao-org-links-open-mail) + ("text/html" . jao-recoll-open-html)) + consult-recoll-search-flags nil + consult-recoll-format-candidate #'jao-recoll-format) + :config + (transient-define-prefix jao-recoll-transient () + [["Consult recoll queries" + ("r" "consult recoll query" consult-recoll) + ("n" "consult recoll on notes" jao-org-notes-consult-recoll) + ("d" "consult recoll on docs" jao-recoll-consult-docs) + ("m" "consult recoll on messages" jao-recoll-consult-messages)] + ["Recoll queries" + ("R" "recoll query" jao-recoll) + ("N" "recoll on notes" jao-recoll-notes) + ("D" "consult recoll on docs" jao-recoll-docs) + ("M" "consult recoll on messages" jao-recoll-messages)]]) + + :bind (("s-r" . #'jao-recoll-transient))) + + #+end_src diff --git a/lib/eos/jao-mode-line.el b/lib/eos/jao-mode-line.el index 4ed7033..968ac35 100644 --- a/lib/eos/jao-mode-line.el +++ b/lib/eos/jao-mode-line.el @@ -126,7 +126,7 @@ :extend t) (set-face-attribute 'mode-line-inactive nil :box nil :height 1 :background bg :foreground bg - :overline bg + ;; :overline bg :underline jao-minibuffer-inactive-buffer-line-color :extend t))) |