Do away with lispy-modes and overcomplex configuration

2 files changed, 17 insertions, 25 deletions

@@ -1914,26 +1914,27 @@ the default is \"/\"."
 (setup (:straight paredit)
   ;; I don't use paredit-splice-sexp much, and it stomps on isearch.
   (:unbind "M-s")
-  
-  (defun paredit@setup ()
-    "Correct weirdnesses and set up paredit mode."
-    (:with-map lisp-mode-shared-map
-      (:bind "DEL" #'paredit-backward-delete
-             "C-M-;" #'comment-or-uncomment-sexp
-             "C-<backspace>" #'paredit-backward-kill-word
-             "M-w" #'paredit-copy-as-kill))
-    (paredit-mode +1))
-
-  (dolist (mode lispy-modes)
-    (add-hook (intern (format "%s-hook" mode))
-              #'paredit@setup))
+
+  (:bind "DEL" #'paredit-backward-delete
+         "C-M-;" #'comment-or-uncomment-sexp
+         "C-<backspace>" #'paredit-backward-kill-word
+         "M-w" #'paredit-copy-as-kill)
+
+  (:hook-into emacs-lisp-mode
+              ielm-mode sly-repl-mode
+              lisp-mode
+              lisp-interaction-mode
+              scheme-mode)
   
   (:also-load eldoc)
   (eldoc-add-command 'paredit-backward-delete 'paredit-close-round))
 
 (setup (:straight paren-face)
-  (dolist (mode lispy-modes)
-    (add-hook (intern (format "%s-hook" mode)) #'paren-face-mode)))
+  (:hook-into emacs-lisp-mode
+              ielm-mode sly-repl-mode
+              lisp-mode
+              lisp-interaction-mode
+              scheme-mode))
 
 (setup (:straight-if (pdf-tools
                       :host github
@@ -2,16 +2,6 @@
 ;;
 ;; Extras for Lisp modes.
 
-(defvar lispy-modes '(emacs-lisp-mode
-                      eval-expression-minibuffer
-                      ielm-mode
-                      lisp-mode
-                      lisp-interaction-mode
-                      scheme-mode
-                      slime-repl-mode
-                      sly-mrepl-mode)
-  "List of modes that are lisp-like enough to hook packages into.")
-
 (defun acdw/eval-region-or-buffer ()
   (interactive)
   (if (region-active-p)
@@ -23,3 +13,4 @@
       (eval-buffer))))
 
 (provide 'acdw-lisp)
+;;; acdw-lisp.el ends here