More emacs.d updates

4 files changed, 24 insertions, 10 deletions

diff --git a/emacs-prelude/personal/lisp/init-clojure.el b/emacs-prelude/personal/lisp/init-clojure.el
index 080b695..c0b59ec 100644
--- a/emacs-prelude/personal/lisp/init-clojure.el
+++ b/emacs-prelude/personal/lisp/init-clojure.el
@@ -38,6 +38,7 @@
         cider-repl-history-file "~/.emacs.d/cider-history"
         clojure-toplevel-inside-comment-form t)
   (key-chord-define-global "??" 'cider-xref-fn-refs-select)
-  (key-chord-define-global "qq" 'cider-xref-fn-refs))
+  (key-chord-define-global "qq" 'cider-xref-fn-refs)
+  :hook (cider-repl-mode . (lambda () (smartscan-mode -1))))
 
 (provide 'init-clojure)
diff --git a/emacs-prelude/personal/lisp/init-completion.el b/emacs-prelude/personal/lisp/init-completion.el
index c43d1b4..e23284f 100644
--- a/emacs-prelude/personal/lisp/init-completion.el
+++ b/emacs-prelude/personal/lisp/init-completion.el
@@ -83,10 +83,14 @@
   :init
   (corfu-global-mode))
 
-(use-package dabbrev
-  :bind (("M-/" . dabbrev-completion)
-         ("C-M-/" . dabbrev-expand)))
-
+;; (use-package dabbrev
+;;   :bind (("M-/" . dabbrev-completion)
+;;          ("C-M-/" . dabbrev-expand)))
+(prelude-require-package 'fancy-dabbrev)
+(use-package fancy-dabbrev
+  :diminish
+  :config
+  (global-fancy-dabbrev-mode))
 
 ;; minibuffer completion - vertico et al
 (prelude-require-package 'vertico)
@@ -129,10 +133,12 @@
       (select-window (active-minibuffer-window))))
 
   (key-chord-define-global "XX" 'to-and-fro-minibuffer)
-  (key-chord-define-global ">>" 'preview-from-outside)
+  ;(key-chord-define-global ">>" 'preview-from-outside)
   :bind (("C-M-<" . up-from-outside)
          ("C-M->" . down-from-outside)
-         ("M-+" . preview-from-outside)))
+         ("C-M-+" . preview-from-outside)
+         ("M-X" . to-and-fro-minibuffer)
+         ("C-M-S-g" . minibuffer-keyboard-quit)))
 
 (prelude-require-package 'consult)
 (use-package consult
diff --git a/emacs-prelude/personal/lisp/init-git.el b/emacs-prelude/personal/lisp/init-git.el
index c63de39..ac5ce4b 100644
--- a/emacs-prelude/personal/lisp/init-git.el
+++ b/emacs-prelude/personal/lisp/init-git.el
@@ -31,6 +31,7 @@
   ("C-c j S-g" . git-gutter)
   ("C-c j n" . git-gutter:next-hunk)
   ("C-c j p" . git-gutter:previous-hunk)
-  ("C-c j r" . git-gutter:revert-hunk))
+  ("C-c j r" . git-gutter:revert-hunk)
+  ("C-c j d" . git-gutter:popup-hunk))
 
 (provide 'init-git)
diff --git a/emacs-prelude/personal/lisp/init-ui.el b/emacs-prelude/personal/lisp/init-ui.el
index 608591c..344a1c9 100644
--- a/emacs-prelude/personal/lisp/init-ui.el
+++ b/emacs-prelude/personal/lisp/init-ui.el
@@ -34,11 +34,12 @@
 
 (prelude-require-package 'ctrlf)
 (use-package ctrlf
-  :config
+  :init
   (ctrlf-mode +1)
   :bind
   ("C-*" . ctrlf-forward-symbol-at-point)
-  ("M-s M-s" . ctrlf-toggle-symbol))
+  ("M-s M-s" . ctrlf-toggle-symbol)
+  ("C-M-g" . ctrlf-cancel))
 
 (prelude-require-package 'buffer-move)
 (use-package buffer-move
@@ -47,4 +48,9 @@
          ("C-S-<left>" . buf-move-left)
          ("C-S-<right>" . buf-move-right)))
 
+(prelude-require-package 'smartscan)
+(use-package smartscan
+  :config
+  (global-smartscan-mode t))
+
 (provide 'init-ui)