1 files changed, 13 insertions, 39 deletions

@@ -2252,6 +2252,19 @@ the default is \"/\"."
 (setup (:straight page-break-lines)
   (global-page-break-lines-mode +1))
 
+(setup (:straight paredit)
+  (:bind "DEL" #'paredit-backward-delete
+         "C-<backspace>" #'paredit-backward-kill-word
+         "M-w" #'paredit-copy-as-kill
+         "RET" #'paredit-newline)
+  (:unbind "C-j"                        ; paredit-newline
+           )
+  (:hook-into emacs-lisp-mode lisp-interaction-mode
+              ielm-mode sly-repl-mode
+              lisp-mode scheme-mode)
+  (:also-load eldoc)
+  (eldoc-add-command 'paredit-backward-delete 'paredit-close-round))
+
 ;; (setup (:straight paredit)
 ;;   (:bind "DEL" #'paredit-backward-delete
 ;;          "C-<backspace>" #'paredit-backward-kill-word
@@ -2399,45 +2412,6 @@ the default is \"/\"."
 
     (:bind "C-c C-c" #'sly-mrepl-return)))
 
-(setup (:straight smartparens)
-  (require 'smartparens-config)
-  (sp-use-paredit-bindings)
-  (add-to-list 'sp-lisp-modes 'fennel-mode :append)
-
-  (dolist (mode '(cider-repl-mode-hook
-                  clojure-mode-hook
-                  common-lisp-mode-hook
-                  emacs-lisp-mode-hook
-                  fennel-mode-hook
-                  geiser-repl-mode-hook
-                  inferior-emacs-lisp-mode-hook
-                  inferior-lisp-mode-hook
-                  lisp-mode-hook
-                  racket-mode-hook
-                  racket-repl-mode-hook
-                  scheme-mode-hook
-                  sly-mrepl-mode-hook))
-    (add-hook mode #'smartparens-strict-mode))
-  
-  (dolist (mode '(eval-expression-minibuffer-setup-hook
-                  lisp-data-mode-hook))
-    (add-hook mode #'aorst/minibuffer-enable-sp))
-  
-  (add-hook 'prog-mode #'smartparens-mode)
-
-  (defun aorst/minibuffer-enable-sp ()
-    "Enable `smartparens-strict-mode' in the minibuffer, during `eval-expression'."
-    (setq-local comment-start ";")
-    (sp-local-pair 'minibuffer-pairs "'" nil :actions nil)
-    (sp-local-pair 'minibuffer-pairs "`" nil :actions nil)
-    (sp-update-local-pairs 'minibuffer-pairs)
-    (smartparens-strict-mode 1))
-  
-  (:bind "C-M-q" #'sp-indent-defun
-         "M-r" #'sp-rewrap-sexp)
-  (:unbind "M-j"                        ; sp-join-sexp
-           ))
-
 (setup (:straight (spongebob-case
                    :host github
                    :repo "duckwork/spongebob-case.el"))