about summary refs log tree commit diff stats
path: root/.emacs.d/lisp/init-minibuffer.el
diff options
context:
space:
mode:
Diffstat (limited to '.emacs.d/lisp/init-minibuffer.el')
-rw-r--r--.emacs.d/lisp/init-minibuffer.el22
1 files changed, 11 insertions, 11 deletions
diff --git a/.emacs.d/lisp/init-minibuffer.el b/.emacs.d/lisp/init-minibuffer.el
index c4e3245..118f730 100644
--- a/.emacs.d/lisp/init-minibuffer.el
+++ b/.emacs.d/lisp/init-minibuffer.el
@@ -82,18 +82,11 @@
              (eq 'file (vertico--metadata-get 'category)))
         (add-to-history minibuffer-history-variable (minibuffer-contents))))
 
-  ;; https://github.com/minad/vertico/wiki#customize-sorting-based-on-completion-category
-  (defun sort-directories-first (files)
-    ;; Still sort by history position, length and alphabetically
-    (setq files (vertico-sort-history-length-alpha files))
-    ;; But then move directories first
-    (nconc (seq-filter (lambda (x) (string-suffix-p "/" x)) files)
-           (seq-remove (lambda (x) (string-suffix-p "/" x)) files)))
   (defun toggle-sort-directories-first ()
     (interactive)
-    (if (eq vertico-sort-function 'sort-directories-first)
+    (if (eq vertico-sort-function 'vertico-sort-directories-first)
         (set (make-local-variable 'vertico-sort-function) 'vertico-sort-history-length-alpha)
-      (set (make-local-variable 'vertico-sort-function) 'sort-directories-first))
+      (set (make-local-variable 'vertico-sort-function) 'vertico-sort-directories-first))
     (setq vertico--input t)
     (vertico--update))
 
@@ -143,7 +136,8 @@
         '((execute-extended-command
            (+vertico-transform-functions . +vertico-highlight-enabled-mode))))
   (setq vertico-multiform-categories
-        '((file (+vertico-transform-functions . +vertico-highlight-directory))
+        '((file (+vertico-transform-functions . +vertico-highlight-directory)
+                (:keymap . vertico-directory-map))
           (imenu grid)))
   :bind (:map vertico-multiform-map
               ("M-H" . vertico-multiform-buffer-grid)))
@@ -535,8 +529,9 @@ The symbol at point is added to the future history."
 (use-package embark
   :bind
   (("C-." . embark-act)
-   ("M-." . embark-dwim)
    ([remap xref-find-definitions-current-list-function] . embark-dwim-beginning-of-list)
+   ([remap xref-find-definitions] . embark-dwim)
+   ([remap xref-find-definitions-other-window] . embark-dwim-other-window)
    ("C-c C-o" . embark-export)
    ("C-h b" . embark-bindings)
    ("C-h B" . describe-bindings)
@@ -551,6 +546,11 @@ The symbol at point is added to the future history."
   :custom
   (prefix-help-command 'embark-prefix-help-command)
   :config
+  (defun embark-dwim-other-window ()
+    "Like `embark-dwim' but switch to the other window."
+    (interactive)
+    (other-window-prefix)
+    (embark-dwim))
   (defun embark-dwim-beginning-of-list ()
     "`embark-dwim' at the beginning of the current list.
 With a prefix argument, moves up `current-prefix-arg' sexps first."