From 8d60190847f90872f471ccedcf9ea88ea9c5a307 Mon Sep 17 00:00:00 2001 From: Case Duckworth Date: Sat, 1 May 2021 15:20:01 -0500 Subject: Tweak which-key idle timing It does seem as though `which-key-show-early-on-C-h' isn't respected here, but I'm not sure exactly what the issue is. Could be the `which-key-setup-minibuffer'... more research is needed. --- init.el | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'init.el') diff --git a/init.el b/init.el index d6e8fc8..b3fcfee 100644 --- a/init.el +++ b/init.el @@ -968,8 +968,8 @@ if ripgrep is installed, otherwise `consult-grep'." (setup (:straight which-key) (:option which-key-show-early-on-C-h t - which-key-idle-delay 0.05 - which-key-idle-secondary-delay 0.05 + which-key-idle-delay 1 + which-key-idle-secondary-delay 0.5 which-key-delay-functions '(acdw/which-key-delay-all-but)) (defun acdw/which-key-delay-all-but (seq len) @@ -978,9 +978,9 @@ if ripgrep is installed, otherwise `consult-grep'." ;; With C-z binds (`acdw/leader'), pop up right away ((string-prefix-p "C-z" seq :ignore-case) 0) ;; Also pop up right away if we're already entering keys - ((> len 1) 0) - ;; Otherwise, wait 1.25 seconds - (t 1.25))) + ((> len 1) which-key-idle-secondary-delay) + ;; Otherwise, wait + (t which-key-idle-delay))) (which-key-setup-minibuffer) (which-key-mode +1)) -- cgit 1.4.1-21-gabe81 From 14140211b1b0caa3772780efafb198e5720b4a74 Mon Sep 17 00:00:00 2001 From: Case Duckworth Date: Sat, 1 May 2021 15:22:49 -0500 Subject: Switch to SLY for Lisp REPL I've kept SLIME's config around, in case I need it -- which REPL is loaded depends on the `acdw/cl-ide' variable. --- init.el | 41 +++++++++++++++++++++++++---------------- 1 file changed, 25 insertions(+), 16 deletions(-) (limited to 'init.el') diff --git a/init.el b/init.el index b3fcfee..934f3db 100644 --- a/init.el +++ b/init.el @@ -752,26 +752,35 @@ if ripgrep is installed, otherwise `consult-grep'." (setup (:straight geiser)) -(setup (:straight slime) +(setup common-lisp-ide + (defvar acdw/cl-ide :sly) (defvar acdw/lisp-bin (or (executable-find "sbcl") (executable-find "clisp"))) (:needs acdw/lisp-bin) - - (:also-load slime-autoloads) - (:option inferior-lisp-program acdw/lisp-bin) - - (when-let ((slime-helper (or (expand-file-name-exists-p - "~/quicklisp/slime-helper.el") - (expand-file-name-exists-p - "~/var/quicklisp/slime-helper.el")))) - (load slime-helper)) - - (with-eval-after-load 'company - (setup (:straight slime-company) - (:option slime-company-completion 'fuzzy - slime-company-after-completion nil) - (slime-setup '(slime-fancy slime-company))))) + + (pcase acdw/cl-ide + (:slime + (setup (:straight slime) + (:also-load slime-autoloads) + + (when-let ((slime-helper (or (expand-file-name-exists-p + "~/quicklisp/slime-helper.el") + (expand-file-name-exists-p + "~/var/quicklisp/slime-helper.el")))) + (load slime-helper)) + + (with-eval-after-load 'company + (setup (:straight slime-company) + (:option slime-company-completion 'fuzzy + slime-company-after-completion nil) + (slime-setup '(slime-fancy slime-company)))))) + + (:sly + (setup (:straight sly) + (:option sly-kill-without-query-p t) + + (:also-load sly-autoloads))))) (setup (:straight (gemini-mode :host nil -- cgit 1.4.1-21-gabe81