summaryrefslogtreecommitdiff
path: root/.emacs.d
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2020-05-31 14:57:33 -0700
committerSean Whitton <spwhitton@spwhitton.name>2020-05-31 18:56:14 -0700
commit68ec3fbe4396a41cac8f9e816990bd05acc3c8c9 (patch)
tree861b3c6bac6565a75300e34ed9e79fd004c0fd30 /.emacs.d
parent0670fff6c1151c84307e1c87794697b04435423b (diff)
downloaddotfiles-68ec3fbe4396a41cac8f9e816990bd05acc3c8c9.tar.gz
move some more lisp stuff and mark where use-package usage begins
Diffstat (limited to '.emacs.d')
-rw-r--r--.emacs.d/init-spw.el24
1 files changed, 8 insertions, 16 deletions
diff --git a/.emacs.d/init-spw.el b/.emacs.d/init-spw.el
index 4126884c..0ab40598 100644
--- a/.emacs.d/init-spw.el
+++ b/.emacs.d/init-spw.el
@@ -202,6 +202,8 @@ add places the library might be available to `load-path'."
(with-eval-after-load 'org
(spw/remap-mark-command 'org-mark-subtree org-mode-map))
+(show-paren-mode 1)
+
;; In an effort to reduce chording with the control key, provide
;; alternative access to the C-c and C-x keymaps. Use right alt for
;; M-r, left alt for M-i.
@@ -308,16 +310,15 @@ add places the library might be available to `load-path'."
(define-key paredit-mode-map "\M-s" nil)
(define-key paredit-mode-map "\M-U" #'paredit-splice-sexp))
-;;;; ---- packages ----
+(spw/when-library-available elisp-slime-nav
+ (dolist (hook '(emacs-lisp-mode-hook ielm-mode-hook))
+ (add-hook hook #'elisp-slime-nav-mode)))
-;; TODO would be good to use the :after use-package keyword rather
-;; than nesting use-package statements, for dependencies. For
-;; sub-packages/addons (e.g., I think, notmuch-message), nesting might
-;; still make most sense.
-;;; sexp management
-(show-paren-mode 1)
+
+;;;; ---- packages ----
+(require 'use-package)
(defmacro spw--add-mode-pairs (hook pairs)
`(add-hook
@@ -848,15 +849,6 @@ Passes ARG to `projectile-switch-project-by-name'."
(use-package haskell-tab-indent
:if (spw--optional-pkg-available-p "haskell-tab-indent"))
-;;; jump back and forth to and from Emacs lisp definitions with
-;;; M-. and M-, and C-c C-d [C-]d to describe
-
-(use-package elisp-slime-nav
- :if (spw--optional-pkg-available-p "elisp-slime-nav")
- :commands (turn-on-elisp-slime-nav-mode elisp-slime-nav-mode)
- :init (dolist (hook '(emacs-lisp-mode-hook ielm-mode-hook))
- (add-hook hook 'elisp-slime-nav-mode)))
-
;;; automatic whitespace handling
(use-package ws-butler