From 5197bdaa4a89b38f7a3813d870458476c3968e5c Mon Sep 17 00:00:00 2001 From: jao Date: Mon, 13 Dec 2021 03:14:33 +0000 Subject: reshufflings --- attic/misc.org | 49 ++++++++++++++++++++++++++----------------------- completion.org | 19 +++++++++---------- email.org | 26 -------------------------- eww.org | 3 +-- gnus.org | 5 ++++- init.org | 7 ++++--- notmuch.org | 25 +++++++++++++++++++++++++ 7 files changed, 69 insertions(+), 65 deletions(-) diff --git a/attic/misc.org b/attic/misc.org index b2b9e6e..931aeb4 100644 --- a/attic/misc.org +++ b/attic/misc.org @@ -826,36 +826,39 @@ ) #+end_src * vertico - #+begin_src emacs-lisp :tangle no - (use-package vertico-directory - :after vertico) - - (use-package vertico-repeat - :after vertico - :config (add-hook 'minibuffer-setup-hook #'vertico-repeat-save) - :bind (("M-R" . vertico-repeat))) - - (use-package vertico-buffer - :after vertico - :init (setq vertico-buffer-display-action - '(display-buffer-at-bottom - (window-height . ,(+ 3 vertico-count))))) - + #+begin_src emacs-lisp (use-package vertico :ensure t :init - (setq vertico-count 20 + (setq vertico-count 10 vertico-cycle t - ; vertico-group-format nil - org-refile-use-outline-path t) - :config - (setq read-extended-command-predicate - #'command-completion-default-include-p) + vertico-resize t + org-refile-use-outline-path t + resize-mini-windows nil) + + (vertico-mode) :bind (:map vertico-map (("RET" . vertico-directory-enter) ("M-" . vertico-directory-delete-word) ("" . vertico-directory-delete-char)))) - (vertico-buffer-mode -1) - (vertico-mode -1) + (use-package vertico-directory + :after vertico) + + (use-package vertico-reverse + :after vertico + :init (vertico-reverse-mode)) + + (use-package vertico-repeat + :after vertico + :config (add-hook 'minibuffer-setup-hook #'vertico-repeat-save) + :bind (("M-R" . vertico-repeat))) + + ;; (use-package vertico-buffer + ;; :after vertico + ;; :init + ;; (setq vertico-buffer-display-action + ;; '(display-buffer-at-bottom (window-height . ,(+ 3 vertico-count)))) + ;; (vertico-buffer-mode -1)) + #+end_src diff --git a/completion.org b/completion.org index 09c6d63..df8c023 100644 --- a/completion.org +++ b/completion.org @@ -4,16 +4,14 @@ * completion styles #+begin_src emacs-lisp - (use-package emacs - :init - (setq tab-always-indent 'complete - completion-category-defaults nil - completion-cycle-threshold nil - completions-detailed t - completion-show-inline-help nil - completion-ignore-case t - completion-category-overrides - '((file (styles . (partial-completion)))))) + (setq tab-always-indent 'complete + read-extended-command-predicate #'command-completion-default-include-p + completion-category-defaults nil + completion-cycle-threshold nil + completions-detailed t + completion-show-inline-help nil + completion-ignore-case t + completion-category-overrides '((file (styles . (partial-completion))))) #+end_src * imenu #+begin_src emacs-lisp @@ -112,6 +110,7 @@ mct-minimum-input 3 mct-live-update-delay 0 mct-live-completion t ;; 'visible + mct-completion-blocklist nil mct-completion-passlist '(imenu Info-goto-node Info-index diff --git a/email.org b/email.org index d4bb066..3f41902 100644 --- a/email.org +++ b/email.org @@ -361,29 +361,3 @@ (setq notmuch-address-command (if jao-notmuch-enabled-p 'internal 'as-is)) (jao-load-org "notmuch") #+end_src -* consult notmuch - #+begin_src emacs-lisp - (jao-load-path "consult-notmuch") - (require 'consult-notmuch) - (consult-customize consult-notmuch :preview-key 'any) - - (defvar jao-consult-notmuch-history nil) - - (defun jao-consult-notmuch-folder (&optional tree folder) - (interactive "P") - (let* ((root "~/var/mail/") - (folder (if folder - (file-name-as-directory folder) - (completing-read "Folder: " - jao-mailbox-folders - nil nil nil - jao-consult-notmuch-history - "."))) - (folder (replace-regexp-in-string "/\\(.\\)" ".\\1" folder)) - (init (read-string "Initial query: ")) - (init (format "folder:/%s/ %s" folder init))) - (if tree (consult-notmuch-tree init) (consult-notmuch init)))) - - (with-eval-after-load "notmuch-hello" - (define-key notmuch-hello-mode-map "f" #'jao-consult-notmuch-folder)) - #+end_src diff --git a/eww.org b/eww.org index 998fba4..5823a65 100644 --- a/eww.org +++ b/eww.org @@ -139,8 +139,7 @@ :bind (:map eww-mode-map (("b" . eww-back-url) ("B" . eww-forward-url) - ("d" . eww-download) - ("D" . jao-download) + ("d" . jao-download) ("f" . link-hint-open-link) ("F" . embark-on-link) ("L" . eww-forward-url) diff --git a/gnus.org b/gnus.org index 694523f..a422024 100644 --- a/gnus.org +++ b/gnus.org @@ -448,6 +448,7 @@ (expiry-wait . 1) (expiry-target . delete)) ("nnml:jao\\..*" + (posting-style ("Bcc" "proton@jao.io")) (jao-gnus--trash-group "nnml:trash") (jao-gnus--spam-group "nnml:spam") (jao-gnus--archiving-group "nnml:jao.trove")) @@ -576,7 +577,8 @@ (defconst jao-gnus--news-rx (regexp-opt '("ElDiaro.es " "ElDiario.es - ElDiario.es: " - "The Guardian: "))) + "The Guardian: " + "Aeon | a world of ideas: "))) (defun gnus-user-format-function-f (headers) (let* ((from (gnus-header-from headers)) @@ -697,6 +699,7 @@ (setq gnus-treat-fill-long-lines 'head) (setq gnus-treat-fill-article nil) (setq gnus-treat-fold-headers nil) + (setq gnus-treat-strip-leading-blank-lines t) (setq gnus-article-auto-eval-lisp-snippets nil) (setq gnus-posting-styles '((".*" (name "Jose A. Ortega Ruiz")))) (setq gnus-single-article-buffer nil) diff --git a/init.org b/init.org index 7fa443a..488c0bd 100644 --- a/init.org +++ b/init.org @@ -2775,9 +2775,10 @@ slack-message-tracking-faces '(warning) slack-log-level 'warn slack-message-custom-notifier (lambda (msg room team) room)) - :bind (:map slack-mode-map - (("@" . slack-message-embed-mention) - ("#" . slack-message-embed-channel))) + :bind (:map slack-mode-map (("@" . slack-message-embed-mention) + ("#" . slack-message-embed-channel)) + :map slack-message-buffer-mode-map + (("C-c C-e" . slack-message-edit))) :config (dolist (f (list slack-file-dir slack-image-file-directory)) (when (not (file-exists-p f)) (make-directory f))) diff --git a/notmuch.org b/notmuch.org index 9094c32..81b2270 100644 --- a/notmuch.org +++ b/notmuch.org @@ -504,3 +504,28 @@ (org-capture nil "X")))) #+end_src +* consult + #+begin_src emacs-lisp + (jao-load-path "consult-notmuch") + (require 'consult-notmuch) + (consult-customize consult-notmuch :preview-key 'any) + + (defvar jao-consult-notmuch-history nil) + + (defun jao-consult-notmuch-folder (&optional tree folder) + (interactive "P") + (let ((folder (if folder + (file-name-as-directory folder) + (completing-read "Group: " + jao-mailbox-folders + nil nil nil + jao-consult-notmuch-history + "."))) + (folder (replace-regexp-in-string "/\\(.\\)" ".\\1" folder)) + (init (read-string "Initial query: ")) + (init (format "folder:/%s/ %s" folder init))) + (if tree (consult-notmuch-tree init) (consult-notmuch init)))) + + (with-eval-after-load "notmuch-hello" + (define-key notmuch-hello-mode-map "f" #'jao-consult-notmuch-folder)) + #+end_src -- cgit v1.2.3