about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorDavid Morgan <djm_uk@protonmail.com>2021-07-19 16:53:34 +0100
committerDavid Morgan <djm_uk@protonmail.com>2021-07-19 16:58:14 +0100
commit769926dee8bed6be8278dfb3f540ff0d376fbbc6 (patch)
tree6c0d139da3e0f4be37a79b32bccd7a28418e3287
parent4aa8f885789597be4447b95c8a4547bec8b676ed (diff)
downloaddotfiles-769926dee8bed6be8278dfb3f540ff0d376fbbc6.tar.gz
Tweak CIDER config and add more vertico stuff
-rw-r--r--emacs-prelude/personal/lisp/init-clojure.el5
-rw-r--r--emacs-prelude/personal/lisp/init-clojure.elcbin0 -> 3952 bytes
-rw-r--r--emacs-prelude/personal/lisp/init-completion.el33
-rw-r--r--emacs-prelude/personal/lisp/init-completion.elcbin0 -> 41782 bytes
4 files changed, 35 insertions, 3 deletions
diff --git a/emacs-prelude/personal/lisp/init-clojure.el b/emacs-prelude/personal/lisp/init-clojure.el
index 8612e6b..080b695 100644
--- a/emacs-prelude/personal/lisp/init-clojure.el
+++ b/emacs-prelude/personal/lisp/init-clojure.el
@@ -33,8 +33,9 @@
         cider-repl-history-highlight-inserted-item t
         cider-repl-use-clojure-font-lock t
         cider-repl-use-pretty-printing t
-        cider-invert-insert-eval-p t
-        cider-switch-to-repl-on-insert nil
+        ;cider-invert-insert-eval-p t
+        ;cider-switch-to-repl-on-insert nil
+        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))
diff --git a/emacs-prelude/personal/lisp/init-clojure.elc b/emacs-prelude/personal/lisp/init-clojure.elc
new file mode 100644
index 0000000..026004a
--- /dev/null
+++ b/emacs-prelude/personal/lisp/init-clojure.elc
Binary files differdiff --git a/emacs-prelude/personal/lisp/init-completion.el b/emacs-prelude/personal/lisp/init-completion.el
index 0cf2087..bbc5e21 100644
--- a/emacs-prelude/personal/lisp/init-completion.el
+++ b/emacs-prelude/personal/lisp/init-completion.el
@@ -101,7 +101,38 @@
                  (if (= vertico--index index)
                      (propertize "ยป " 'face 'vertico-current)
                    "  ")
-                 cand))))
+                 cand)))
+  :config
+  (defun down-from-outside ()
+    "Move to next candidate in minibuffer, even when minibuffer isn't selected."
+    (interactive)
+    (with-selected-window (active-minibuffer-window)
+      (execute-kbd-macro [down])))
+
+  (defun up-from-outside ()
+    "Move to previous candidate in minibuffer, even when minibuffer isn't selected."
+    (interactive)
+    (with-selected-window (active-minibuffer-window)
+      (execute-kbd-macro [up])))
+
+  (defun preview-from-outside ()
+    "Preview the selected candidate, even when minibuffer isn't selected."
+    (interactive)
+    (with-selected-window (active-minibuffer-window)
+      (execute-kbd-macro (kbd "M-."))))
+
+  (defun to-and-fro-minibuffer ()
+    "Go back and forth between minibuffer and other window."
+    (interactive)
+    (if (window-minibuffer-p (selected-window))
+        (select-window (minibuffer-selected-window))
+      (select-window (active-minibuffer-window))))
+
+  (key-chord-define-global "XX" 'to-and-fro-minibuffer)
+  (key-chord-define-global ">>" 'preview-from-outside)
+  :bind (("C-M-<" . up-from-outside)
+         ("C-M->" . down-from-outside)
+         ("M-+" . preview-from-outside)))
 
 (prelude-require-package 'consult)
 (use-package consult
diff --git a/emacs-prelude/personal/lisp/init-completion.elc b/emacs-prelude/personal/lisp/init-completion.elc
new file mode 100644
index 0000000..9e43339
--- /dev/null
+++ b/emacs-prelude/personal/lisp/init-completion.elc
Binary files differ