refactor: minor refactoring

abougouffa · Jul 12, 2023 · 90defba · 90defba
1 parent f3aeaa2
commit 90defba
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 20 deletions.
diff --git a/core/me-builtin.el b/core/me-builtin.el
@@ -139,7 +139,6 @@
   :config
   (+map-local! :keymaps 'flymake-mode-map
     "f"  '(nil :wk "flymake")
-    "ff" #'+flymake-main/body
     "fn" #'flymake-goto-next-error
     "fN" #'flymake-goto-prev-error
     "fs" #'flymake-start
@@ -189,23 +188,7 @@
      #b00001111000
      #b00000111100
      #b00000011110]
-    nil 13)
-
-  (defhydra +flymake-main (:color red :hint nil :foreign-keys warn)
-    "
-[Flymake]                                              [_q_] quit
-  ├──────────────────────────────────────────────────────────────────────╮
-  │  [_B_] Buffer diagnostics  [_P_] Project diagnostics  [_L_] Log buffer     │
-  │  [_n_] Next error          [_N_] Prev error           [_S_] Start          │
-  ╰──────────────────────────────────────────────────────────────────────╯
-"
-    ("B" flymake-show-buffer-diagnostics)
-    ("P" flymake-show-project-diagnostics)
-    ("L" flymake-switch-to-log-buffer)
-    ("n" flymake-goto-next-error)
-    ("N" flymake-goto-prev-error)
-    ("S" flymake-start)
-    ("q" nil :color blue)))
+    nil 13))
 
 (use-package xt-mouse
   :straight (:type built-in)

diff --git a/core/me-keybindings.el b/core/me-keybindings.el
@@ -216,7 +216,28 @@
   (provide 'me-general-ready))
 
 (use-package hydra
-  :straight t)
+  :straight t
+  :config
+  ;; Make hydra bindings for `flymake'
+  (with-eval-after-load 'flymake
+    (defhydra +flymake-main (:color red :hint nil :foreign-keys warn)
+      "
+[Flymake]                                              [_q_] quit
+  ├──────────────────────────────────────────────────────────────────────╮
+  │  [_B_] Buffer diagnostics  [_P_] Project diagnostics  [_L_] Log buffer     │
+  │  [_n_] Next error          [_N_] Prev error           [_S_] Start          │
+  ╰──────────────────────────────────────────────────────────────────────╯
+"
+      ("B" flymake-show-buffer-diagnostics)
+      ("P" flymake-show-project-diagnostics)
+      ("L" flymake-switch-to-log-buffer)
+      ("n" flymake-goto-next-error)
+      ("N" flymake-goto-prev-error)
+      ("S" flymake-start)
+      ("q" nil :color blue))
+
+    (+map-local! :keymaps 'flymake-mode-map
+      "ff" #'+flymake-main/body)))
 
 
 (provide 'me-keybindings)

diff --git a/core/me-meow.el b/core/me-meow.el
@@ -9,7 +9,8 @@
 ;;; Code:
 
 (when (memq 'me-evil minemacs-core-modules)
-  (user-error "The `me-meow' module is incompatible with `me-evil'."))
+  (message "[Warning] The `me-meow' module is incompatible with `me-evil'.")
+  (push 'meow minemacs-disabled-packages))
 
 (use-package meow
   :straight t