From be6664d1f1e0af47ef03087de7ae0d97c6a8d3ce Mon Sep 17 00:00:00 2001
From: Matt Nish-Lapidus <matt@emenel.ca>
Date: Sat, 28 Oct 2023 11:50:40 -0400
Subject: [PATCH] refining meow config

---
 config.el                     | 25 ++++++++++++-------------
 modules/editor/meow/config.el | 18 ++++++++++++++----
 2 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/config.el b/config.el
index 2f92a3c..3b33750 100644
--- a/config.el
+++ b/config.el
@@ -97,20 +97,19 @@
 (after! smart-tabs-mode
   (smart-tabs-insinuate 'c 'javascript 'python))
 
-;; lsp mode config to work with corfu/cape
-;; (after! lsp-mode
-;;   (setq lsp-completion-provider :none)
-;;   (setq lsp-signature-render-documentation nil)
-;;   (setq lsp-completion-show-kind t)
-;;   (setq lsp-ui-doc-show-with-mouse nil)
+;; Add consult-line seraches to isearch history (both regular and regex) -- can now use meow 'n' to continue search as well as isearch
+(advice-add #'consult-line :after
+            (lambda (&rest _)
+              (when consult--line-history
+                (add-to-history
+                 'regexp-search-ring
+                 (car consult--line-history)
+                 regexp-search-ring-max)
+                (add-to-history
+                 'search-ring
+                 (car consult--line-history)
+                 search-ring-max))))
 
-;;   (setq +lsp-company-backends
-;;         '(:separate company-capf company-yasnippet company-dabbrev))
-
-;;   (defun my/lsp-mode-setup-completion ()
-;;     (setf (alist-get 'styles (alist-get 'lsp-capf completion-category-defaults))
-;;           '(orderless)))
-;;   (add-hook! lsp-completion-mode 'my/lsp-mode-setup-completion))
 
 ;; bibliography file location
 (after! citar
diff --git a/modules/editor/meow/config.el b/modules/editor/meow/config.el
index ee1675f..9aacf89 100644
--- a/modules/editor/meow/config.el
+++ b/modules/editor/meow/config.el
@@ -77,8 +77,6 @@
   ";" #'meow-reverse
   "," #'meow-inner-of-thing
   "." #'meow-bounds-of-thing
-  "=" #'isearch-forward
-  "+" #'isearch-backward
   "\\" #'bookmark-jump
   "'" #'repeat
   ":" #'eval-last-sexp
@@ -86,9 +84,22 @@
   "]" #'sp-forward-sexp
   "{" #'sp-backward-up-sexp
   "}" #'sp-down-sexp
+  "/" #'isearch-forward
+  "'" #'isearch-backward
   "<escape>" #'corfu-quit))
 
 
+(defun meow--post-isearch-function ()
+  (unless isearch-mode-end-hook-quit
+    (when isearch-success
+      (let ((beg (car isearch-match-data))
+            (end (cadr isearch-match-data)))
+        (thread-first
+          (meow--make-selection '(select . visit) beg (if isearch-forward end isearch-other-end))
+          (meow--select (not isearch-forward)))))))
+
+(add-hook 'isearch-mode-end-hook 'meow--post-isearch-function)
+
 (use-package! meow
   :hook (doom-after-modules-config . meow-global-mode)
   :demand t
@@ -103,5 +114,4 @@
   (meow/setup-leader)
   (pushnew! meow-mode-state-list '(sly-db-mode . motion))
   (pushnew! meow-mode-state-list '(sly-inspector-mode . motion))
-  (pushnew! meow-mode-state-list '(custom-mode . normal))
-  (map! :map meow-keymap [remap describe-key] #'helpfl-key))
+  (pushnew! meow-mode-state-list '(custom-mode . motion)))