updating config and corfu module

modules/editor/meow/config.el

@@ -56,116 +56,6 @@
    "'" #'repeat
    "<escape>" #'corfu-quit))
 
-;; Colemak
-(defun meow/setup-colemak ()
-  (setq meow-cheatsheet-layout meow-cheatsheet-layout-colemak)
-  (meow/setup)
-  (when (modulep! +override)
-   (meow-motion-overwrite-define-key
-    ;; Use e to move up, n to move down.
-    ;; Since special modes usually use n to move down, we only overwrite e here.
-    '("e" . meow-prev))
-   (when (modulep! :editor meow +leader)
-         (meow-motion-overwrite-define-key '("\\ e" . "H-e")))
-   (meow-leader-define-key '("e" . "H-e")))
-  (map! :map meow-normal-state-keymap
-   "[" #'meow-beginning-of-thing
-     "]" #'meow-end-of-thing
-   "/" #'meow-visit
-   "a" #'meow-append
-   "A" #'meow-open-below
-   "b" #'meow-back-word
-   "B" #'meow-back-symbol
-   "c" #'meow-change
-   "d" #'meow-delete
-   "e" #'meow-prev
-   "E" #'meow-prev-expand
-   "f" #'meow-find
-   "g" #'meow-cancel-selection
-   "G" #'meow-grab
-   "h" #'meow-left
-   "H" #'meow-left-expand
-   "i" #'meow-right
-   "I" #'meow-right-expand
-   "j" #'meow-join
-   "k" #'meow-kill
-   "l" #'meow-line
-   "L" #'meow-goto-line
-   "m" #'meow-mark-word
-   "M" #'meow-mark-symbol
-   "n" #'meow-next
-   "N" #'meow-next-expand
-   "o" #'meow-block
-   "O" #'meow-to-block
-   "p" #'meow-yank
-   "q" #'meow-quit
-   "r" #'meow-replace
-   "s" #'meow-insert
-   "S" #'meow-open-above
-   "t" #'meow-till
-   "u" #'meow-undo
-   "U" #'meow-undo-in-selection
-   "v" #'meow-search
-   "w" #'meow-next-word
-   "W" #'meow-next-symbol
-   "x" #'meow-delete
-   "X" #'meow-backward-delete
-   "y" #'meow-save
-   "z" #'meow-pop-selection))
-
-;; Dvorak
-(defun meow/setup-dvorak ()
-  (setq meow-cheatsheet-layout meow-cheatsheet-layout-dvorak)
-  (when (modulep! +override)
-   (meow-motion-overwrite-define-key)) ; custom keybinding for motion state
-  (meow/setup)
-  (map! :map meow-normal-state-keymap
-   "<" #'meow-beginning-of-thing
-   ">" #'meow-end-of-thing
-   "a" #'meow-append
-   "A" #'meow-open-below
-   "b" #'meow-back-word
-   "B" #'meow-back-symbol
-   "c" #'meow-change
-   "d" #'meow-delete
-   "D" #'meow-backward-delete
-   "e" #'meow-line
-   "E" #'meow-goto-line
-   "f" #'meow-find
-   "g" #'meow-cancel-selection
-   "G" #'meow-grab
-   "h" #'meow-left
-   "H" #'meow-left-expand
-   "I" #'meow-open-above
-   "i" #'meow-insert
-   "j" #'meow-join
-   "k" #'meow-kill
-   "l" #'meow-till
-   "m" #'meow-mark-word
-   "M" #'meow-mark-symbol
-   "n" #'meow-next
-   "N" #'meow-next-expand
-   "o" #'meow-block
-   "O" #'meow-to-block
-   "p" #'meow-prev
-   "P" #'meow-prev-expand
-   "q" #'meow-quit
-   "Q" #'meow-goto-line
-   "r" #'meow-replace
-   "R" #'meow-swap-grab
-   "s" #'meow-search
-   "t" #'meow-right
-   "T" #'meow-right-expand
-   "u" #'meow-undo
-   "U" #'meow-undo-in-selection
-   "v" #'meow-visit
-   "w" #'meow-next-word
-   "W" #'meow-next-symbol
-   "x" #'meow-save
-   "X" #'meow-sync-grab
-   "y" #'meow-yank
-   "z" #'meow-pop-selection))
-
 ;; Qwerty
 (defun meow/setup-qwerty ()
   (setq meow-cheatsheet-layout meow-cheatsheet-layout-qwerty)
@@ -229,93 +119,11 @@
    "Y" #'meow-sync-grab
    "z" #'meow-pop-selection))
 
-;; Programmer Dvorak
-(defun meow/setup-dvp ()
-  (setq meow-cheatsheet-layout meow-cheatsheet-layout-dvp)
-  (when (modulep! +override)
-    (meow-motion-overwrite-define-key)) ; custom keybinding for motion state
-  (map! :map meow-normal-state-keymap
-   "?" #'meow-cheatsheet
-   "*" #'meow-expand-0
-   "=" #'meow-expand-9
-   "!" #'meow-expand-8
-   "[" #'meow-expand-7
-     "]" #'meow-expand-6
-   "{" #'meow-expand-5
-     "+" #'meow-expand-4
-     "}" #'meow-expand-3
-   ")" #'meow-expand-2
-  "(" #'meow-expand-1
-    "1" #'digit-argument
-    "2" #'digit-argument
-    "3" #'digit-argument
-    "4" #'digit-argument
-    "5" #'digit-argument
-    "6" #'digit-argument
-    "7" #'digit-argument
-    "8" #'digit-argument
-    "9" #'digit-argument
-    "0" #'digit-argument
-    "-" #'negative-argument
-    ";" #'meow-reverse
-    "," #'meow-inner-of-thing
-    "." #'meow-bounds-of-thing
-    "<" #'meow-beginning-of-thing
-    ">" #'meow-end-of-thing
-    "a" #'meow-append
-    "A" #'meow-open-below
-    "b" #'meow-back-word
-    "B" #'meow-back-symbol
-    "c" #'meow-change
-    "d" #'meow-delete
-    "D" #'meow-backward-delete
-    "e" #'meow-line
-    "E" #'meow-goto-line
-    "f" #'meow-find
-    "g" #'meow-cancel-selection
-    "G" #'meow-grab
-    "h" #'meow-left
-    "H" #'meow-left-expand
-    "i" #'meow-insert
-    "I" #'meow-open-above
-    "j" #'meow-join
-    "k" #'meow-kill
-    "l" #'meow-till
-    "m" #'meow-mark-word
-    "M" #'meow-mark-symbol
-    "n" #'meow-next
-    "N" #'meow-next-expand
-    "o" #'meow-block
-    "O" #'meow-to-block
-    "p" #'meow-prev
-    "P" #'meow-prev-expand
-    "q" #'meow-quit
-    "r" #'meow-replace
-    "R" #'meow-swap-grab
-    "s" #'meow-search
-    "t" #'meow-right
-    "T" #'meow-right-expand
-    "u" #'meow-undo
-    "U" #'meow-undo-in-selection
-    "v" #'meow-visit
-    "w" #'meow-next-word
-    "W" #'meow-next-symbol
-    "x" #'meow-save
-    "X" #'meow-sync-grab
-    "y" #'meow-yank
-    "z" #'meow-pop-selection
-    "'" #'repeat
-    "<escape>" #'ignore))
-
 (use-package! meow
   :hook (doom-after-modules-config . meow-global-mode)
   :demand t
   :config
-  (cond
-   ((modulep! +colemak) (meow/setup-colemak))
-   ((modulep! +dvorak) (meow/setup-dvorak))
-   ((modulep! +qwerty) (meow/setup-qwerty))
-   ((modulep! +dvp) (meow/setup-dvp)))
+  (meow/setup-qwerty)
   (cond
    ((modulep! +leader)
     (map! :map meow-normal-state-keymap
@@ -328,4 +136,5 @@
    (t (meow/setup-keypad)))
   (pushnew! meow-mode-state-list '(sly-db-mode . motion))
   (pushnew! meow-mode-state-list '(sly-inspector-mode . motion))
-  (map! :map meow-keymap [remap describe-key] #'helpful-key))
+  (pushnew! meow-mode-state-list '(Custom-mode . normal))
+  (map! :map meow-keymap [remap describe-key] #'helpfl-key))