From 097221e724d823ef1ac56d42c5405ad303ffbdee Mon Sep 17 00:00:00 2001
From: Wojciech Kozlowski <wk@wojciechkozlowski.eu>
Date: Sun, 27 Aug 2017 16:25:44 +0100
Subject: [PATCH] Configure loads with use-package correctly

---
 modules/editing.el         | 23 ++++++++++++++---------
 modules/version-control.el |  3 ++-
 modules/workflow.el        | 13 ++++++++-----
 3 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/modules/editing.el b/modules/editing.el
index 86000e8..ff922fc 100644
--- a/modules/editing.el
+++ b/modules/editing.el
@@ -31,16 +31,21 @@
   ;; --------------------------------------------------------------------------
   ;; Parentheses highlighting.
   ;; --------------------------------------------------------------------------
-  (use-package rainbow-delimiters)
-  (add-hook 'prog-mode-hook 'rainbow-delimiters-mode)
+  (use-package rainbow-delimiters
+    :defer t
+    :init
+    (add-hook 'prog-mode-hook 'rainbow-delimiters-mode))
 
-  (use-package highlight-parentheses)
-  (add-hook 'prog-mode-hook 'show-paren-mode)
-  (add-hook 'prog-mode-hook 'highlight-parentheses-mode)
-  (setq hl-paren-colors '("#86DC2F"
-                          "IndianRed1"
-                          "IndianRed3"
-                          "IndianRed4"))
+  (use-package highlight-parentheses
+    :defer t
+    :init
+    (add-hook 'prog-mode-hook 'show-paren-mode)
+    (add-hook 'prog-mode-hook 'highlight-parentheses-mode)
+    :config
+    (setq hl-paren-colors '("#86DC2F"
+                            "IndianRed1"
+                            "IndianRed3"
+                            "IndianRed4")))
 
   ;; --------------------------------------------------------------------------
   ;; Use UTF-8.
diff --git a/modules/version-control.el b/modules/version-control.el
index 26364ea..dc7d107 100644
--- a/modules/version-control.el
+++ b/modules/version-control.el
@@ -29,7 +29,8 @@
   ;; --------------------------------------------------------------------------
   ;; Load and configure `magit'.
   ;; --------------------------------------------------------------------------
-  (use-package magit)
+  (use-package magit
+    :defer t)
 
   ;; --------------------------------------------------------------------------
   ;; Diff mode settings.
diff --git a/modules/workflow.el b/modules/workflow.el
index b29ea0f..0d4a95e 100644
--- a/modules/workflow.el
+++ b/modules/workflow.el
@@ -30,11 +30,14 @@
   ;; Enable `workgroups'.
   ;; --------------------------------------------------------------------------
 
-  (use-package workgroups2)
+  (use-package workgroups2
+    :defer t
+    :config
+    ;; Don't save.  Workgroups are transient to the session.
+    (setq wg-emacs-exit-save-behavior           nil)
+    (setq wg-workgroups-mode-exit-save-behavior nil))
+
+  ;; Enable workgroups mode.
   (workgroups-mode 1)
 
-  ;; Don't save.  Workgroups are transient to the session.
-  (setq wg-emacs-exit-save-behavior           nil)
-  (setq wg-workgroups-mode-exit-save-behavior nil)
-
   )