From 7e7d6ae5a2a2dc14483e6bd45c989ad334f29998 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Sat, 20 Apr 2019 02:15:14 -0400
Subject: [PATCH] Fix hydra-ivy keybind on M-o #1342

---
 modules/completion/ivy/autoload/hydras.el | 58 +++++++++--------------
 modules/completion/ivy/config.el          |  7 ++-
 2 files changed, 28 insertions(+), 37 deletions(-)

diff --git a/modules/completion/ivy/autoload/hydras.el b/modules/completion/ivy/autoload/hydras.el
index 45647536c..afe09e393 100644
--- a/modules/completion/ivy/autoload/hydras.el
+++ b/modules/completion/ivy/autoload/hydras.el
@@ -1,43 +1,31 @@
 ;;; completion/ivy/autoload/hydras.el -*- lexical-binding: t; -*-
 
-;;;###autoload (autoload '+ivy-coo-hydra/body "completion/ivy/autoload/hydras" nil t)
-(defhydra +ivy-coo-hydra (:hint nil :color pink)
-  "
+;;;###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
-  ("j" ivy-next-line)
-  ("k" ivy-previous-line)
-  ("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)
-  ("C-g" keyboard-escape-quit :exit t)
-  ("<escape>" keyboard-escape-quit :exit t)
-  ("C-o" nil)
-  ("i" nil)
-  ("TAB" ivy-alt-done :exit nil)
-  ("C-j" ivy-alt-done :exit nil)
-  ("RET" ivy-done :exit t)
-  ("C-m" ivy-done :exit t)
-  ("C-SPC" ivy-call-and-recenter :exit nil)
-  ("f" ivy-call)
-  ("c" ivy-toggle-calling)
-  ("m" ivy-toggle-fuzzy)
-  (">" ivy-minibuffer-grow)
-  ("<" ivy-minibuffer-shrink)
-  ("w" ivy-prev-action)
-  ("s" ivy-next-action)
-  ("a" ivy-read-action)
-  ("t" (setq truncate-lines (not truncate-lines)))
-  ("C" ivy-toggle-case-fold)
-  ("o" ivy-occur :exit t))
+    ;; 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)
+    ("<escape>" 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 a4decf40b..992b8aac2 100644
--- a/modules/completion/ivy/config.el
+++ b/modules/completion/ivy/config.el
@@ -77,11 +77,14 @@ immediately runs it on the current candidate (ending the ivy session)."
   (ivy-mode +1)
 
   (def-package! ivy-hydra
-    :commands (ivy-dispatching-done-hydra ivy--matcher-desc)
+    :commands (ivy-dispatching-done-hydra ivy--matcher-desc ivy-hydra/body)
     :init
     (define-key! ivy-minibuffer-map
       "C-o" #'ivy-dispatching-done-hydra
-      "M-o" #'+ivy-coo-hydra/body)))
+      "M-o" #'hydra-ivy/body)
+    :config
+    ;; ivy-hydra rebinds this, so we have to do so again
+    (define-key ivy-minibuffer-map (kbd "M-o") #'hydra-ivy/body)))
 
 
 (def-package! ivy-rich