about summary refs log tree commit diff stats
path: root/init.el
diff options
context:
space:
mode:
Diffstat (limited to 'init.el')
-rw-r--r--init.el51
1 files changed, 30 insertions, 21 deletions
diff --git a/init.el b/init.el index 61fbdc4..b3b6396 100644 --- a/init.el +++ b/init.el
@@ -752,26 +752,35 @@ if ripgrep is installed, otherwise `consult-grep'."
752 752
753(setup (:straight geiser)) 753(setup (:straight geiser))
754 754
755(setup (:straight slime) 755(setup common-lisp-ide
756 (defvar acdw/cl-ide :sly)
756 (defvar acdw/lisp-bin (or (executable-find "sbcl") 757 (defvar acdw/lisp-bin (or (executable-find "sbcl")
757 (executable-find "clisp"))) 758 (executable-find "clisp")))
758 (:needs acdw/lisp-bin) 759 (:needs acdw/lisp-bin)
759
760 (:also-load slime-autoloads)
761
762 (:option inferior-lisp-program acdw/lisp-bin) 760 (:option inferior-lisp-program acdw/lisp-bin)
763 761
764 (when-let ((slime-helper (or (expand-file-name-exists-p 762 (pcase acdw/cl-ide
765 "~/quicklisp/slime-helper.el") 763 (:slime
766 (expand-file-name-exists-p 764 (setup (:straight slime)
767 "~/var/quicklisp/slime-helper.el")))) 765 (:also-load slime-autoloads)
768 (load slime-helper)) 766
769 767 (when-let ((slime-helper (or (expand-file-name-exists-p
770 (with-eval-after-load 'company 768 "~/quicklisp/slime-helper.el")
771 (setup (:straight slime-company) 769 (expand-file-name-exists-p
772 (:option slime-company-completion 'fuzzy 770 "~/var/quicklisp/slime-helper.el"))))
773 slime-company-after-completion nil) 771 (load slime-helper))
774 (slime-setup '(slime-fancy slime-company))))) 772
773 (with-eval-after-load 'company
774 (setup (:straight slime-company)
775 (:option slime-company-completion 'fuzzy
776 slime-company-after-completion nil)
777 (slime-setup '(slime-fancy slime-company))))))
778
779 (:sly
780 (setup (:straight sly)
781 (:option sly-kill-without-query-p t)
782
783 (:also-load sly-autoloads)))))
775 784
776(setup (:straight (gemini-mode 785(setup (:straight (gemini-mode
777 :host nil 786 :host nil
@@ -971,8 +980,8 @@ if ripgrep is installed, otherwise `consult-grep'."
971 980
972(setup (:straight which-key) 981(setup (:straight which-key)
973 (:option which-key-show-early-on-C-h t 982 (:option which-key-show-early-on-C-h t
974 which-key-idle-delay 0.05 983 which-key-idle-delay 1
975 which-key-idle-secondary-delay 0.05 984 which-key-idle-secondary-delay 0.5
976 which-key-delay-functions '(acdw/which-key-delay-all-but)) 985 which-key-delay-functions '(acdw/which-key-delay-all-but))
977 986
978 (defun acdw/which-key-delay-all-but (seq len) 987 (defun acdw/which-key-delay-all-but (seq len)
@@ -981,9 +990,9 @@ if ripgrep is installed, otherwise `consult-grep'."
981 ;; With C-z binds (`acdw/leader'), pop up right away 990 ;; With C-z binds (`acdw/leader'), pop up right away
982 ((string-prefix-p "C-z" seq :ignore-case) 0) 991 ((string-prefix-p "C-z" seq :ignore-case) 0)
983 ;; Also pop up right away if we're already entering keys 992 ;; Also pop up right away if we're already entering keys
984 ((> len 1) 0) 993 ((> len 1) which-key-idle-secondary-delay)
985 ;; Otherwise, wait 1.25 seconds 994 ;; Otherwise, wait
986 (t 1.25))) 995 (t which-key-idle-delay)))
987 996
988 (which-key-setup-minibuffer) 997 (which-key-setup-minibuffer)
989 (which-key-mode +1)) 998 (which-key-mode +1))