mirror of
https://codeberg.org/scip/dot-emacs.git
synced 2026-08-24 05:34:18 +02:00
re-enable embark, tune a little
This commit is contained in:
@@ -37,7 +37,7 @@ via [[http://whattheemacsd.com/setup-ido.el-02.html][whattheemacs.d]]"
|
|||||||
(insert "~/"))
|
(insert "~/"))
|
||||||
(call-interactively 'self-insert-command)))
|
(call-interactively 'self-insert-command)))
|
||||||
|
|
||||||
(defun tvd-vertico-jump-root()
|
(defun tvd-vertico-jump-root()
|
||||||
"quickly go to root dir with / in minibuffer find-file, if we are in a local fs"
|
"quickly go to root dir with / in minibuffer find-file, if we are in a local fs"
|
||||||
(interactive)
|
(interactive)
|
||||||
(if (file-directory-p (file-name-directory (minibuffer-contents-no-properties)))
|
(if (file-directory-p (file-name-directory (minibuffer-contents-no-properties)))
|
||||||
@@ -104,8 +104,6 @@ a remote file anytime and from everywhere I am by just entering :"
|
|||||||
("TAB" . #'minibuffer-complete)))
|
("TAB" . #'minibuffer-complete)))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
(use-package orderless
|
(use-package orderless
|
||||||
:init
|
:init
|
||||||
;; I am using the actual orderless completion style as a last
|
;; I am using the actual orderless completion style as a last
|
||||||
@@ -132,9 +130,7 @@ a remote file anytime and from everywhere I am by just entering :"
|
|||||||
completion-ignore-case t))
|
completion-ignore-case t))
|
||||||
|
|
||||||
|
|
||||||
|
(use-package embark
|
||||||
(when nil
|
|
||||||
(use-package embark
|
|
||||||
:ensure t
|
:ensure t
|
||||||
|
|
||||||
:bind
|
:bind
|
||||||
@@ -143,7 +139,6 @@ a remote file anytime and from everywhere I am by just entering :"
|
|||||||
|
|
||||||
|
|
||||||
:init
|
:init
|
||||||
|
|
||||||
;; Optionally replace the key help with a completing-read interface
|
;; Optionally replace the key help with a completing-read interface
|
||||||
(setq prefix-help-command #'embark-prefix-help-command)
|
(setq prefix-help-command #'embark-prefix-help-command)
|
||||||
|
|
||||||
@@ -153,14 +148,51 @@ a remote file anytime and from everywhere I am by just entering :"
|
|||||||
;; (setq eldoc-documentation-strategy #'eldoc-documentation-compose-eagerly)
|
;; (setq eldoc-documentation-strategy #'eldoc-documentation-compose-eagerly)
|
||||||
|
|
||||||
:config
|
:config
|
||||||
|
|
||||||
;; Hide the mode line of the Embark live/completions buffers
|
;; Hide the mode line of the Embark live/completions buffers
|
||||||
(add-to-list 'display-buffer-alist
|
(add-to-list 'display-buffer-alist
|
||||||
'("\\`\\*Embark Collect \\(Live\\|Completions\\)\\*"
|
'("\\`\\*Embark Collect \\(Live\\|Completions\\)\\*"
|
||||||
nil
|
nil
|
||||||
(window-parameters (mode-line-format . none))))))
|
(window-parameters (mode-line-format . none))))
|
||||||
|
|
||||||
|
|
||||||
|
(defun embark-which-key-indicator ()
|
||||||
|
"An embark indicator that displays keymaps using which-key.
|
||||||
|
The which-key help message will show the type and value of the
|
||||||
|
current target followed by an ellipsis if there are further
|
||||||
|
targets."
|
||||||
|
(lambda (&optional keymap targets prefix)
|
||||||
|
(if (null keymap)
|
||||||
|
(which-key--hide-popup-ignore-command)
|
||||||
|
(which-key--show-keymap
|
||||||
|
(if (eq (plist-get (car targets) :type) 'embark-become)
|
||||||
|
"Become"
|
||||||
|
(format "Act on %s '%s'%s"
|
||||||
|
(plist-get (car targets) :type)
|
||||||
|
(embark--truncate-target (plist-get (car targets) :target))
|
||||||
|
(if (cdr targets) "…" "")))
|
||||||
|
(if prefix
|
||||||
|
(pcase (lookup-key keymap prefix 'accept-default)
|
||||||
|
((and (pred keymapp) km) km)
|
||||||
|
(_ (key-binding prefix 'accept-default)))
|
||||||
|
keymap)
|
||||||
|
nil nil t (lambda (binding)
|
||||||
|
(not (string-suffix-p "-argument" (cdr binding))))))))
|
||||||
|
|
||||||
|
(setq embark-indicators
|
||||||
|
'(embark-which-key-indicator
|
||||||
|
embark-highlight-indicator
|
||||||
|
embark-isearch-highlight-indicator))
|
||||||
|
|
||||||
|
(defun embark-hide-which-key-indicator (fn &rest args)
|
||||||
|
"Hide the which-key indicator immediately when using the completing-read prompter."
|
||||||
|
(which-key--hide-popup-ignore-command)
|
||||||
|
(let ((embark-indicators
|
||||||
|
(remq #'embark-which-key-indicator embark-indicators)))
|
||||||
|
(apply fn args)))
|
||||||
|
|
||||||
|
(advice-add #'embark-completing-read-prompter
|
||||||
|
:around #'embark-hide-which-key-indicator))
|
||||||
|
|
||||||
(use-package consult
|
(use-package consult
|
||||||
;; Replace bindings. Lazily loaded due by `use-package'.
|
;; Replace bindings. Lazily loaded due by `use-package'.
|
||||||
:bind (;; C-c bindings in `mode-specific-map'
|
:bind (;; C-c bindings in `mode-specific-map'
|
||||||
@@ -210,12 +242,9 @@ a remote file anytime and from everywhere I am by just entering :"
|
|||||||
("C-x C-d" . consult-dir)))
|
("C-x C-d" . consult-dir)))
|
||||||
|
|
||||||
|
|
||||||
|
(use-package
|
||||||
(when nil
|
|
||||||
(use-package
|
|
||||||
embark-consult
|
embark-consult
|
||||||
:after (embark consult)))
|
:after (embark consult))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
;; Persist history over Emacs restarts. Vertico sorts by history position.
|
;; Persist history over Emacs restarts. Vertico sorts by history position.
|
||||||
@@ -253,6 +282,5 @@ a remote file anytime and from everywhere I am by just entering :"
|
|||||||
(global-set-key "\C-s" 'swiper))
|
(global-set-key "\C-s" 'swiper))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
(provide 'init-smarter-than-emacs)
|
(provide 'init-smarter-than-emacs)
|
||||||
;;; init-smarter-than-emacs ends here
|
;;; init-smarter-than-emacs ends here
|
||||||
|
|||||||
Reference in New Issue
Block a user