From c7956638db01c5e1fcd2530637ac6ab28dada54d Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Tue, 26 Apr 2016 13:04:14 +0200
Subject: Emacs: Use :config more

---
 tag-emacs/emacs.d/init.org | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/tag-emacs/emacs.d/init.org b/tag-emacs/emacs.d/init.org
index a8fa691a..739180b6 100644
--- a/tag-emacs/emacs.d/init.org
+++ b/tag-emacs/emacs.d/init.org
@@ -140,11 +140,10 @@ in modes for webdev because [[web-mode]] includes that functionality.
 
 Highlighting quasi-quoted expressions in lisps is quite useful.
 #+BEGIN_SRC emacs-lisp
-(use-package highlight-stages
-  :defer t
-  :diminish highlight-stages-mode
-  :init (progn
-          (add-hook 'lisp-mode-common-hook #'highlight-stages-mode)))
+  (use-package highlight-stages
+    :diminish highlight-stages-mode
+    :config (progn
+              (add-hook 'lisp-mode-common-hook #'highlight-stages-mode)))
 #+END_SRC
 
 ** Fonts
@@ -314,9 +313,9 @@ based upon some folder conventions I use.
            ("s-x s-f" . projectile-find-file)
            ("C-x g" . projectile-vc)
            ("s-G"   . projectile-vc))
-    :init (projectile-global-mode)
     :diminish projectile-mode
     :config (progn
+              (projectile-global-mode)
               (add-to-list 'projectile-globally-ignored-directories ".stversions")
               (defun ap/subfolder-projects (dir)
                 (--map (file-relative-name it dir)
@@ -2218,12 +2217,11 @@ movement commands are much more interesting.
 #+BEGIN_SRC emacs-lisp
   (use-package paredit
     :diminish "()"
-    :commands (paredit-mode)
-    :init (progn
-            (add-hook 'lisp-mode-common-hook #'enable-paredit-mode)
-            (put #'paredit-forward-delete 'delete-selection 'supersede)
-            (put #'paredit-backward-delete 'delete-selection 'supersede)
-            (add-hook 'eval-expression-minibuffer-setup-hook #'enable-paredit-mode)))
+    :config (progn
+              (add-hook 'lisp-mode-common-hook #'enable-paredit-mode)
+              (put #'paredit-forward-delete 'delete-selection 'supersede)
+              (put #'paredit-backward-delete 'delete-selection 'supersede)
+              (add-hook 'eval-expression-minibuffer-setup-hook #'enable-paredit-mode)))
 #+END_SRC
 
 ** smartparens
-- 
cgit 1.4.1