From a4c3a6d3b959243d7f17f883b6e19f4d39e85e92 Mon Sep 17 00:00:00 2001 From: Case Duckworth Date: Tue, 4 May 2021 09:58:16 -0500 Subject: Add clhs and move common-lisp-ide to be in alpha order --- init.el | 84 +++++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 43 insertions(+), 41 deletions(-) diff --git a/init.el b/init.el index 55abfd0..c17714e 100644 --- a/init.el +++ b/init.el @@ -617,6 +617,49 @@ (setup (:straight (beginend)) (beginend-global-mode +1)) +(setup common-lisp-ide + (defvar acdw/cl-ide :sly) + (defvar acdw/lisp-bin (or (executable-find "sbcl") + (executable-find "clisp"))) + (:needs acdw/lisp-bin) + (:option inferior-lisp-program acdw/lisp-bin) + + (setup (:straight clhs)) + + (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)) + + (define-key slime-repl-mode-map (kbd "RET") #'slime-repl-return-at-end) + (define-key slime-repl-mode-map (kbd "") + #'slime-repl-return-at-end) + + (defun slime-repl-return-at-end () + (interactive) + (if (<= (point-max) (point)) + (slime-repl-return) + (slime-repl-newline-and-indent))) + + + (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 (consult :host github :repo "minad/consult")) @@ -763,47 +806,6 @@ if ripgrep is installed, otherwise `consult-grep'." (setup (:straight geiser)) -(setup common-lisp-ide - (defvar acdw/cl-ide :sly) - (defvar acdw/lisp-bin (or (executable-find "sbcl") - (executable-find "clisp"))) - (:needs acdw/lisp-bin) - (:option inferior-lisp-program acdw/lisp-bin) - - (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)) - - (define-key slime-repl-mode-map (kbd "RET") #'slime-repl-return-at-end) - (define-key slime-repl-mode-map (kbd "") - #'slime-repl-return-at-end) - - (defun slime-repl-return-at-end () - (interactive) - (if (<= (point-max) (point)) - (slime-repl-return) - (slime-repl-newline-and-indent))) - - - (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 :repo "https://git.carcosa.net/jmcbray/gemini.el.git")) -- cgit 1.4.1-21-gabe81