about summary refs log tree commit diff
path: root/configs/shared/emacs/.emacs.d/wpc/packages/wpc-lisp.el
diff options
context:
space:
mode:
Diffstat (limited to 'configs/shared/emacs/.emacs.d/wpc/packages/wpc-lisp.el')
-rw-r--r--configs/shared/emacs/.emacs.d/wpc/packages/wpc-lisp.el53
1 files changed, 28 insertions, 25 deletions
diff --git a/configs/shared/emacs/.emacs.d/wpc/packages/wpc-lisp.el b/configs/shared/emacs/.emacs.d/wpc/packages/wpc-lisp.el
index c15c4526c2ee..cebe7b265761 100644
--- a/configs/shared/emacs/.emacs.d/wpc/packages/wpc-lisp.el
+++ b/configs/shared/emacs/.emacs.d/wpc/packages/wpc-lisp.el
@@ -3,6 +3,18 @@
 
 ;;; Commentary:
 ;; This hosts things like Paredit settings
+;;
+;; Here is some of the thinking behind some of the keybindings:
+;;
+;; slurp    s
+;; barf     S
+;; forward  )
+;; backward (
+;;
+;; Known concession: s and S eclipse Vim bindings.  There is a precedent already
+;; for eclipsing the s binding for window splitting.  Shift-s feel appropriate
+;; for barfing, since eclisping the b KBD feels less acceptable than eclisping
+;; the s KBD.
 
 ;;; Code:
 
@@ -13,33 +25,24 @@
 
 ;; Elisp
 (use-package elisp-slime-nav
-  :ghook
-  'emacs-lisp-mode
-  'ielm-mode)
-
-;; Here is some of the thinking behind some of the keybindings:
-;;
-;; slurp    s
-;; barf     S
-;; forward  )
-;; backward (
-;;
-;; Known concession: s and S eclipse Vim bindings. There is a precedent already
-;; for eclipsing the s binding for window splitting. Shift-s feel appropriate
-;; for barfing, since eclisping the b KBD feels less acceptable than eclisping
-;; the s KBD.
+  :config
+  (general-add-hook 'emacs-lisp-mode #'ielm-mode))
 
 ;; paredit LISP editing
 (use-package paredit
-  :general
-  (general-unbind paredit-mode-map "C-j" "M-q")
-  (n paredit-mode-map
-     "s)" 'paredit-forward-slurp-sexp
-     "s(" 'paredit-backward-slurp-sexp
-     "S)" 'paredit-forward-barf-sexp
-     "S(" 'paredit-backward-barf-sexp
-     "gr" 'paredit-raise-sexp)
-  :ghook (wpc/lisp-mode-hooks #'enable-paredit-mode))
+  :config
+  (general-unbind
+    :keymaps 'paredit-mode-map
+    "C-j"
+    "M-q")
+  (general-nmap
+    :keymaps 'paredit-mode-map
+     "s)" #'paredit-forward-slurp-sexp
+     "s(" #'paredit-backward-slurp-sexp
+     "S)" #'paredit-forward-barf-sexp
+     "S(" #'paredit-backward-barf-sexp
+     "gr" #'paredit-raise-sexp)
+  (general-add-hook wpc/lisp-mode-hooks #'enable-paredit-mode))
 
 (provide 'wpc-lisp)
-;;; lisp.el ends here
+;;; wpc-lisp.el ends here