Add multiple-cursors, expand-region

Equivalent code exists in upstream Meow now.

init.el

@@ -48,147 +48,87 @@
 (use-package undo-fu
   :demand t
   :config
-  (global-unset-key (kbd "C-z"))
+  (global-unset-key (kbd "C-/"))
-  (global-set-key (kbd "C-z") #'undo-fu-only-undo)
+  (global-unset-key (kbd "C-?"))
-  (global-set-key (kbd "C-S-z") #'undo-fu-only-redo))
+  (global-set-key (kbd "C-/") #'undo-fu-only-undo)
+  (global-set-key (kbd "C-?") #'undo-fu-only-redo))
 
-(cl-defun my-meow-undo (arg)
+(use-package god-mode
-  "Uses undo-fu to undo, but cancels region first unless negative prefix."
-  (interactive "*p")
-  (let ((undo-fu-allow-undo-in-region t))
-    (pcase (cons (< arg 0) (region-active-p))
-      ('(t . t) (setq arg (abs arg)))
-      ('(t . nil) (cl-return-from my-meow-undo))
-      ('(nil . t) (setq undo-fu-allow-undo-in-region nil)))
-    (undo-fu-only-undo arg)))
-(defun my-meow-forward-paragraph ()
-  (interactive)
-  (meow--execute-kbd-macro "M-}"))
-(defun my-meow-backward-paragraph ()
-  (interactive)
-  (meow--execute-kbd-macro "M-{"))
-
-(use-package meow
   :demand t
   :bind
+  ("<escape>" . god-mode-all)
   ("C-S-h" . help-command)
-  ("C-h" . (lambda () (interactive) (meow--execute-kbd-macro "DEL")))
+  ("C-h" . my--god-del)
+  (:map god-local-mode-map
+        ("i" . god-mode-all)
+        ("<escape>" . my--god-c-g)
+        ("z" . repeat)
+        ("q" . my--god-c-q))
+  (:map minibuffer-local-map
+        ("<escape>" . abort-minibuffers))
+  :custom
+  (god-exempt-major-modes nil)
+  (god-exempt-predicates (list #'god-exempt-mode-p))
+  (god-mode-enable-function-key-translations nil)
   :config
-  (setq meow-cheatsheet-layout meow-cheatsheet-layout-qwerty)
+  (defun my--god-c-q ()
-  (meow-motion-overwrite-define-key '("j" . meow-next)
+    (interactive)
-                                    '("k" . meow-prev)
+    (let ((god-local-mode nil))
-                                    '("<escape>" . ignore))
+      (if-let* ((buffer-read-only)
-  (meow-leader-define-key '("j" . "H-j")
+                (ret (key-binding (read-kbd-macro "q")))
-                          '("k" . "H-k")
+                ((not (or (eq ret #'self-insert-command) (and (boundp lispy-mode) lispy-mode)))))
-                          '("1" . meow-digit-argument)
+          (call-interactively ret)
-                          '("2" . meow-digit-argument)
+        (switch-to-prev-buffer))))
-                          '("3" . meow-digit-argument)
+  (cl-macrolet ((define-kmacro-wrapper (name key)
-                          '("4" . meow-digit-argument)
+                  `(defun ,name ()
-                          '("5" . meow-digit-argument)
+                     (interactive)
-                          '("6" . meow-digit-argument)
+                     (call-interactively (key-binding (read-kbd-macro ,key))))))
-                          '("7" . meow-digit-argument)
+    (define-kmacro-wrapper my--god-del "DEL")
-                          '("8" . meow-digit-argument)
+    (define-kmacro-wrapper my--god-c-g "C-g"))
-                          '("9" . meow-digit-argument)
-                          '("0" . meow-digit-argument)
-                          '("/" . meow-keypad-describe-key)
-                          '("?" . meow-cheatsheet)
-                          '("(" . insert-pair)
-                          '("[" . insert-pair)
-                          '("{" . insert-pair)
-                          '("<" . insert-pair)
-                          '("yy" . meow-clipboard-save)
-                          '("ys" . meow-clipboard-kill)
-                          '("yp" . meow-clipboard-yank))
-  (meow-normal-define-key '("0" . meow-expand-0)
-                          '("9" . meow-expand-9)
-                          '("8" . meow-expand-8)
-                          '("7" . meow-expand-7)
-                          '("6" . meow-expand-6)
-                          '("5" . meow-expand-5)
-                          '("4" . meow-expand-4)
-                          '("3" . meow-expand-3)
-                          '("2" . meow-expand-2)
-                          '("1" . meow-expand-1)
-                          '("-" . 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-next-word)
-                          '("E" . meow-next-symbol)
-                          '("f" . meow-find)
-                          '("F" . meow-find-expand)
-                          '("g" . meow-cancel-selection)
-                          '("G" . meow-grab)
-                          '("h" . meow-left)
-                          '("H" . meow-left-expand)
-                          '("i" . meow-insert)
-                          '("I" . meow-open-above)
-                          '("j" . meow-next)
-                          '("J" . meow-next-expand)
-                          '("k" . meow-prev)
-                          '("K" . meow-prev-expand)
-                          '("l" . meow-right)
-                          '("L" . meow-right-expand)
-                          '("m" . meow-join)
-                          '("n" . meow-search)
-                          '("N" . meow-pop-search)
-                          '("o" . meow-block)
-                          '("O" . meow-to-block)
-                          '("p" . meow-yank)
-                          '("q" . meow-quit)
-                          '("r" . meow-replace)
-                          '("R" . meow-swap-grab)
-                          '("s" . meow-kill)
-                          '("t" . meow-till)
-                          '("T" . meow-till-expand)
-                          '("u" . my-meow-undo)
-                          '("U" . undo-fu-only-redo)
-                          '("v" . meow-page-down)
-                          '("V" . meow-page-up)
-                          '("w" . meow-mark-word)
-                          '("W" . meow-mark-symbol)
-                          '("x" . meow-line)
-                          '("X" . meow-find-ref)
-                          '("y" . meow-save)
-                          '("Y" . meow-sync-grab)
-                          '("z" . meow-pop-selection)
-                          '("Z" . meow-goto-line)
-                          '("'" . repeat)
-                          '("/" . meow-visit)
-                          '(">" . meow-forward-slurp)
-                          '("<" . meow-forward-barf)
-                          '("C-<" . meow-backward-slurp)
-                          '("C->" . meow-backward-barf)
-                          '("}" . my-meow-forward-paragraph)
-                          '("{" . my-meow-backward-paragraph)
-                          '(":" . meow-comment)
-                          '("=" . meow-indent)
-                          '("<escape>" . ignore))
   (with-eval-after-load 'catppuccin-theme
-    (setq meow-cursor-type-insert 'box)
+    (add-hook 'god-mode-enabled-hook
-    (face-spec-set 'meow-insert-cursor `((t (:background
+              (lambda ()
-                                             ,(catppuccin-get-color 'mauve)
+                (if (display-graphic-p)
-                                             :inherit
+                    (set-cursor-color (catppuccin-get-color 'rosewater))
-                                             unspecified))))
+                  (send-string-to-terminal "\e[2 q"))))
-    (face-spec-set 'meow-unknown-cursor `((t (:background
+    (add-hook 'god-mode-disabled-hook
-                                              ,(catppuccin-get-color 'rosewater)
+              (lambda ()
-                                              :inherit
+                (if (display-graphic-p)
-                                              unspecified))))
+                    (set-cursor-color (catppuccin-get-color 'mauve))
-    (dolist (meow-cursor-face '(meow-normal-cursor meow-motion-cursor meow-beacon-cursor))
+                  ;; Escape codes for hbar cursor in insert mode
-      (face-spec-set meow-cursor-face '((t (:inherit meow-unknown-cursor)))))
+                  (send-string-to-terminal "\e[4 q")))))
-    (add-to-list 'meow-update-cursor-functions-alist
+  (unless (or (daemonp) (display-graphic-p))
-                 (cons (lambda () (and (meow-insert-mode-p) (not (display-graphic-p))))
+    (keymap-global-set "C-l" (lambda () (interactive) (god-mode-all 0))))
-                       (lambda () (meow--set-cursor-type '(hbar 2))))))
+  (god-mode))
-  (meow-global-mode))
+
+(use-package multiple-cursors
+  :bind
+  ("C-S-c" . mc/edit-lines)
+  ("C->" . mc/mark-next-like-this)
+  ("C-<" . mc/mark-prev-like-this)
+  ("C-+" . mc/mark-all-like-this)
+  ("C-|" . mc/mark-pop)
+  ("C-c c" . mc/mark-all-in-region)
+  ("C-c C" . mc/mark-all-in-region-regexp)
+  ("C-c u" . mc/mark-all-like-this-dwim)
+  ("C-c U" . mc/mark-all-dwim)
+  ("C-S-<mouse-1>" . mc/add-cursor-on-click)
+  :custom
+  (mc/always-run-for-all t)
+  :init
+  ;; NOTE: For SOME REASON lispy also defvars the mc cmds list to nil when
+  ;; sourced so they need to be modified twice
+  (let ((add-cmds (lambda ()
+                    (dolist (f '(god-local-mode
+                                 god-mode-all
+                                 god-global-mode))
+                      (add-to-list 'mc/cmds-to-run-once f)))))
+    ;; Because multiple-cursors-core is what actually gets autoloaded
+    (eval-after-load 'multiple-cursors-core add-cmds)
+    (eval-after-load 'lispy add-cmds)))
+
+(use-package expand-region
+  :bind ("C-=" . er/expand-region))
 
 (use-package avy
   :bind
@@ -199,37 +139,22 @@
   ("M-g w" . avy-goto-word-1)
   ("M-g e" . avy-goto-word-0)
   :custom
-  (avy-timeout-seconds 0.3)
+  (avy-timeout-seconds 0.3))
-  :init
-  (with-eval-after-load 'meow
-    (meow-normal-define-key '("?" . avy-goto-char-timer))))
 
-(use-package puni
+(use-package lispy
-  :hook prog-mode tex-mode sly-mrepl-mode racket-repl-mode
+  :hook
-  :bind (:map puni-mode-map
+  emacs-lisp-mode
-              ("C-)" . puni-slurp-forward)
+  ielm-mode
-              ("C-}" . puni-barf-forward)
+  lisp-mode
-              ("C-(" . puni-slurp-backward)
+  scheme-mode
-              ("C-{" . puni-barf-backward)
+  clojure-mode
-              ("C-c p t" . puni-transpose)
+  sly-mrepl-mode
-              ("C-c p r" . puni-raise)
+  racket-repl-mode
-              ("C-c p C-s" . puni-splice)
-              ("C-c p s" . puni-split)
-              ("C-c p z" . puni-squeeze))
   :config
-  (with-eval-after-load 'goggles
+  (add-to-list 'lispy-compat 'god-mode)
-    (defun my--disable-goggles-for-puni (oldfun &rest r)
+  (add-to-list 'lispy-compat 'magit-blame-mode)
-      (let ((old-goggles-mode goggles-mode))
+  (when (boundp 'god-local-mode-map)
-        (goggles-mode 0)
+    (push (assoc 'god-local-mode minor-mode-map-alist) minor-mode-map-alist)))
-        (prog1 (apply oldfun r)
-          (when old-goggles-mode
-            (goggles-mode)))))
-    (dolist (fun '(puni-slurp-forward
-                   puni-barf-forward
-                   puni-slurp-backward
-                   puni-barf-backward
-                   puni-raise))
-      (advice-add fun :around #'my--disable-goggles-for-puni))))
 
 (use-package ace-window
   :bind ("C-c w" . ace-window)
@@ -300,8 +225,8 @@
 (use-package dtrt-indent
   :demand t
   :config
-  (dtrt-indent-global-mode)
+  (setcar (cdr (assq 'dtrt-indent-mode minor-mode-alist)) " dtrt")
-  (setcar (cdr (assq 'dtrt-indent-mode minor-mode-alist)) " dtrt"))
+  (dtrt-indent-global-mode))
 
 (use-package aggressive-indent
   :custom
@@ -310,15 +235,9 @@
   emacs-lisp-mode
   ielm-mode
   lisp-mode
-  lisp-interaction-mode
   scheme-mode
   clojure-mode
-  nix-mode
+  nix-mode)
-  :config
-  (with-eval-after-load 'meow
-    (setq aggressive-indent-protected-commands
-          (append aggressive-indent-protected-commands
-                  '(my-meow-undo meow-undo meow-undo-in-selection)))))
 
 (use-package rainbow-delimiters
   :hook prog-mode sly-mrepl-mode racket-repl-mode)
@@ -335,6 +254,8 @@
   :custom
   (which-key-idle-delay 0.2)
   :config
+  (with-eval-after-load 'god-mode
+    (which-key-enable-god-mode-support))
   (which-key-mode))
 
 (use-package flymake
@@ -439,7 +360,6 @@
   (corfu-scroll-margin 3)
   (tab-always-indent 'complete)
   :config
-  (global-corfu-mode)
   (add-hook 'minibuffer-setup-hook
             (lambda ()
               (when (where-is-internal #'completion-at-point
@@ -447,8 +367,7 @@
                 (setq-local corfu-echo-display nil
                             corfu-popupinfo-delay nil)
                 (corfu-mode))))
-  (with-eval-after-load 'meow
+  (global-corfu-mode))
-    (add-hook 'meow-insert-exit-hook #'corfu-quit)))
 
 (use-package cape)
 
@@ -492,6 +411,31 @@
   :config
   (dirvish-override-dired-mode))
 
+(use-package persp-mode
+  :if nil
+  :bind ("C-c p" . persp-key-map)
+  :custom
+  (persp-keymap-prefix nil)
+  :init
+  (when (daemonp)
+    (require 'persp-mode))
+  :config
+  (with-eval-after-load 'consult
+    (consult-customize consult--source-buffer :hidden t :default nil)
+    (add-to-list 'consult-buffer-sources
+                 (list :name "Perspective"
+                       :narrow ?s
+                       :category 'buffer
+                       :state #'consult--buffer-state
+                       :history 'buffer-name-history
+                       :default t
+                       :items (lambda ()
+                                (consult--buffer-query :sort 'visibility
+                                                       :predicate (lambda (buf)
+                                                                    (memq buf (persp-buffer-list)))
+                                                       :as #'buffer-name)))))
+  (persp-mode))
+
 (use-package alert
   :ensure nil
   :custom
@@ -617,9 +561,7 @@
             (format "%S\n\n" old-init-list))
         old-init)))
   (advice-add #'sly-init-using-asdf :filter-return #'my--sly-add-project-root-to-asdf)
-  (sly-setup)
+  (sly-setup))
-  (with-eval-after-load 'meow
-    (add-to-list 'meow-mode-state-list '(sly-db-mode . motion))))
 
 (use-package sly-asdf)
 (use-package sly-named-readtables)
@@ -631,14 +573,6 @@
   :custom
   (haskell-process-show-debug-tips nil))
 
-;; (use-package web-mode
-;;   :mode ("\\.\\([jt]sx?\\|css\\)\\'" . web-mode)
-;;   :custom
-;;   (web-mode-css-indent-offset 2)
-;;   (web-mode-code-indent-offset 2)
-;;   (web-mode-markup-indent-offset 2)
-;;   :hook (web-mode . (lambda () (setq-local tab-width 2))))
-
 (use-package lua-mode
   :custom
   (lua-indent-level 4)
@@ -721,39 +655,14 @@
                                      vc-ignore-dir-regexp
                                      tramp-file-name-regexp)))
 
-(use-package vterm
+(use-package eat
   :bind
-  ("C-c t" . vterm)
+  ("C-c t" . eat)
-  ("C-c T" . vterm-other-window)
+  (:map eat-mode-map
-  :hook (vterm-mode . my-inhibit-hl-line-mode)
+        ("<escape>" . eat-self-input))
   :config
-  (with-eval-after-load 'meow
+  (with-eval-after-load 'god-mode
-    (defvar meow-vterm-normal-mode-map
+    (add-to-list 'god-exempt-major-modes 'eat-mode)))
-      (let ((map (make-sparse-keymap)))
-        (define-key map (kbd "RET") #'vterm-send-return)
-        map))
-    (setq vterm-keymap-exceptions '("C-c"))
-    (define-key vterm-mode-map (kbd "C-c ESC") #'vterm-send-escape)
-    (dolist (c '((yank . vterm-yank)
-                 (xterm-paste . vterm-xterm-paste)
-                 (yank-pop . vterm-yank-pop)
-                 (mouse-yank-primary . vterm-yank-primary)
-                 (self-insert-command . vterm--self-insert)
-                 (beginning-of-defun . vterm-previous-prompt)
-                 (end-of-defun . vterm-next-prompt)))
-      (define-key meow-vterm-normal-mode-map (vector 'remap (car c)) (cdr c)))
-    (add-hook 'vterm-mode-hook
-              (lambda ()
-                (add-hook 'meow-insert-enter-hook
-                          (lambda ()
-                            (use-local-map vterm-mode-map)
-                            (vterm-goto-char (point)))
-                          nil t)
-                (add-hook 'meow-insert-exit-hook
-                          (lambda ()
-                            (use-local-map meow-vterm-normal-mode-map))
-                          nil t)))
-    (add-to-list 'meow-mode-state-list '(vterm-mode . insert))))
 
 (use-package circe
   :hook (circe-channel-mode . enable-lui-autopaste)
@@ -863,8 +772,7 @@
   :hook
   (shell-mode . with-editor-export-editor)
   (eshell-mode . with-editor-export-editor)
-  (term-exec . with-editor-export-editor)
+  (term-exec . with-editor-export-editor))
-  (vterm-mode . with-editor-export-editor))
 
 (use-package nyan-mode
   :custom
@@ -885,9 +793,9 @@
   :if my-is-nixos
   :ensure nil
   :bind
-  ("C-c M m" . mu4e)
+  ("C-c m m" . mu4e)
-  ("C-c M c" . mu4e-compose-new)
+  ("C-c m c" . mu4e-compose-new)
-  ("C-c M u" . mu4e-update-mail-and-index)
+  ("C-c m u" . mu4e-update-mail-and-index)
   :hook
   (mu4e-view-mode . my-inhibit-hl-line-mode)
   (message-mode . my-double-space-sentence)
@@ -942,9 +850,7 @@
                               (smtpmail-smtp-user . ,address)))))
                  my--agenix-email-json-data)))
   (when (fboundp 'imagemagick-register-types)
-    (imagemagick-register-types))
+    (imagemagick-register-types)))
-  (with-eval-after-load 'meow
-    (add-to-list 'meow-mode-state-list '(mu4e-view-mode . motion))))
 
 (use-package org-msg
   :after message
@@ -1093,7 +999,7 @@
 
 (setq auto-mode-alist
       (append '(("\\.yuck\\'" . lisp-mode)
-                ("flake\\.lock\\'" . js-json-mode))
+                ("/flake\\.lock\\'" . js-json-mode))
               auto-mode-alist
               '(("/qutebrowser-editor-" . text-mode))))