From 9c3a0a90aeb94fb475072b89c9c7dab8b6e5daa5 Mon Sep 17 00:00:00 2001
From: cashmere <cashmere@autistici.org>
Date: Wed, 18 Feb 2026 02:45:25 +0100
Subject: replace avy/flash-emacs/avy-flash with Prgebish/flash

Remove avy, flash-emacs (JiaweiChenC), and avy-flash (ZenScriptor) in
favor of Prgebish/flash which provides a complete solution: incremental
search labels, evil operator composability (d/y/c), enhanced f/t/F/T
char motions with labels, and isearch integration.

Restore ; and , keys after flash-char-setup to preserve localleader
and prev-navigation prefix bindings.
---
 config.org | 61 +++++++++++++++++++++++++++++--------------------------------
 1 file changed, 29 insertions(+), 32 deletions(-)

diff --git a/config.org b/config.org
index 6e4f94a..4e1abeb 100644
--- a/config.org
+++ b/config.org
@@ -3143,43 +3143,40 @@ ily <3.
 
 #+end_src
 
-* avy
+* flash
 
 #+begin_src emacs-lisp
-(use-package avy
+(use-package flash
   :ensure t
-  :straight t
+  :straight (:host github :repo "Prgebish/flash")
   :after evil
-  :general
-  ;; (general-nmap "s" 'avy-goto-char-timer)
-  ;; (general-omap "s" 'evil-avy-goto-char-timer)
+  :custom
+  (flash-multi-window t)
+  (flash-backdrop t)
+  (flash-case-fold t)
+  (flash-autojump nil)
+  (flash-highlight-matches t)
+  (flash-label-position 'overlay)
+  (flash-jump-position 'start)
+  (flash-char-jump-labels t)
+  (flash-char-multi-line nil)
+  (flash-nohlsearch t)
+  (flash-jumplist t)
   :config
-  (setq avy-all-windows t
-        avy-all-windows-alt t
-        avy-background t
-        avy-case-fold-search t
-        avy-timeout-seconds 0.3
-        avy-style 'at-full
-        avy-keys '(?a ?s ?d ?f ?g ?h ?j ?k ?l))
-
-  (evil-define-avy-motion emacs-flash-jump inclusive))
-#+end_src
-
-** emacs-flash
-
-#+begin_src emacs-lisp
-(use-package flash-emacs
-  :ensure t
-  :straight (:host github :repo "JiaweiChenC/flash-emacs"))
-#+end_src
-
-** avy-flash
-
-#+begin_src emacs-lisp
-;; ZenScriptor/avy-flash
-(use-package avy-flash
-  :ensure t
-  :straight (:host github :repo "ZenScriptor/avy-flash"))
+  ;; Evil integration: binds gs in normal/visual/operator + enhanced f/t/F/T
+  (require 'flash-evil)
+  (flash-evil-setup t)
+
+  ;; Restore ; and , after flash-char overwrites them
+  ;; ; is used as prefix for prev-navigation (;b, ;d)
+  ;; , is the local leader
+  (evil-define-key* '(normal visual motion) 'global
+    (kbd ";") nil
+    (kbd ",") nil)
+
+  ;; Search integration: labels during C-s, /, ?
+  (require 'flash-isearch)
+  (flash-isearch-mode 1))
 #+end_src
 
 * undo-tree
-- 
cgit v1.3.1