From bff2ccd974dc5f66e3796033b6cd853e785055ee Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Mon, 21 Apr 2025 18:34:45 -0400 Subject: [PATCH] refactor: remove vestigial hydra configs Hydra support was removed in b08c2c7. Amend: bc948c38c215 Amend: b08c2c745fd2 --- .github/CODEOWNERS | 1 - modules/completion/ivy/autoload/hydras.el | 32 ----------------------- modules/completion/ivy/config.el | 10 +------ modules/completion/ivy/packages.el | 1 - modules/config/default/+emacs-bindings.el | 5 ---- 5 files changed, 1 insertion(+), 48 deletions(-) delete mode 100644 modules/completion/ivy/autoload/hydras.el diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 371335ca6..611a931b6 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -144,7 +144,6 @@ modules/ui/doom-dashboard @doomemacs/ui-doom-dashboard modules/ui/doom-quit @doomemacs/ui-doom-quit modules/ui/emoji @doomemacs/ui-emoji modules/ui/hl-todo @doomemacs/ui-hl-todo -modules/ui/hydra @doomemacs/ui-hydra modules/ui/indent-guides @doomemacs/ui-indent-guides modules/ui/ligatures @doomemacs/ui-ligatures modules/ui/minimap @doomemacs/ui-minimap diff --git a/modules/completion/ivy/autoload/hydras.el b/modules/completion/ivy/autoload/hydras.el deleted file mode 100644 index 368640753..000000000 --- a/modules/completion/ivy/autoload/hydras.el +++ /dev/null @@ -1,32 +0,0 @@ -;;; completion/ivy/autoload/hydras.el -*- lexical-binding: t; -*- -;;;###if (modulep! :ui hydra) - -;;;###autoload -(after! ivy-hydra - (defhydra+ hydra-ivy (:hint nil :color pink) - " - Move ^^^^^^^^^^ | Call ^^^^ | Cancel^^ | Options^^ | Action _w_/_s_/_a_: %s(ivy-action-name) -----------^^^^^^^^^^-+--------------^^^^-+-------^^-+--------^^-+--------------------------------- - _g_ ^ ^ _k_ ^ ^ _u_ | _f_orward _o_ccur | _i_nsert | _c_alling: %-7s(if ivy-calling \"on\" \"off\") _C_ase-fold: %-10`ivy-case-fold-search - ^↨^ _h_ ^+^ _l_ ^↕^ | _RET_ done ^^ | _q_uit | _m_atcher: %-7s(ivy--matcher-desc) _t_runcate: %-11`truncate-lines - _G_ ^ ^ _j_ ^ ^ _d_ | _TAB_ alt-done ^^ | ^ ^ | _<_/_>_: shrink/grow -" - ;; arrows - ("l" ivy-alt-done) - ("h" ivy-backward-delete-char) - ("g" ivy-beginning-of-buffer) - ("G" ivy-end-of-buffer) - ("d" ivy-scroll-up-command) - ("u" ivy-scroll-down-command) - ("e" ivy-scroll-down-command) - ;; actions - ("q" keyboard-escape-quit :exit t) - ("" keyboard-escape-quit :exit t) - ("TAB" ivy-alt-done :exit nil) - ("RET" ivy-done :exit t) - ("C-SPC" ivy-call-and-recenter :exit nil) - ("f" ivy-call) - ("c" ivy-toggle-calling) - ("m" ivy-toggle-fuzzy) - ("t" (setq truncate-lines (not truncate-lines))) - ("o" ivy-occur :exit t))) diff --git a/modules/completion/ivy/config.el b/modules/completion/ivy/config.el index bef0746f6..8bf89e6ca 100644 --- a/modules/completion/ivy/config.el +++ b/modules/completion/ivy/config.el @@ -62,7 +62,6 @@ results buffer.") (setq ivy-height 17 ivy-wrap t ivy-fixed-height-minibuffer t - ivy-read-action-function #'ivy-hydra-read-action ivy-read-action-format-function #'ivy-read-action-format-columns ;; don't show recent files in switch-buffer ivy-use-virtual-buffers nil @@ -98,17 +97,10 @@ results buffer.") (after! yasnippet (add-hook 'yas-prompt-functions #'+ivy-yas-prompt-fn)) - (after! ivy-hydra - ;; Ensure `ivy-dispatching-done' and `hydra-ivy/body' hydras can be - ;; exited / toggled by the same key binding they were opened - (add-to-list 'ivy-dispatching-done-hydra-exit-keys '("C-o" nil)) - (defhydra+ hydra-ivy () ("M-o" nil))) - (define-key! ivy-minibuffer-map [remap doom/delete-backward-word] #'ivy-backward-kill-word "C-c C-e" #'+ivy/woccur - "C-o" #'ivy-dispatching-done - "M-o" #'hydra-ivy/body)) + "C-o" #'ivy-dispatching-done)) (use-package! ivy-rich diff --git a/modules/completion/ivy/packages.el b/modules/completion/ivy/packages.el index a025057c7..4b3f3aaf4 100644 --- a/modules/completion/ivy/packages.el +++ b/modules/completion/ivy/packages.el @@ -3,7 +3,6 @@ (package! swiper :pin "e33b028ed4b1258a211c87fd5fe801bed25de429") (package! ivy) -(package! ivy-hydra) (package! ivy-avy) (package! counsel) diff --git a/modules/config/default/+emacs-bindings.el b/modules/config/default/+emacs-bindings.el index bb2aa9009..1f670bdaf 100644 --- a/modules/config/default/+emacs-bindings.el +++ b/modules/config/default/+emacs-bindings.el @@ -534,11 +534,6 @@ "C-p" #'company-search-repeat-backward "C-s" (cmd! (company-search-abort) (company-filter-candidates)))) - ;;; ein notebooks - (:after ein:notebook-multilang - :map ein:notebook-multilang-mode-map - "C-c h" #'+ein/hydra/body) - ;;; expand-region "C-=" #'er/expand-region