From ad73bd91f9e7d75b7810fb76f800b31f3d76fb49 Mon Sep 17 00:00:00 2001
From: Matt Nish-Lapidus <matt@emenel.ca>
Date: Mon, 19 May 2025 10:25:43 -0400
Subject: [PATCH] fixing keybinds

---
 bindings.el | 11 ++++++++---
 config.el   |  7 -------
 init.el     |  4 ++--
 meow.el     | 22 ++++++++++++++--------
 packages.el | 15 ---------------
 5 files changed, 24 insertions(+), 35 deletions(-)

diff --git a/bindings.el b/bindings.el
index 193fa34..e20d34a 100644
--- a/bindings.el
+++ b/bindings.el
@@ -124,6 +124,7 @@
        :desc "Repeat last command"          "C" #'projectile-repeat-last-command
        :desc "Remove known project"         "d" #'projectile-remove-known-project
        :desc "Discover projects in folder"  "D" #'+default/discover-projects
+       :desc "Cleanup project cache"  "I" #'projectile-cleanup-known-projects
        :desc "Edit project .dir-locals"     "e" #'projectile-edit-dir-locals
        :desc "Find file in project"         "f" #'projectile-find-file
        :desc "Find file in other project"   "F" #'doom/find-file-in-other-project
@@ -338,7 +339,7 @@
       "C-S-E" #'+vertico/embark-export-write
       "C-w" #'kill-buffer
       "C-f" #'+default/search-buffer
-      "C-g" #'vertico-repeat ; TODO make this grab the last search term and re-search instead
+      "C-g" #'meow-search
       "C-s" #'save-buffer
       "C-;" #'comment-dwim
       "C-/" #'comment-line
@@ -362,8 +363,12 @@
       "C-<return>" #'split-window-vertically
       "C-S-<return>" #'split-window-horizontally
       "C-<backspace>" #'sp-backward-delete-word
-      "C-<delete>" #'sp-delete-word)
-      ;; "C-M-<SPC>" #'my/call-localleader)
+      "C-<delete>" #'sp-delete-word
+      "C-(" #'sp-wrap-round
+      "C-[" #'sp-wrap-square
+      "C-{" #'sp-wrap-curly)
+
+;; "C-M-<SPC>" #'my/call-localleader)
 
 (map! (:when (modulep! :ui popup)
         "C-`"   #'+popup/toggle
diff --git a/config.el b/config.el
index fe60b06..054fb8b 100644
--- a/config.el
+++ b/config.el
@@ -256,10 +256,3 @@
   :config
   (global-colorful-mode t)
   (add-to-list 'global-colorful-modes 'helpful-mode))
-
-(use-package! mpdel-embark
-  :demand t
-  :after (embark mpdel)
-  :config
-  (progn
-    (mpdel-embark-setup)))
diff --git a/init.el b/init.el
index f5d0946..1dc3230 100644
--- a/init.el
+++ b/init.el
@@ -27,7 +27,7 @@
  doom-dashboard    ; a nifty splash screen for Emacs
  (emoji +unicode)  ; 🙂
  hl-todo           ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW
- (ligatures +extra)         ; ligatures and symbols to make your code pretty again
+ ligatures         ; ligatures and symbols to make your code pretty again
  minimap           ; show a map of the code on the side
  modeline          ; snazzy, Atom-inspired modeline, plus API
  nav-flash         ; blink cursor line after big motions
@@ -111,7 +111,7 @@
 
  :app
  ;;calendar
- emms
+ ;; emms
 
  :config
  (default +smartparens))
diff --git a/meow.el b/meow.el
index afb8c5d..0f3b91a 100644
--- a/meow.el
+++ b/meow.el
@@ -15,10 +15,12 @@
           (meow--make-selection '(select . visit) beg (if isearch-forward end isearch-other-end))
           (meow--select (not isearch-forward)))))))
 
+(setf meow--kbd-forward-char "<right>"
+      meow--kbd-undo "C-z")
+
 (add-hook 'isearch-mode-end-hook 'meow--post-isearch-function)
 
 (defun meow-setup ()
-  (meow--setup-rectangle-mark t)
   (setq meow-cheatsheet-layout meow-cheatsheet-layout-qwerty)
 
   (map!
@@ -75,6 +77,7 @@
    '("o" . meow-block)
    '("O" . meow-to-block)
    '("p" . meow-yank)
+   '("P" . meow-yank-pop)
    '("q" . meow-quit)
    '("Q" . meow-goto-line)
    '("r" . meow-swap-grab)
@@ -82,7 +85,7 @@
    '("s" . meow-kill)
    '("t" . meow-till)
    '("u" . meow-undo)
-   '("U" . meow-undo-in-selection)
+   '("U" . undo-redo)
    '("v" . meow-visit)
    '("w" . meow-mark-word)
    '("W" . meow-mark-symbol)
@@ -90,22 +93,25 @@
    '("X" . meow-goto-line)
    '("y" . meow-save)
    '("Y" . meow-sync-grab)
-   '("z" . meow-pop-selection)
+   '("z" . end-of-buffer)
+   '("Z" . beginning-of-buffer)
+   '("<" . meow-beginning-of-thing)
+   '(">" . meow-end-of-thing)
+   '("/" . bookmark-in-project-jump)
    '("'" . repeat)
    '("=" . meow--eval-sexp)
    '("[" . sp-backward-sexp)
    '("]" . sp-forward-sexp)
    '("{" . sp-backward-up-sexp)
    '("}" . sp-down-sexp)
-   '("<" . meow-beginning-of-thing)
-   '(">" . meow-end-of-thing)
-   '("/" . bookmark-in-project-jump)
    '("?" . bookmark-jump)
-   '("÷" . bookmark-delete)
+   '("/" . bookmark-set)
+   '("\\" . bookmark-delete)
    '("#" . string-inflection-all-cycle)
    '("<escape>" . doom/escape)))
 
 (use-package! meow
+  :demand t
   :config
   (meow-setup)
   (pushnew! meow-mode-state-list '(mu4e-main-mode . motion))
@@ -113,4 +119,4 @@
   (pushnew! meow-mode-state-list '(sly-inspector-mode . motion))
   (pushnew! meow-mode-state-list '(vterm-mode . insert))
   (pushnew! meow-mode-state-list '(sly-mode . insert))
-  (meow-global-mode 1))
+  (meow-global-mode))
diff --git a/packages.el b/packages.el
index 97bc80f..bcc8412 100644
--- a/packages.el
+++ b/packages.el
@@ -57,21 +57,6 @@
            :host github
            :repo "mkcms/mu4e-overview"))
 
-(package! listen
-  :recipe (:type git
-           :host github
-           :repo "alphapapa/listen.el"))
-
-(package! mpdel
-  :recipe (:type git
-           :host github
-           :repo "mpdel/mpdel"))
-
-(package! mpdel-embark
-  :recipe (:type git
-           :host github
-           :repo "mpdel/mpdel-embark"))
-
 (package! just-mode)
 (package! justl)
 (package! fennel-mode)