Revert "Defer packages by default using use-package-always-defer"

This reverts commit 29c78ce841 and all other fixes
that have been made afterwards.

The motivation is that use-package is seen by many as a replacement for
`require`. Is use-package always defer the loading of packages then is breaks
this use case, this does not respect POLA so even if it was making Spacemacs
loading faster (up to 3s faster on some startup on my machine) we just cannot
use it, it would be irresponsible. Spacemacs should be easy to use, loading
performance will come with time but it is not a priority.

doc/LAYERS.org

@@ -228,16 +228,16 @@ The aspiring layer author is recommended to have a look at the =use-package=
 This simply loads Helm. It is essentially equivalent to =(require 'helm)=.
 
 #+begin_src emacs-lisp
-(use-package helm)
+(use-package helm
+  :defer t)
 #+end_src
 
-By default =use-package= will try to defer the loading of the packages by using
-the auto-load facility and the auto-load commands provided by the package source
-code. So actually in the example above the code won't load =Helm= until one of
-the auto-loaded functions is called.
+This defers the loading of Helm using the auto-load facility and the auto-load
+commands provided by the Helm source code. It is, in fact, a no-op.
 
 #+begin_src emacs-lisp
 (use-package helm
+  :defer t
   :init
   ;; Code to execute before Helm is loaded
   :config
@@ -251,15 +251,6 @@ section is not executed until after loading, if ever. It is essentially
 equivalent to simply running the =:init= block, and then adding the =:config=
 block in an =with-eval-after-load=.
 
-#+begin_src emacs-lisp
-(use-package helm
-  :demand t)
-#+end_src
-
-=:demand t= will force the package to be fully loaded right away. It
-effectively disable lazy loading.
-
-
 #+begin_src emacs-lisp
 (use-package helm
   :commands (helm-find-files helm-M-x))

doc/VIMUSERS.org

@@ -386,12 +386,14 @@ that allows easy lazy-loading and configuration of packages. Here are the basics
 to using it:
 
 #+BEGIN_SRC emacs-lisp
-  ;; Basic form of use-package declaration. By default the package will be
-  ;; lazy loaded.
-  (use-package package-name)
+  ;; Basic form of use-package declaration. The :defer t tells use-package to
+  ;; try to lazy load the package.
+  (use-package package-name
+    :defer t)
   ;; The :init section is run before the package loads. The :config section is
   ;; run after the package loads
   (use-package package-name
+    :defer t
     :init
     (progn
       ;; Change some variables

layers/+chat/erc/packages.el

@@ -46,6 +46,7 @@
 (defun erc/init-erc ()
   "Initialize ERC"
   (use-package erc
+    :defer t
     :init
     (progn
       (spacemacs/set-leader-keys
@@ -58,6 +59,7 @@
     :config
     (progn
       (use-package erc-autoaway
+        :defer t
         :init
         (setq erc-auto-discard-away t
               erc-autoaway-idle-seconds 600
@@ -115,6 +117,7 @@
   (spacemacs|use-package-add-hook erc
     :post-config
     (use-package erc-sasl
+      :defer t
       :if erc-enable-sasl-auth
       ;; Following http://www.emacswiki.org/emacs/ErcSASL
       ;; Maybe an advice would be better?
@@ -183,6 +186,7 @@
 
 (defun erc/init-erc-view-log ()
   (use-package erc-view-log
+    :defer t
     :init
     (progn
       (setq erc-log-channels-directory
@@ -215,6 +219,7 @@
 
 (defun erc/init-erc-image ()
   (use-package erc-image
+    :defer t
     :init (with-eval-after-load 'erc
             (require 'erc-image)
             (add-to-list 'erc-modules 'image))))

layers/+chat/jabber/packages.el

@@ -13,6 +13,7 @@
 
 (defun jabber/init-jabber ()
   (use-package jabber
+    :defer t
     :init
     (progn
       (add-hook 'jabber-post-connect-hooks 'spacemacs/jabber-connect-hook)

layers/+chat/rcirc/packages.el

@@ -45,6 +45,7 @@
 
 (defun rcirc/init-rcirc ()
   (use-package rcirc
+    :defer t
     :init
     (progn
       (spacemacs/add-to-hook 'rcirc-mode-hook '(rcirc-omit-mode
@@ -90,10 +91,11 @@
       (require 'rcirc-color))))
 
 (defun rcirc/init-rcirc-color ()
-  (use-package rcirc-color))
+  (use-package rcirc-color :defer t))
 
 (defun rcirc/init-rcirc-notify ()
   (use-package rcirc-notify
+    :defer t
     :config
     (progn
       (add-hook 'rcirc-notify-page-me-hooks 'spacemacs/rcirc-notify-beep))))

layers/+chat/slack/packages.el

@@ -27,6 +27,7 @@
 
 (defun slack/init-alert ()
   (use-package alert
+    :defer t
     :init (setq alert-default-style 'notifier)))
 
 (defun slack/post-init-emoji-cheat-sheet-plus ()
@@ -57,6 +58,7 @@
   "Initialize Slack"
   (use-package slack
     :commands (slack-start)
+    :defer t
     :init
     (progn
       (spacemacs/set-leader-keys

layers/+checkers/spell-checking/packages.el

@@ -22,6 +22,7 @@
 
 (defun spell-checking/init-auto-dictionary ()
   (use-package auto-dictionary
+    :defer t
     :if spell-checking-enable-auto-dictionary
     :init
     (progn
@@ -39,6 +40,7 @@
 
 (defun spell-checking/init-flyspell ()
   (use-package flyspell
+    :defer t
     :commands (spell-checking/change-dictionary)
     :init
     (progn
@@ -92,6 +94,7 @@
 
 (defun spell-checking/init-flyspell-popup ()
   (use-package flyspell-popup
+    :defer t
     :init
     (progn
       (setq flyspell-popup-correct-delay 0.8)

layers/+checkers/syntax-checking/packages.el

@@ -18,6 +18,7 @@
 
 (defun syntax-checking/init-flycheck ()
   (use-package flycheck
+    :defer t
     :init
     (progn
       (setq flycheck-standard-error-navigation nil
@@ -99,6 +100,7 @@
 (defun syntax-checking/init-flycheck-pos-tip ()
   (use-package flycheck-pos-tip
     :if syntax-checking-enable-tooltips
+    :defer t
     :init
     (with-eval-after-load 'flycheck
       (flycheck-pos-tip-mode))))

layers/+completion/auto-completion/README.org

@@ -175,6 +175,7 @@ In the file =packages.el= of the python layer:
 
   (defun python/init-company-anaconda ()
     (use-package company-anaconda
+      :defer t
       :init
       (spacemacs|add-company-backends
          :backends company-anaconda

layers/+completion/auto-completion/packages.el

@@ -30,6 +30,7 @@
 ;; to be moved to spell-checking layer as well
 (defun auto-completion/init-ac-ispell ()
   (use-package ac-ispell
+    :defer t
     :init
     (progn
       (setq ac-ispell-requires 4)
@@ -40,6 +41,7 @@
 
 (defun auto-completion/init-auto-complete ()
   (use-package auto-complete
+    :defer t
     :init
     (setq ac-auto-start 0
           ac-delay auto-completion-idle-delay
@@ -66,6 +68,7 @@
 
 (defun auto-completion/init-auto-yasnippet ()
   (use-package auto-yasnippet
+    :defer t
     :init
     (progn
       (setq aya-persist-snippets-dir
@@ -79,6 +82,7 @@
 
 (defun auto-completion/init-company ()
   (use-package company
+    :defer t
     :init
     (progn
       (setq company-idle-delay auto-completion-idle-delay
@@ -117,6 +121,7 @@
 (defun auto-completion/init-company-statistics ()
   (use-package company-statistics
     :if auto-completion-enable-sort-by-usage
+    :defer t
     :init
     (progn
       (setq company-statistics-file (concat spacemacs-cache-directory
@@ -124,7 +129,7 @@
       (add-hook 'company-mode-hook 'company-statistics-mode))))
 
 (defun auto-completion/init-fuzzy ()
-  (use-package fuzzy))
+  (use-package fuzzy :defer t))
 
 (defun auto-completion/init-company-quickhelp ()
   (use-package company-quickhelp
@@ -139,6 +144,7 @@
 
 (defun auto-completion/init-helm-c-yasnippet ()
   (use-package helm-c-yasnippet
+    :defer t
     :init
     (progn
       (spacemacs/set-leader-keys "is" 'spacemacs/helm-yas)
@@ -147,6 +153,7 @@
 (defun auto-completion/init-helm-company ()
   (use-package helm-company
     :if (configuration-layer/package-used-p 'company)
+    :defer t
     :init
     (with-eval-after-load 'company
       (define-key company-active-map (kbd "C-/") 'helm-company))))

layers/+completion/helm/packages.el

@@ -36,6 +36,7 @@
 
 (defun helm/init-ace-jump-helm-line ()
   (use-package ace-jump-helm-line
+    :defer t
     :init
     (with-eval-after-load 'helm
       (define-key helm-map (kbd "C-q") 'ace-jump-helm-line))))
@@ -58,6 +59,7 @@
 
 (defun helm/init-helm ()
   (use-package helm
+    :defer 1
     :commands (spacemacs/helm-find-files
                helm-current-directory)
     :init
@@ -146,6 +148,7 @@
 
 (defun helm/init-helm-ag ()
   (use-package helm-ag
+    :defer t
     :init
     (progn
       (defun spacemacs//helm-do-ag-region-or-symbol (func &optional dir)
@@ -578,6 +581,7 @@ Search for a search tool in the order provided by `dotspacemacs-search-tools'."
 
 (defun helm/init-helm-descbinds ()
   (use-package helm-descbinds
+    :defer t
     :init
     (progn
       (setq helm-descbinds-window-style 'split)
@@ -594,10 +598,11 @@ Search for a search tool in the order provided by `dotspacemacs-search-tools'."
       (helm-flx-mode))))
 
 (defun helm/init-helm-flx ()
-  (use-package helm-flx))
+  (use-package helm-flx :defer t))
 
 (defun helm/init-helm-make ()
   (use-package helm-make
+    :defer t
     :init
     (spacemacs/set-leader-keys
       "cc" 'helm-make-projectile
@@ -605,6 +610,7 @@ Search for a search tool in the order provided by `dotspacemacs-search-tools'."
 
 (defun helm/init-helm-mode-manager ()
   (use-package helm-mode-manager
+    :defer t
     :init
     (spacemacs/set-leader-keys
       "hM"    'helm-switch-major-mode
@@ -672,6 +678,7 @@ Search for a search tool in the order provided by `dotspacemacs-search-tools'."
 
 (defun helm/init-helm-swoop ()
   (use-package helm-swoop
+    :defer t
     :init
     (progn
       (setq helm-swoop-split-with-multiple-windows t
@@ -701,6 +708,7 @@ Search for a search tool in the order provided by `dotspacemacs-search-tools'."
 
 (defun helm/init-helm-themes ()
   (use-package helm-themes
+    :defer t
     :init
     (spacemacs/set-leader-keys
       "Ts" 'spacemacs/helm-themes)))

layers/+completion/ivy/packages.el

@@ -50,7 +50,6 @@
 
 (defun ivy/init-counsel ()
   (use-package counsel
-    :demand t
     :init
     (progn
       (spacemacs/set-leader-keys
@@ -161,10 +160,11 @@
     "re" 'spacemacs/ivy-evil-registers))
 
 (defun ivy/init-flx ()
-  (use-package flx :demand t))
+  (use-package flx))
 
 (defun ivy/init-helm-make ()
   (use-package helm-make
+    :defer t
     :init
     (progn
       (setq helm-make-completion-method 'ivy)
@@ -177,7 +177,6 @@
 
 (defun ivy/init-ivy ()
   (use-package ivy
-    :demand t
     :init
     (progn
       ;; Key bindings
@@ -214,11 +213,12 @@
       (setq ivy-use-selectable-prompt t))))
 
 (defun ivy/init-ivy-hydra ()
-  (use-package ivy-hydra :demand t)
+  (use-package ivy-hydra)
   (define-key hydra-ivy/keymap [escape] 'hydra-ivy/keyboard-escape-quit-and-exit))
 
 (defun ivy/init-ivy-rich ()
   (use-package ivy-rich
+    :defer t
     :init
     (progn
       (setq ivy-rich-abbreviate-paths t
@@ -247,6 +247,7 @@
 
 (defun ivy/init-ivy-xref ()
   (use-package ivy-xref
+    :defer t
     :init
     (progn
       (setq xref-prompt-for-identifier '(not xref-find-definitions
@@ -315,13 +316,13 @@
 
 (defun ivy/init-smex ()
   (use-package smex
+    :defer t
     :init (setq-default smex-history-length 32
                         smex-save-file (concat spacemacs-cache-directory
                                                ".smex-items"))))
 
 (defun ivy/init-swiper ()
   (use-package swiper
-    :demand t
     :config
     (progn
       (spacemacs/set-leader-keys

layers/+distributions/spacemacs-base/packages.el

@@ -66,6 +66,7 @@
 
 (defun spacemacs-base/init-ace-window ()
   (use-package ace-window
+    :defer t
     :init
     (progn
       (spacemacs/set-leader-keys
@@ -85,6 +86,7 @@
 
 (defun spacemacs-base/init-bookmark ()
   (use-package bookmark
+    :defer t
     :init
     (progn
       (setq bookmark-default-file (concat spacemacs-cache-directory "bookmarks")
@@ -135,6 +137,7 @@
 ;; ```
 (defun spacemacs-base/init-ediff ()
   (use-package ediff
+    :defer t
     :init
     (progn
       ;; first we set some sane defaults
@@ -151,6 +154,7 @@
 
 (defun spacemacs-base/init-eldoc ()
   (use-package eldoc
+    :defer t
     :config
     (progn
       ;; enable eldoc in `eval-expression'
@@ -166,8 +170,7 @@
     :config (spacemacs|hide-lighter evil-escape-mode)))
 
 (defun spacemacs-base/init-evil-evilified-state ()
-  (use-package evil-evilified-state
-    :demand t)
+  (use-package evil-evilified-state)
   (define-key evil-evilified-state-map (kbd dotspacemacs-leader-key)
     spacemacs-default-map))
 
@@ -215,7 +218,6 @@
 
 (defun spacemacs-base/init-hybrid-mode ()
   (use-package hybrid-mode
-    :demand t
     :config
     (progn
       (when (eq 'hybrid dotspacemacs-editing-style) (hybrid-mode))
@@ -262,11 +264,11 @@
 
 (defun spacemacs-base/init-imenu ()
   (use-package imenu
+    :defer t
     :init (spacemacs/set-leader-keys "ji" 'imenu)))
 
 (defun spacemacs-base/init-linum ()
   (use-package linum
-    :demand t
     :init
     (progn
       (setq linum-format "%4d")
@@ -301,6 +303,7 @@
 
 (defun spacemacs-base/init-pcre2el ()
   (use-package pcre2el
+    :defer t
     :init
     (progn
       (spacemacs/declare-prefix "xr" "regular expressions")
@@ -390,6 +393,7 @@
 
 (defun spacemacs-base/init-recentf ()
   (use-package recentf
+    :defer t
     :init
     (progn
       ;; lazy load recentf
@@ -437,6 +441,7 @@
 
 (defun spacemacs-base/init-spacemacs-theme ()
   (use-package spacemacs-theme
+    :defer t
     :init
     (progn
       (setq spacemacs-theme-comment-bg t)
@@ -444,6 +449,7 @@
 
 (defun spacemacs-base/init-subword ()
   (use-package subword
+    :defer t
     :init
     (progn
       (unless (category-docstring ?U)
@@ -489,6 +495,7 @@
 
 (defun spacemacs-base/init-whitespace ()
   (use-package whitespace
+    :defer t
     :init
     (progn
       (setq spacemacs-show-trailing-whitespace t)

layers/+distributions/spacemacs-bootstrap/packages.el

@@ -280,7 +280,6 @@
 (defun spacemacs-bootstrap/init-use-package ()
   (require 'use-package)
   (setq use-package-verbose init-file-debug
-        use-package-always-defer t
         ;; inject use-package hooks for easy customization of stock package
         ;; configuration
         use-package-inject-hooks t))

layers/+emacs/better-defaults/packages.el

@@ -16,6 +16,7 @@
 
 (defun better-defaults/init-mwim ()
   (use-package mwim
+    :defer t
     :init
     (progn
       (if better-defaults-move-to-beginning-of-code-first
@@ -28,6 +29,7 @@
 
 (defun better-defaults/init-unfill ()
   (use-package unfill
+    :defer t
     :commands (unfill-region unfill-paragraph unfill-toggle)
     :init
     (global-set-key [remap fill-paragraph] #'unfill-toggle)))

layers/+emacs/ibuffer/packages.el

@@ -17,6 +17,7 @@
 
 (defun ibuffer/init-ibuffer()
   (use-package ibuffer
+    :defer t
     :init
     (progn
       (spacemacs/set-leader-keys "bI" 'ibuffer)
@@ -39,6 +40,7 @@
 
 (defun ibuffer/init-ibuffer-projectile()
     (use-package ibuffer-projectile
+      :defer t
       :init
       (progn
         (defun spacemacs//ibuffer-group-by-projects ()

layers/+emacs/org/packages.el

@@ -50,6 +50,7 @@
 
 (defun org/init-evil-org ()
   (use-package evil-org
+    :defer t
     :init
     (progn
       (add-hook 'org-mode-hook 'spacemacs//evil-org-mode)
@@ -69,15 +70,17 @@
 
 (defun org/init-gnuplot ()
   (use-package gnuplot
+    :defer t
     :init (spacemacs/set-leader-keys-for-major-mode 'org-mode
             "tp" 'org-plot/gnuplot)))
 
 (defun org/init-htmlize ()
   (use-package htmlize
-   ))
+    :defer t))
 
 (defun org/init-ob ()
   (use-package ob
+    :defer t
     :init
     (progn
       (defun spacemacs//org-babel-do-load-languages ()
@@ -90,6 +93,7 @@
 
 (defun org/init-org ()
   (use-package org
+    :defer t
     :commands (orgtbl-mode)
     :init
     (progn
@@ -381,6 +385,7 @@ Will work on both org-mode and any mode that accepts plain html."
 
 (defun org/init-org-agenda ()
   (use-package org-agenda
+    :defer t
     :init
     (progn
       (setq org-agenda-restore-windows-after-quit t)
@@ -507,6 +512,7 @@ Headline^^            Visit entry^^               Filter^^                    Da
 
 (defun org/init-org-brain ()
   (use-package org-brain
+    :defer t
     :init
     (progn
       (spacemacs/set-leader-keys
@@ -539,6 +545,7 @@ Headline^^            Visit entry^^               Filter^^                    Da
 
 (defun org/init-org-mime ()
   (use-package org-mime
+    :defer t
     :init
     (progn
       (spacemacs/set-leader-keys-for-major-mode 'message-mode
@@ -548,6 +555,7 @@ Headline^^            Visit entry^^               Filter^^                    Da
 
 (defun org/init-org-pomodoro ()
   (use-package org-pomodoro
+    :defer t
     :init
     (progn
       (when (spacemacs/system-is-mac)
@@ -559,6 +567,7 @@ Headline^^            Visit entry^^               Filter^^                    Da
 
 (defun org/init-org-present ()
   (use-package org-present
+    :defer t
     :init
     (progn
       (evilified-state-evilify nil org-present-mode-keymap
@@ -624,6 +633,7 @@ Headline^^            Visit entry^^               Filter^^                    Da
 
 (defun org/init-org-journal ()
   (use-package org-journal
+    :defer t
     :commands (org-journal-new-entry org-journal-search-forever)
     :init
     (progn

layers/+emacs/semantic/packages.el

@@ -18,15 +18,16 @@
 
 (defun semantic/init-semantic ()
   (use-package semantic
+    :defer t
     :config (add-to-list 'semantic-default-submodes
                          'global-semantic-idle-summary-mode)))
 
 (defun semantic/init-srefactor ()
-  (use-package srefactor))
+  (use-package srefactor :defer t))
 
 (defun semantic/pre-init-stickyfunc-enhance ()
   (spacemacs|use-package-add-hook semantic
     :post-init (add-to-list 'semantic-default-submodes
                             'global-semantic-stickyfunc-mode)))
 (defun semantic/init-stickyfunc-enhance ()
-  (use-package stickyfunc-enhance))
+  (use-package stickyfunc-enhance :defer t))

layers/+emacs/smex/packages.el

@@ -13,6 +13,7 @@
 
 (defun smex/init-smex ()
   (use-package smex
+    :defer t
     :init
     (progn
       (setq-default smex-history-length 32

layers/+emacs/typography/packages.el

@@ -17,6 +17,7 @@
 
 (defun typography/init-typo ()
   (use-package typo
+    :defer t
     :init
     (progn
       (when typography-enable-typographic-editing
@@ -31,6 +32,7 @@
 
 (defun typography/init-tildify ()
   (use-package tildify
+    :defer t
     :init
     (progn
       (when typography-enable-typographic-editing

layers/+email/gnus/packages.el

@@ -14,6 +14,7 @@
 (defun gnus/init-gnus ()
   "Initialize my package"
   (use-package gnus
+    :defer t
     :commands gnus
     :init
     (spacemacs/set-leader-keys "ag" 'gnus)

layers/+email/mu4e/packages.el

@@ -119,6 +119,7 @@
 
 (defun mu4e/init-mu4e-alert ()
   (use-package mu4e-alert
+    :defer t
     :init (with-eval-after-load 'mu4e
             (when mu4e-enable-notifications
               (mu4e-alert-enable-notifications))
@@ -127,6 +128,7 @@
 
 (defun mu4e/init-helm-mu ()
   (use-package helm-mu
+    :defer t
     :init (dolist (m mu4e-modes)
             (spacemacs/set-leader-keys-for-major-mode m
               "S" 'helm-mu

layers/+email/notmuch/packages.el

@@ -22,14 +22,17 @@
 
 (defun notmuch/init-counsel-notmuch ()
   (use-package counsel-notmuch
+    :defer t
     :init (spacemacs/set-leader-keys "aNn" 'counsel-notmuch)))
 
 (defun notmuch/init-helm-notmuch ()
   (use-package helm-notmuch
+    :defer t
     :init (spacemacs/set-leader-keys "aNn" 'helm-notmuch)))
 
 (defun notmuch/init-notmuch ()
   (use-package notmuch
+    :defer t
     :commands notmuch
     :init
     (progn

layers/+filetree/neotree/packages.el

@@ -17,6 +17,7 @@
 
 (defun neotree/init-neotree ()
   (use-package neotree
+    :defer t
     :commands neo-global--window-exists-p
     :init
     (progn

layers/+filetree/treemacs/packages.el

@@ -25,6 +25,7 @@
 (defun treemacs/init-treemacs ()
   (use-package treemacs
     :commands (treemacs-select-window treemacs--window-number-ten)
+    :defer t
     :init
     (spacemacs/set-leader-keys
       "ft"    #'treemacs-toggle
@@ -61,12 +62,12 @@
 
 (defun treemacs/init-treemacs-evil ()
   (use-package treemacs-evil
-    :demand t
     :after treemacs
     :if (memq dotspacemacs-editing-style '(vim hybrid))))
 
 (defun treemacs/init-treemacs-projectile ()
   (use-package treemacs-projectile
+    :defer t
     :init
     (spacemacs/set-leader-keys
       "fp" #'treemacs-projectile-toggle

layers/+fonts/unicode-fonts/packages.el

@@ -17,7 +17,7 @@
 
 (defun unicode-fonts/init-persistent-soft ()
   (use-package persistent-soft
-   ))
+    :defer t))
 
 (defun unicode-fonts/init-unicode-fonts ()
   (use-package unicode-fonts

layers/+frameworks/django/packages.el

@@ -16,6 +16,7 @@
 
 (defun django/init-pony-mode ()
   (use-package pony-mode
+    :defer t
     :init (progn
             (spacemacs/declare-prefix-for-mode 'python-mode "mj" "django")
             (spacemacs/declare-prefix-for-mode 'python-mode "mja" "fabric")

layers/+frameworks/react/packages.el

@@ -45,11 +45,10 @@
   (add-hook 'react-mode-hook 'spacemacs/js-doc-require)
   (spacemacs/js-doc-set-key-bindings 'react-mode))
 
-(defun react/pre-init-smartparens ()
-  (spacemacs|use-package-add-hook smartparens
-    :post-config (if dotspacemacs-smartparens-strict-mode
-                     (add-hook 'react-mode-hook #'smartparens-strict-mode)
-                   (add-hook 'react-mode-hook #'smartparens-mode))))
+(defun react/post-init-smartparens ()
+  (if dotspacemacs-smartparens-strict-mode
+      (add-hook 'react-mode-hook #'smartparens-strict-mode)
+    (add-hook 'react-mode-hook #'smartparens-mode)))
 
 (defun react/post-init-tern ()
   (add-hook 'react-mode-hook 'tern-mode)

layers/+fun/emoji/packages.el

@@ -39,11 +39,13 @@
 
 (defun emoji/init-emojify ()
   (use-package emojify
+    :defer t
     :init
     (setq emojify-emojis-dir (concat spacemacs-cache-directory "emojify/"))))
 
 (defun emoji/init-company-emoji ()
   (use-package company-emoji
+    :defer t
     :init
     (progn
       (setq company-emoji-insert-unicode nil)

layers/+fun/games/packages.el

@@ -22,6 +22,7 @@
 
 (defun games/init-2048-game ()
   (use-package 2048-mode
+    :defer t
     :init
     (progn
       (push '("2048" . (2048-game :quit (kill-buffer-ask (get-buffer "2048"))
@@ -42,6 +43,7 @@
 
 (defun games/init-pacmacs ()
   (use-package pacmacs
+    :defer t
     :init
     (push '("pacmacs" . (pacmacs-start
                          :quit (kill-buffer-ask (get-buffer "*Pacmacs*"))
@@ -54,6 +56,7 @@
 
 (defun games/init-tetris ()
   (use-package tetris
+    :defer t
     :init
     (progn
       (push '("Tetris" . (tetris :quit spacemacs/tetris-quit-game
@@ -72,6 +75,7 @@
 
 (defun games/init-sudoku ()
   (use-package sudoku
+    :defer t
     :init
     (progn
       (push '("sudoku" . (sudoku :quit (kill-buffer-ask (get-buffer "*Sudoku*"))
@@ -117,6 +121,7 @@
 
 (defun games/init-typit ()
   (use-package typit
+    :defer t
     :init
     (progn
       (push '("typit (beginner)" .

layers/+fun/xkcd/packages.el

@@ -13,6 +13,7 @@
 
 (defun xkcd/init-xkcd ()
   (use-package xkcd-mode
+    :defer t
     :init
     (progn
       (setq xkcd-cache-dir (concat spacemacs-cache-directory "xkcd/"))

layers/+intl/chinese/packages.el

@@ -72,10 +72,11 @@
 
 (defun chinese/init-find-by-pinyin-dired ()
   (use-package find-by-pinyin-dired
-   ))
+    :defer t))
 
 (defun chinese/init-ace-pinyin ()
   (use-package ace-pinyin
+    :defer t
     :init
     (progn
       (if chinese-enable-avy-pinyin
@@ -85,6 +86,7 @@
 
 (defun chinese/init-pangu-spacing ()
   (use-package pangu-spacing
+    :defer t
     :init (progn (global-pangu-spacing-mode 1)
                  (spacemacs|hide-lighter pangu-spacing-mode)
                  ;; Always insert `real' space in org-mode.

layers/+intl/japanese/packages.el

@@ -21,7 +21,7 @@
 
 (defun japanese/init-evil-tutor-ja ()
   (use-package evil-tutor-ja
-   ))
+    :defer t))
 
 (defun japanese/init-migemo ()
   (use-package migemo
@@ -41,6 +41,7 @@
 
 (defun japanese/init-ddskk ()
   (use-package ddskk
+    :defer t
     :bind (("C-x j" . skk-mode))))
 
 (defun japanese/init-japanese-holidays ()

layers/+lang/agda/packages.el

@@ -30,6 +30,7 @@
                              (shell-command-to-string "agda-mode locate"))))
 
     (use-package agda2-mode
+      :defer t
       :init (when agda-mode-path (load-file agda-mode-path))
       (progn
         (mapc

layers/+lang/asciidoc/packages.el

@@ -17,6 +17,7 @@
     ;; We will NOT default `.txt' files to AsciiDoc mode,
     ;; and `.asciidoc' extension is just plain stupid.
     :mode (("\\.adoc?\\'" . adoc-mode))
+		:defer t
     :config
     (progn
       ;; We have quite a lot of possible keybindings.

layers/+lang/autohotkey/packages.el

@@ -16,6 +16,7 @@
 (defun autohotkey/init-ahk-mode ()
   (use-package ahk-mode
     :mode "\\.ahk\\'"
+    :defer t
     :init
     (spacemacs/set-leader-keys-for-major-mode 'ahk-mode
       "cb" 'ahk-comment-block-dwim

layers/+lang/bibtex/packages.el

@@ -30,6 +30,7 @@
 
 (defun bibtex/init-org-ref ()
   (use-package org-ref
+    :defer t
     :commands (org-ref-bibtex-next-entry
                org-ref-bibtex-previous-entry
                org-ref-open-in-browser

layers/+lang/c-c++/packages.el

@@ -39,6 +39,7 @@
 
 (defun c-c++/init-cc-mode ()
   (use-package cc-mode
+    :defer t
     :init
     (progn
       (add-to-list 'auto-mode-alist
@@ -57,6 +58,7 @@
 
 (defun c-c++/init-disaster ()
   (use-package disaster
+    :defer t
     :commands (disaster)
     :init
     (progn
@@ -88,6 +90,7 @@
 
 (defun c-c++/init-company-c-headers ()
   (use-package company-c-headers
+    :defer t
     :init (spacemacs|add-company-backends
             :backends company-c-headers
             :modes c-mode-common)))
@@ -95,6 +98,7 @@
 (defun c-c++/init-company-rtags ()
   (use-package company-rtags
     :if c-c++-enable-rtags-support
+    :defer t
     :init
     (progn
       (setq rtags-completions-enabled t)
@@ -121,6 +125,7 @@
 
 (defun c-c++/init-gdb-mi ()
   (use-package gdb-mi
+    :defer t
     :init
     (setq
      ;; use gdb-many-windows by default when `M-x gdb'
@@ -198,6 +203,7 @@
 
 (defun c-c++/init-realgud()
   (use-package realgud
+    :defer t
     :commands (realgud:gdb)
     :init
     (progn

layers/+lang/clojure/packages.el

@@ -33,6 +33,7 @@
 
 (defun clojure/init-cider ()
   (use-package cider
+    :defer t
     :init
     (progn
       (spacemacs/register-repl 'cider 'cider-jack-in "cider")
@@ -241,6 +242,7 @@
 
 (defun clojure/init-clj-refactor ()
   (use-package clj-refactor
+    :defer t
     :init
     (add-hook 'clojure-mode-hook 'clj-refactor-mode)
     :config
@@ -284,6 +286,7 @@
 
 (defun clojure/init-clojure-cheatsheet ()
   (use-package clojure-cheatsheet
+    :defer t
     :init
     (progn
       (setq sayid--key-binding-prefixes
@@ -302,6 +305,7 @@
 
 (defun clojure/init-clojure-mode ()
   (use-package clojure-mode
+    :defer t
     :init
     (progn
       (add-to-list 'auto-mode-alist '("\\.boot\\'" . clojure-mode))
@@ -337,14 +341,13 @@
     (push '("*cider-doc*" :dedicated t :position bottom :stick t :noselect nil :height 0.4)
           popwin:special-display-config)))
 
-(defun clojure/pre-init-smartparens ()
-  (spacemacs|use-package-add-hook smartparens
-    :post-config
-    (progn
-      (sp-local-pair 'clojure-mode "`" nil :actions nil)
-      (add-hook 'cider-repl-mode-hook (if dotspacemacs-smartparens-strict-mode
-                                          #'smartparens-strict-mode
-                                        #'smartparens-mode)))))
+(defun clojure/post-init-smartparens ()
+  (add-hook 'cider-repl-mode-hook
+            (if dotspacemacs-smartparens-strict-mode
+                #'smartparens-strict-mode
+              #'smartparens-mode))
+  (with-eval-after-load 'smartparens
+    (sp-local-pair 'clojure-mode "`" nil :actions nil)))
 
 (defun clojure/post-init-subword ()
   (add-hook 'cider-mode-hook 'subword-mode))
@@ -367,7 +370,7 @@
 
 (defun clojure/init-clojure-snippets ()
   (use-package clojure-snippets
-   ))
+    :defer t))
 
 (defun clojure/pre-init-org ()
   (spacemacs|use-package-add-hook org
@@ -376,6 +379,7 @@
 
 (defun clojure/init-sayid ()
   (use-package sayid
+    :defer t
     :init
     (progn
       (setq sayid--key-binding-prefixes

layers/+lang/common-lisp/funcs.el

@@ -32,11 +32,3 @@
   (interactive)
   (move-end-of-line 1)
   (slime-eval-last-expression))
-
-
-;; smartparens
-
-(defun spacemacs/slime-disable-smartparens ()
-  "Disable smartparens."
-  (smartparens-strict-mode -1)
-  (turn-off-smartparens-mode))

layers/+lang/common-lisp/packages.el

@@ -85,7 +85,12 @@
       ;; enable fuzzy matching in code buffer and SLIME REPL
       (setq slime-complete-symbol*-fancy t)
       (setq slime-complete-symbol-function 'slime-fuzzy-complete-symbol)
-      (add-hook 'slime-repl-mode-hook #'spacemacs/slime-disable-smartparens)
+      ;; enabel smartparen in code buffer and SLIME REPL
+      ;; (add-hook 'slime-repl-mode-hook #'smartparens-strict-mode)
+      (defun slime/disable-smartparens ()
+        (smartparens-strict-mode -1)
+        (turn-off-smartparens-mode))
+      (add-hook 'slime-repl-mode-hook #'slime/disable-smartparens)
       (spacemacs/add-to-hooks 'slime-mode '(lisp-mode-hook)))
     :config
     (progn

layers/+lang/coq/packages.el

@@ -22,6 +22,7 @@
 
 (defun coq/init-company-coq ()
   (use-package company-coq
+    :defer t
     :init
     (progn
       (add-hook 'coq-mode-hook #'company-coq-mode)
@@ -41,6 +42,7 @@
 (defun coq/init-proof-general ()
   (use-package proof-site
     :mode ("\\.v\\'" . coq-mode)
+    :defer t
     :init
     (progn
       (setq coq/proof-general-load-path
@@ -95,13 +97,11 @@
         ;; Insertions
         "ie" 'coq-end-Section))))
 
-(defun coq/pre-init-smartparens ()
-  (spacemacs|use-package-add-hook smartparens
-    :post-config (spacemacs/add-to-hooks
-                  (if dotspacemacs-smartparens-strict-mode
-                      'smartparens-strict-mode
-                    'smartparens-mode)
-                  '(coq-mode-hook))))
+(defun coq/post-init-smartparens ()
+  (spacemacs/add-to-hooks (if dotspacemacs-smartparens-strict-mode
+                              'smartparens-strict-mode
+                            'smartparens-mode)
+                          '(coq-mode-hook)))
 
 (defun coq/post-init-vi-tilde-fringe ()
   (spacemacs/add-to-hooks 'spacemacs/disable-vi-tilde-fringe

layers/+lang/csharp/packages.el

@@ -26,6 +26,7 @@
   ;; this should start the omnisharp server automatically
   (add-hook 'csharp-mode-hook 'omnisharp-mode)
   (use-package omnisharp
+    :defer t
     :init
     (add-to-list 'spacemacs-jump-handlers-csharp-mode
                  '(omnisharp-go-to-definition :async t))
@@ -102,7 +103,7 @@
 
 (defun csharp/init-csharp-mode ()
   (use-package csharp-mode
-   ))
+    :defer t))
 
 (defun csharp/post-init-evil-matchit ()
   (with-eval-after-load 'evil-matchit

layers/+lang/csv/packages.el

@@ -13,6 +13,7 @@
 
 (defun csv/init-csv-mode ()
   (use-package csv-mode
+    :defer t
     :init
     (progn
       (spacemacs/declare-prefix-for-mode 'csv-mode "ms" "sort")

layers/+lang/d/packages.el

@@ -30,6 +30,7 @@
 
 (defun d/init-company-dcd ()
   (use-package company-dcd
+    :defer t
     :init
     (progn
       (spacemacs|add-company-backends :backends company-dcd :modes d-mode)
@@ -40,13 +41,13 @@
         "gr" 'company-dcd-ivy-search-symbol))))
 
 (defun d/init-d-mode ()
-  (use-package d-mode))
+  (use-package d-mode :defer t))
 
 (defun d/post-init-flycheck ()
   (spacemacs/enable-flycheck 'd-mode))
 
 (defun d/init-flycheck-dmd-dub ()
-  (use-package flycheck-dmd-dub
+  (use-package flycheck-dmd-dub :defer t
     :init
     (progn
       (add-hook 'd-mode-hook 'flycheck-dmd-dub-set-include-path)

layers/+lang/elixir/packages.el

@@ -33,6 +33,7 @@
 
 (defun elixir/init-alchemist ()
   (use-package alchemist
+    :defer t
     :init
     (progn
       (spacemacs/register-repl 'alchemist 'alchemist-iex-run "alchemist")
@@ -158,11 +159,12 @@
 
 (defun elixir/init-flycheck-credo ()
   (use-package flycheck-credo
+    :defer t
     :init (add-hook 'flycheck-mode-hook #'flycheck-credo-setup)))
 
 (defun elixir/init-elixir-mode ()
   (use-package elixir-mode
-   ))
+    :defer t))
 
 (defun elixir/post-init-flycheck ()
   (spacemacs/enable-flycheck 'elixir-mode))

layers/+lang/elm/packages.el

@@ -29,6 +29,7 @@
 (defun elm/init-flycheck-elm ()
   "Initialize flycheck-elm"
   (use-package flycheck-elm
+    :defer t
     :init (add-hook 'flycheck-mode-hook 'flycheck-elm-setup t)))
 
 (defun elm/init-elm-mode ()
@@ -97,8 +98,7 @@
     (push '("*elm*" :tail t :noselect t) popwin:special-display-config)
     (push '("*elm-make*" :tail t :noselect t) popwin:special-display-config)))
 
-(defun elm/pre-init-smartparens ()
-  (spacemacs|use-package-add-hook smartparens
-    :post-config (if dotspacemacs-smartparens-strict-mode
-                     (add-hook 'elm-mode-hook #'smartparens-strict-mode)
-                   (add-hook 'elm-mode-hook #'smartparens-mode))))
+(defun elm/post-init-smartparens ()
+  (if dotspacemacs-smartparens-strict-mode
+      (add-hook 'elm-mode-hook #'smartparens-strict-mode)
+    (add-hook 'elm-mode-hook #'smartparens-mode)))

layers/+lang/emacs-lisp/packages.el

@@ -35,6 +35,7 @@
 
 (defun emacs-lisp/init-ielm ()
   (use-package ielm
+    :defer t
     :init
     (progn
       (spacemacs/register-repl 'ielm 'ielm)
@@ -59,6 +60,7 @@
 
 (defun emacs-lisp/init-debug ()
   (use-package debug
+    :defer t
     :init (dolist (mode '(emacs-lisp-mode lisp-interaction-mode))
             (spacemacs/declare-prefix-for-mode mode "md" "debug")
             (spacemacs/set-leader-keys-for-major-mode mode
@@ -68,6 +70,7 @@
 
 (defun emacs-lisp/init-edebug ()
   (use-package edebug
+    :defer t
     :init
     (progn
       ;; key bindings
@@ -105,6 +108,7 @@
 
 (defun emacs-lisp/init-auto-compile ()
   (use-package auto-compile
+    :defer t
     :init
     (progn
       (setq auto-compile-display-buffer nil
@@ -121,6 +125,7 @@
 (defun emacs-lisp/init-elisp-slime-nav ()
   ;; Elisp go-to-definition with M-. and back again with M-,
   (use-package elisp-slime-nav
+    :defer t
     :init
     (progn
       (add-hook 'emacs-lisp-mode-hook 'elisp-slime-nav-mode)
@@ -156,6 +161,7 @@
 
 (defun emacs-lisp/init-macrostep ()
   (use-package macrostep
+    :defer t
     :mode (("\\*.el\\'" . emacs-lisp-mode)
            ("Cask\\'" . emacs-lisp-mode))
     :init
@@ -176,6 +182,7 @@
 
 (defun emacs-lisp/init-nameless ()
   (use-package nameless
+    :defer t
     :init
     (progn
       (setq
@@ -204,6 +211,7 @@
 
 (defun emacs-lisp/init-overseer ()
   (use-package overseer
+    :defer t
     :init (spacemacs/set-leader-keys-for-major-mode 'emacs-lisp-mode
             "ta" 'overseer-test
             "tt" 'overseer-test-run-test

layers/+lang/erlang/packages.el

@@ -24,6 +24,7 @@
 
 (defun erlang/init-erlang ()
   (use-package erlang
+    :defer t
     :init
     (progn
       ;; explicitly run prog-mode hooks since erlang mode does is not

layers/+lang/ess/packages.el

@@ -121,6 +121,7 @@
 
 (defun ess/init-ess-smart-equals ()
   (use-package ess-smart-equals
+    :defer t
     :init
     (progn
       (add-hook 'ess-mode-hook 'ess-smart-equals-mode)

layers/+lang/faust/packages.el

@@ -21,6 +21,7 @@
 
 (defun faust/init-faust-mode ()
   (use-package faust-mode
+    :defer t
     :mode "\\.\\(dsp\\|lib\\)\\'"
     :init
     (progn

layers/+lang/forth/packages.el

@@ -14,6 +14,7 @@
 
 (defun forth/init-forth-mode ()
   (use-package forth-mode
+    :defer t
     :init (spacemacs/set-leader-keys-for-major-mode 'forth-mode
             "ds" 'forth-see
             "eE" 'forth-eval

layers/+lang/fsharp/packages.el

@@ -19,6 +19,7 @@
 
 (defun fsharp/init-fsharp-mode ()
   (use-package fsharp-mode
+    :defer t
     :init
     (progn
       (setq fsharp-doc-idle-delay .2)

layers/+lang/go/packages.el

@@ -36,6 +36,7 @@
 
 (defun go/init-company-go ()
   (use-package company-go
+    :defer t
     :init
     (spacemacs|add-company-backends
       :backends company-go
@@ -54,6 +55,7 @@
 
 (defun go/init-go-mode()
   (use-package go-mode
+    :defer t
     :init
     (progn
       (defun spacemacs//go-set-tab-width ()
@@ -113,6 +115,7 @@
 
 (defun go/init-godoctor ()
   (use-package godoctor
+    :defer t
     :init
     (progn
       (spacemacs/declare-prefix-for-mode 'go-mode "mr" "refactoring")
@@ -132,6 +135,7 @@
 
 (defun go/init-flycheck-gometalinter ()
   (use-package flycheck-gometalinter
+    :defer t
     :init
     (add-hook 'go-mode-hook 'spacemacs//go-enable-gometalinter t)))
 

layers/+lang/gpu/packages.el

@@ -23,19 +23,22 @@
 
 (defun gpu/init-company-glsl ()
   (use-package company-glsl
+    :defer t
     :init (spacemacs|add-company-backends
             :backends company-glsl
             :modes glsl-mode)))
 
 (defun gpu/init-cuda-mode ()
-  (use-package cuda-mode))
+  (use-package cuda-mode :defer t))
 
 (defun gpu/init-glsl-mode ()
   "Initialize GLSL mode"
   (use-package glsl-mode
+    :defer t
     :mode (("\\.fsh\\'" . glsl-mode)
            ("\\.vsh\\'" . glsl-mode))))
 
 (defun gpu/init-opencl-mode ()
   (use-package opencl-mode
+    :defer t
     :mode (("\\.cl\\'" . opencl-mode))))

layers/+lang/groovy/packages.el

@@ -22,10 +22,11 @@
 
 (defun groovy/init-groovy-imports ()
   (use-package groovy-imports
-   ))
+    :defer t))
 
 (defun groovy/init-groovy-mode ()
   (use-package groovy-mode
+    :defer t
     :init
     (progn
       (spacemacs/declare-prefix-for-mode 'groovy-mode "ms" "REPL")

layers/+lang/haskell/packages.el

@@ -32,33 +32,35 @@
 
 (defun haskell/init-cmm-mode ()
   (use-package cmm-mode
-   ))
+    :defer t))
 
 (defun haskell/init-company-cabal ()
   (use-package company-cabal
+    :defer t
     :init (spacemacs|add-company-backends
             :backends company-cabal
             :modes haskell-cabal-mode)))
 
 (defun haskell/init-company-ghci ()
   (use-package company-ghci
-   ))
+    :defer t))
 
 (defun haskell/init-company-ghc ()
   (use-package company-ghc
-   ))
+    :defer t))
 
 (defun haskell/post-init-ggtags ()
   (add-hook 'haskell-mode-local-vars-hook #'spacemacs/ggtags-mode-enable))
 
 (defun haskell/init-ghc ()
   (use-package ghc
-   ))
+    :defer t))
 
 (defun haskell/init-dante ())
 
 (defun haskell/init-intero ()
   (use-package intero
+    :defer t
     :config
     (progn
       (spacemacs|diminish intero-mode " λ" " \\")
@@ -67,6 +69,7 @@
 
 (defun haskell/init-helm-hoogle ()
   (use-package helm-hoogle
+    :defer t
     :init
     (dolist (mode haskell-modes)
       (spacemacs/set-leader-keys-for-major-mode mode "hf" 'helm-hoogle))))
@@ -81,6 +84,7 @@
 
 (defun haskell/init-haskell-mode ()
   (use-package haskell-mode
+    :defer t
     :init
     (progn
       (add-hook 'haskell-mode-local-vars-hook
@@ -268,6 +272,7 @@
 ;; doesn't support literate-haskell-mode :(
 (defun haskell/init-hindent ()
   (use-package hindent
+    :defer t
     :if haskell-enable-hindent
     :init
     (add-hook 'haskell-mode-hook #'hindent-mode)
@@ -278,6 +283,7 @@
 
 (defun haskell/init-hlint-refactor ()
   (use-package hlint-refactor
+    :defer t
     :init
     (progn
       (spacemacs/set-leader-keys-for-major-mode 'haskell-mode

layers/+lang/html/packages.el

@@ -50,6 +50,7 @@
 
 (defun html/init-company-web ()
   (use-package company-web
+    :defer t
     :init
     (progn
       (spacemacs|add-company-backends
@@ -67,6 +68,7 @@
 
 (defun html/init-css-mode ()
   (use-package css-mode
+    :defer t
     :init
     (progn
       ;; Mark `css-indent-offset' as safe-local variable
@@ -106,6 +108,7 @@
 
 (defun html/init-emmet-mode ()
   (use-package emmet-mode
+    :defer t
     :init (spacemacs/add-to-hooks 'emmet-mode '(css-mode-hook
                                                 html-mode-hook
                                                 sass-mode-hook
@@ -136,10 +139,11 @@
 
 (defun html/init-haml-mode ()
   (use-package haml-mode
-   ))
+    :defer t))
 
 (defun html/init-counsel-css ()
   (use-package counsel-css
+    :defer t
     :init (cl-loop for (mode . mode-hook) in '((css-mode . css-mode-hook)
                                             (scss-mode . scss-mode-hook))
                 do (add-hook mode-hook 'counsel-css-imenu-setup)
@@ -147,12 +151,14 @@
 
 (defun html/init-helm-css-scss ()
   (use-package helm-css-scss
+    :defer t
     :init
     (dolist (mode '(css-mode scss-mode))
       (spacemacs/set-leader-keys-for-major-mode mode "gh" 'helm-css-scss))))
 
 (defun html/init-impatient-mode ()
   (use-package impatient-mode
+    :defer t
     :init
     (progn
       (dolist (mode '(web-mode css-mode))
@@ -160,37 +166,40 @@
 
 (defun html/init-less-css-mode ()
   (use-package less-css-mode
+    :defer t
     :mode ("\\.less\\'" . less-css-mode)))
 
 (defun html/init-pug-mode ()
   (use-package pug-mode
+    :defer t
     :mode ("\\.pug$" . pug-mode)))
 
 (defun html/init-sass-mode ()
   (use-package sass-mode
+    :defer t
     :mode ("\\.sass\\'" . sass-mode)))
 
 (defun html/init-scss-mode ()
   (use-package scss-mode
+    :defer t
     :mode ("\\.scss\\'" . scss-mode)))
 
 (defun html/init-slim-mode ()
   (use-package slim-mode
-   ))
+    :defer t))
 
-(defun html/pre-init-smartparens ()
-  (spacemacs|use-package-add-hook smartparens
-    :post-config
-    (spacemacs/add-to-hooks
-     (if dotspacemacs-smartparens-strict-mode
-         'smartparens-strict-mode
-       'smartparens-mode)
-     '(css-mode-hook scss-mode-hook sass-mode-hook less-css-mode-hook)))
+(defun html/post-init-smartparens ()
+  (spacemacs/add-to-hooks
+   (if dotspacemacs-smartparens-strict-mode
+       'smartparens-strict-mode
+     'smartparens-mode)
+   '(css-mode-hook scss-mode-hook sass-mode-hook less-css-mode-hook))
 
   (add-hook 'web-mode-hook 'spacemacs/toggle-smartparens-off))
 
 (defun html/init-tagedit ()
   (use-package tagedit
+    :defer t
     :config
     (progn
       (tagedit-add-experimental-features)
@@ -199,6 +208,7 @@
 
 (defun html/init-web-mode ()
   (use-package web-mode
+    :defer t
     :config
     (progn
       (spacemacs/declare-prefix-for-mode 'web-mode "mE" "errors")

layers/+lang/idris/packages.el

@@ -24,6 +24,7 @@
 
 (defun idris/init-idris-mode ()
   (use-package idris-mode
+    :defer t
     :init (spacemacs/register-repl 'idris-mode 'idris-repl "idris")
     :config
     (progn

layers/+lang/ipython-notebook/packages.el

@@ -21,6 +21,7 @@
 
 (defun ipython-notebook/init-ein ()
   (use-package ein
+    :defer t
     :commands (ein:notebooklist-open ein:notebooklist-login)
     :init
     (progn

layers/+lang/java/packages.el

@@ -36,6 +36,7 @@
 
 (defun java/init-company-emacs-eclim ()
   (use-package company-emacs-eclim
+    :defer t
     :init
     (setq company-emacs-eclim-ignore-case nil)
     ;; see `spacemacs//java-setup-eclim-company'
@@ -43,6 +44,7 @@
 
 (defun java/init-eclim ()
   (use-package eclim
+    :defer t
     ;; :init (setq eclim-auto-save nil)
     :config
     (progn
@@ -155,6 +157,7 @@
 
 (defun java/init-ensime ()
   (use-package ensime
+    :defer t
     :commands ensime-mode
     :init
     (progn
@@ -288,6 +291,7 @@
 ;; (defun java/post-init-ensime ()
 ;;   (when (eq 'ensime java-backend)
 ;;     (use-package ensime
+;;       :defer t
 ;;       :init
 ;;       (progn
 ;;         (spacemacs//ensime-init 'java-mode t nil)
@@ -314,6 +318,7 @@
 
 (defun java/init-gradle-mode ()
   (use-package gradle-mode
+    :defer t
     :init
     (progn
       (when (configuration-layer/package-used-p 'groovy-mode)
@@ -346,6 +351,7 @@
 
 (defun java/init-java-mode ()
   (use-package java-mode
+    :defer t
     :init
     (progn
       (add-hook 'java-mode-local-vars-hook #'spacemacs//java-setup-backend)
@@ -354,6 +360,7 @@
 
 (defun java/init-maven-test-mode ()
   (use-package maven-test-mode
+    :defer t
     :init
     (when (configuration-layer/package-used-p 'java-mode)
       (add-hook 'java-mode-hook 'maven-test-mode)
@@ -374,6 +381,7 @@
 
 (defun java/init-meghanada ()
   (use-package meghanada
+    :defer t
     :init
     (progn
       (setq meghanada-server-install-dir (concat spacemacs-cache-directory
@@ -426,6 +434,7 @@
 
 (defun java/init-mvn ()
   (use-package mvn
+    :defer t
     :init
     (when (configuration-layer/package-used-p 'java-mode)
       (spacemacs/declare-prefix-for-mode 'java-mode "mm" "maven")

layers/+lang/javascript/packages.el

@@ -40,6 +40,7 @@
 
 (defun javascript/init-coffee-mode ()
   (use-package coffee-mode
+    :defer t
     :init
     (progn
       (spacemacs/register-repl 'coffee-mode 'coffee-repl "coffeescript")
@@ -65,6 +66,7 @@
   (use-package company-tern
     :if (and (configuration-layer/package-used-p 'company)
              (configuration-layer/package-used-p 'tern))
+    :defer t
     :init (spacemacs|add-company-backends
             :backends company-tern
             :modes js2-mode)))
@@ -92,10 +94,12 @@
 
 (defun javascript/init-js-doc ()
   (use-package js-doc
+    :defer t
     :init (spacemacs/js-doc-set-key-bindings 'js2-mode)))
 
 (defun javascript/init-js2-mode ()
   (use-package js2-mode
+    :defer t
     :init
     (progn
       (add-to-list 'auto-mode-alist '("\\.js\\'" . js2-mode))
@@ -123,6 +127,7 @@
 
 (defun javascript/init-js2-refactor ()
   (use-package js2-refactor
+    :defer t
     :init
     (progn
       (add-hook 'js2-mode-hook 'spacemacs/js2-refactor-require)
@@ -177,16 +182,18 @@
 
 (defun javascript/init-json-mode ()
   (use-package json-mode
-   ))
+    :defer t))
 
 (defun javascript/init-json-snatcher ()
   (use-package json-snatcher
+    :defer t
     :config
     (spacemacs/set-leader-keys-for-major-mode 'json-mode
       "hp" 'jsons-print-path)))
 
 (defun javascript/init-tern ()
   (use-package tern
+    :defer t
     :init (add-hook 'js2-mode-hook 'tern-mode)
     :config
     (progn
@@ -197,6 +204,7 @@
 
 (defun javascript/init-web-beautify ()
   (use-package web-beautify
+    :defer t
     :init
     (progn
       (spacemacs/set-leader-keys-for-major-mode 'js2-mode
@@ -210,6 +218,7 @@
 
 (defun javascript/init-skewer-mode ()
   (use-package skewer-mode
+    :defer t
     :init
     (progn
       (spacemacs/register-repl 'skewer-mode
@@ -236,6 +245,7 @@
 
 (defun javascript/init-livid-mode ()
   (use-package livid-mode
+    :defer t
     :init
     (progn
       (spacemacs|add-toggle javascript-repl-live-evaluation

layers/+lang/kotlin/packages.el

@@ -23,6 +23,7 @@
 
 (defun kotlin/init-flycheck-kotlin ()
   (use-package flycheck-kotlin
+    :defer t
     :init (add-hook 'flycheck-mode-hook #'flycheck-kotlin-setup)))
 
 (defun kotlin/post-init-ggtags ()
@@ -33,4 +34,4 @@
 
 (defun kotlin/init-kotlin-mode ()
   (use-package kotlin-mode
-   ))
+    :defer t))

layers/+lang/latex/packages.el

@@ -30,6 +30,7 @@
 
 (defun latex/init-auctex ()
   (use-package tex
+    :defer t
     :init
     (progn
       (setq TeX-command-default latex-build-command
@@ -135,10 +136,12 @@
 
 (defun latex/init-auctex-latexmk ()
   (use-package auctex-latexmk
+    :defer t
     :init (setq auctex-latexmk-inherit-TeX-PDF-mode t)))
 
 (defun latex/init-company-auctex ()
   (use-package company-auctex
+    :defer t
     :init (spacemacs|add-company-backends
             :backends
             company-auctex-labels
@@ -204,6 +207,7 @@
 
 (defun latex/init-magic-latex-buffer ()
   (use-package magic-latex-buffer
+    :defer t
     :init
     (progn
       (add-hook 'LaTeX-mode-hook 'magic-latex-buffer)

layers/+lang/lua/packages.el

@@ -25,6 +25,7 @@
 
 (defun lua/init-lua-mode ()
   (use-package lua-mode
+    :defer t
     :mode ("\\.lua\\'" . lua-mode)
     :interpreter ("lua" . lua-mode)
     :init
@@ -43,6 +44,7 @@
 
 (defun lua/init-company-lua ()
   (use-package company-lua
+    :defer t
     :init (spacemacs|add-company-backends
             :backends company-lua
             :modes lua-mode)))

layers/+lang/major-modes/packages.el

@@ -44,6 +44,7 @@
 
 (defun major-modes/init-matlab-mode ()
   (use-package matlab-mode
+    :defer t
     :init
     ;; Explicitly run prog-mode hooks since matlab-mode does not derive from
     ;; prog-mode major-mode
@@ -52,6 +53,7 @@
 (defun major-modes/init-pkgbuild-mode ()
   (use-package pkgbuild-mode
     :mode ("\\`PKGBUILD\\'" . pkgbuild-mode)
+    :defer t
     :init
     (progn
       (spacemacs/set-leader-keys-for-major-mode 'pkgbuild-mode
@@ -64,6 +66,7 @@
 
 (defun major-modes/init-qml-mode ()
   (use-package qml-mode
+    :defer t
     :mode "\\.qml\\'"))
 
 (defun major-modes/init-scad-mode ())
@@ -74,6 +77,7 @@
 
 (defun major-modes/init-vala-mode ()
   (use-package vala
+    :defer t
     :init
     ;; Explicitly run prog-mode hooks since vala-mode does not derive from
     ;; prog-mode major-mode
@@ -85,5 +89,6 @@
 ;; MATLAB/Octave, manually invoke for .m files.
 (defun major-modes/init-wolfram-mode ()
   (use-package wolfram-mode
+    :defer t
     :interpreter "\\(Wolfram\\|Mathematica\\)Script\\( -script\\)?"
     :mode "\\.wl\\'"))

layers/+lang/markdown/packages.el

@@ -39,6 +39,7 @@
 
 (defun markdown/init-gh-md ()
   (use-package gh-md
+    :defer t
     :init
     (dolist (mode markdown--key-bindings-modes)
       (spacemacs/set-leader-keys-for-major-mode mode
@@ -52,6 +53,7 @@
     :mode
     (("\\.m[k]d" . markdown-mode)
      ("\\.mdk" . markdown-mode))
+    :defer t
     :config
     (progn
       (add-hook 'markdown-mode-hook 'orgtbl-mode)
@@ -148,6 +150,7 @@
 
 (defun markdown/init-markdown-toc ()
   (use-package markdown-toc
+    :defer t
     :init
     (dolist (mode markdown--key-bindings-modes)
       (spacemacs/set-leader-keys-for-major-mode mode
@@ -162,6 +165,7 @@
 
 (defun markdown/init-vmd-mode ()
   (use-package vmd-mode
+    :defer t
     :init
     (dolist (mode markdown--key-bindings-modes)
       (spacemacs/set-leader-keys-for-major-mode mode

layers/+lang/nim/packages.el

@@ -18,6 +18,7 @@
 
 (defun nim/init-nim-mode ()
   (use-package nim-mode
+    :defer t
     :init
     (progn
       (add-hook 'nim-mode-hook 'nimsuggest-mode)

layers/+lang/ocaml/packages.el

@@ -38,6 +38,7 @@
   (defun ocaml/init-flycheck-ocaml ()
     (use-package flycheck-ocaml
       :if (configuration-layer/package-used-p 'flycheck)
+      :defer t
       :init
       (progn
         (with-eval-after-load 'merlin
@@ -55,6 +56,7 @@
 
 (defun ocaml/init-merlin ()
   (use-package merlin
+    :defer t
     :init
     (progn
       (add-to-list 'spacemacs-jump-handlers-tuareg-mode
@@ -84,6 +86,7 @@
 
 (defun ocaml/init-ocp-indent ()
   (use-package ocp-indent
+    :defer t
     :init
     (add-hook 'tuareg-mode-hook 'ocp-indent-caml-mode-setup)
     (spacemacs/set-leader-keys-for-major-mode 'tuareg-mode
@@ -99,6 +102,7 @@
   (use-package tuareg
     :mode (("\\.ml[ily]?$" . tuareg-mode)
            ("\\.topml$" . tuareg-mode))
+    :defer t
     :init
     (progn
       (spacemacs//init-ocaml-opam)
@@ -111,6 +115,7 @@
 
 (defun ocaml/init-utop ()
   (use-package utop
+    :defer t
     :init
     (progn
       (add-hook 'tuareg-mode-hook 'utop-minor-mode)

layers/+lang/perl5/packages.el

@@ -19,6 +19,7 @@
 
 (defun perl5/init-company-plsense ()
   (use-package company-plsense
+    :defer t
     :init
     (spacemacs|add-company-backends
       :backends company-plsense
@@ -26,6 +27,7 @@
 
 (defun perl5/init-cperl-mode ()
   (use-package cperl-mode
+    :defer t
     :mode "\\.\\(p[lm]x?\\|P[LM]X?\\)\\'"
     :interpreter "perl"
     :interpreter "perl5"

layers/+lang/perl6/packages.el

@@ -37,4 +37,5 @@
 
 (defun perl6/init-perl6-mode()
   (use-package perl6-mode
+    :defer t
     :mode (("/perl6/site/sources/" . perl6-mode))))

layers/+lang/php/packages.el

@@ -27,7 +27,7 @@
 
 (defun php/init-drupal-mode ()
   (use-package drupal-mode
-   ))
+    :defer t))
 
 (defun php/post-init-eldoc ()
   (add-hook 'php-mode-hook 'eldoc-mode))
@@ -46,26 +46,28 @@
 
 (defun php/init-php-auto-yasnippets ()
   (use-package php-auto-yasnippets
-   ))
+    :defer t))
 
 (defun php/init-php-extras ()
   (use-package php-extras
-   ))
+    :defer t))
 
 (defun php/init-php-mode ()
   (use-package php-mode
+    :defer t
     :mode ("\\.php\\'" . php-mode)))
 
 (defun php/init-phpcbf ()
   (use-package phpcbf
-   ))
+    :defer t))
 
 (defun php/init-phpunit ()
   (use-package phpunit
-   ))
+    :defer t))
 
 (defun php/init-company-php ()
   (use-package company-php
+    :defer t
     :init
     (progn
       (push 'ac-php-find-symbol-at-point spacemacs-jump-handlers-php-mode)

layers/+lang/plantuml/packages.el

@@ -25,6 +25,7 @@
 
 (defun plantuml/init-plantuml-mode ()
   (use-package plantuml-mode
+    :defer t
     :mode ("\\.pum\\'" . plantuml-mode)
     :config (spacemacs/set-leader-keys-for-major-mode 'plantuml-mode
               "cc" 'plantuml-preview

layers/+lang/purescript/packages.el

@@ -29,6 +29,7 @@
 
 (defun purescript/init-purescript-mode ()
   (use-package purescript-mode
+    :defer t
     :init
     (progn
       (add-hook 'purescript-mode-hook 'turn-on-purescript-indentation)
@@ -41,6 +42,7 @@
 
 (defun purescript/init-psci ()
   (use-package psci
+    :defer t
     :init
     (progn
       (spacemacs/register-repl 'psci 'psci "purescript")
@@ -54,6 +56,7 @@
 
 (defun purescript/init-psc-ide ()
   (use-package psc-ide
+    :defer t
     :init
     (progn
       (add-hook 'purescript-mode-hook 'psc-ide-mode)

layers/+lang/python/packages.el

@@ -88,11 +88,13 @@
 
 (defun python/init-company-anaconda ()
   (use-package company-anaconda
+    :defer t
     ;; see `spacemacs//python-setup-anaconda-company'
     ))
 
 (defun python/init-cython-mode ()
   (use-package cython-mode
+    :defer t
     :init
     (progn
       (spacemacs/set-leader-keys-for-major-mode 'cython-mode
@@ -124,11 +126,13 @@
 
 (defun python/init-helm-pydoc ()
   (use-package helm-pydoc
+    :defer t
     :init
     (spacemacs/set-leader-keys-for-major-mode 'python-mode "hd" 'helm-pydoc)))
 
 (defun python/init-hy-mode ()
   (use-package hy-mode
+    :defer t
     :init
     (progn
       (spacemacs/set-leader-keys-for-major-mode 'hy-mode
@@ -153,6 +157,7 @@
 
 (defun python/init-live-py-mode ()
   (use-package live-py-mode
+    :defer t
     :commands live-py-mode
     :init
     (spacemacs/set-leader-keys-for-major-mode 'python-mode
@@ -202,10 +207,11 @@
 
 (defun python/init-pip-requirements ()
   (use-package pip-requirements
-   ))
+    :defer t))
 
 (defun python/init-pippel ()
   (use-package pippel
+    :defer t
     :init (spacemacs/set-leader-keys-for-major-mode 'python-mode
             "P" 'pippel-list-packages)
     :config
@@ -214,6 +220,7 @@
 
 (defun python/init-py-isort ()
   (use-package py-isort
+    :defer t
     :init
     (progn
       (add-hook 'before-save-hook 'spacemacs//python-sort-imports)
@@ -243,6 +250,7 @@
 
 (defun python/init-pyvenv ()
   (use-package pyvenv
+    :defer t
     :init
     (progn
       (pcase python-auto-set-local-pyvenv-virtualenv
@@ -291,6 +299,7 @@
 
 (defun python/init-python ()
   (use-package python
+    :defer t
     :mode (("SConstruct\\'" . python-mode) ("SConscript\\'" . python-mode))
     :init
     (progn
@@ -395,6 +404,7 @@ fix this issue."
 
 (defun python/init-yapfify ()
   (use-package yapfify
+    :defer t
     :init
     (progn
       (spacemacs/set-leader-keys-for-major-mode 'python-mode

layers/+lang/racket/packages.el

@@ -40,6 +40,7 @@
 
 (defun racket/init-racket-mode ()
   (use-package racket-mode
+    :defer t
     :init
     (progn
       (spacemacs/register-repl 'racket-mode 'racket-repl "racket"))

layers/+lang/restructuredtext/packages.el

@@ -49,6 +49,7 @@
 
 (defun restructuredtext/init-rst ()
   (use-package rst
+    :defer t
     :config (add-hook 'rst-adjust-hook 'rst-toc-update)))
 
 (defun restructuredtext/post-init-flyspell ()

layers/+lang/ruby/packages.el

@@ -39,6 +39,7 @@
 
 (defun ruby/init-bundler ()
   (use-package bundler
+    :defer t
     :init (dolist (mode '(ruby-mode enh-ruby-mode))
             (spacemacs/declare-prefix-for-mode mode "mb" "ruby/bundle")
             (spacemacs/set-leader-keys-for-major-mode mode
@@ -62,6 +63,7 @@
   (use-package chruby
     :if (equal ruby-version-manager 'chruby)
     :commands chruby-use-corresponding
+    :defer t
     :init (spacemacs/add-to-hooks 'chruby-use-corresponding
                                   '(ruby-mode-hook enh-ruby-mode-hook))))
 
@@ -98,6 +100,7 @@
 
 (defun ruby/init-minitest ()
   (use-package minitest
+    :defer t
     :init
     (progn
       (spacemacs/add-to-hooks 'spacemacs//ruby-enable-minitest-mode
@@ -129,11 +132,13 @@
 (defun ruby/init-rbenv ()
   (use-package rbenv
     :if (equal ruby-version-manager 'rbenv)
+    :defer t
     :init (spacemacs/add-to-hooks 'spacemacs//enable-rbenv
                                   '(ruby-mode-hook enh-ruby-mode-hook))))
 
 (defun ruby/init-robe ()
   (use-package robe
+    :defer t
     :init
     (progn
       (spacemacs/register-repl 'robe 'robe-start "robe")
@@ -165,6 +170,7 @@
 
 (defun ruby/init-rspec-mode ()
   (use-package rspec-mode
+    :defer t
     :init
     (progn
       (spacemacs/add-to-hooks 'spacemacs//ruby-enable-rspec-mode
@@ -196,6 +202,7 @@
 
 (defun ruby/init-rubocop ()
   (use-package rubocop
+    :defer t
     :init (spacemacs/add-to-hooks 'rubocop-mode '(ruby-mode-hook
                                                   enh-ruby-mode-hook))
     :config (dolist (mode '(ruby-mode enh-ruby-mode))
@@ -210,6 +217,7 @@
 
 (defun ruby/init-ruby-mode ()
   (use-package ruby-mode
+    :defer t
     :mode (("Appraisals\\'" . ruby-mode)
            ("Puppetfile" . ruby-mode))
     :init
@@ -224,6 +232,7 @@
 
 (defun ruby/init-ruby-hash-syntax ()
   (use-package ruby-hash-syntax
+    :defer t
     :init
     (dolist (mode '(ruby-mode enh-ruby-mode))
       (spacemacs/set-leader-keys-for-major-mode mode
@@ -231,6 +240,7 @@
 
 (defun ruby/init-ruby-refactor ()
   (use-package ruby-refactor
+    :defer t
     :init (dolist (hook '(ruby-mode-hook enh-ruby-mode-hook))
             (add-hook hook 'ruby-refactor-mode-launch))
     :config
@@ -245,6 +255,7 @@
 
 (defun ruby/init-ruby-tools ()
   (use-package ruby-tools
+    :defer t
     :init (dolist (hook '(ruby-mode-hook enh-ruby-mode-hook))
             (add-hook hook 'ruby-tools-mode))
     :config
@@ -260,6 +271,7 @@
 (defun ruby/init-ruby-test-mode ()
   "Define keybindings for ruby test mode"
   (use-package ruby-test-mode)
+    :defer t
     :init (spacemacs/add-to-hooks 'spacemacs//ruby-enable-ruby-test-mode
                                   '(ruby-mode-local-vars-hook
                                     enh-ruby-mode-local-vars-hook))
@@ -278,6 +290,7 @@
 (defun ruby/init-rvm ()
   (use-package rvm
     :if (equal ruby-version-manager 'rvm)
+    :defer t
     :init
     (progn
       (setq rspec-use-rvm t)
@@ -297,6 +310,7 @@
 
 (defun ruby/init-rake ()
   (use-package rake
+    :defer t
     :init (setq rake-cache-file (concat spacemacs-cache-directory "rake.cache"))
     :config (dolist (mode '(ruby-mode enh-ruby-mode))
               (spacemacs/set-leader-keys-for-major-mode mode

layers/+lang/rust/packages.el

@@ -25,6 +25,7 @@
 
 (defun rust/init-cargo ()
   (use-package cargo
+    :defer t
     :init
     (progn
       (spacemacs/declare-prefix-for-mode 'rust-mode "mc" "cargo")
@@ -53,6 +54,7 @@
 
 (defun rust/init-flycheck-rust ()
   (use-package flycheck-rust
+    :defer t
     :init (add-hook 'flycheck-mode-hook #'flycheck-rust-setup)))
 
 (defun rust/post-init-ggtags ()
@@ -66,6 +68,7 @@
 
 (defun rust/init-rust-mode ()
   (use-package rust-mode
+    :defer t
     :init
     (progn
       (spacemacs/set-leader-keys-for-major-mode 'rust-mode
@@ -97,6 +100,7 @@
 
 (defun rust/init-racer ()
   (use-package racer
+    :defer t
     :init
     (progn
       (spacemacs/add-to-hook 'rust-mode-hook '(racer-mode))

layers/+lang/scala/packages.el

@@ -34,6 +34,7 @@
 
 (defun scala/post-init-ensime ()
   (use-package ensime
+    :defer t
     :init
     (progn
       (add-hook 'scala-mode-hook #'spacemacs//scala-setup-ensime)
@@ -66,12 +67,14 @@
 
 (defun scala/init-sbt-mode ()
   (use-package sbt-mode
+    :defer t
     :init (spacemacs/set-leader-keys-for-major-mode 'scala-mode
             "b." 'sbt-hydra
             "bb" 'sbt-command)))
 
 (defun scala/init-scala-mode ()
   (use-package scala-mode
+    :defer t
     :init
     (progn
       (dolist (ext '(".cfe" ".cfs" ".si" ".gen" ".lock"))

layers/+lang/shell-scripts/packages.el

@@ -25,6 +25,7 @@
 
 (defun shell-scripts/init-company-shell ()
   (use-package company-shell
+    :defer t
     :init
     (progn
       (spacemacs|add-company-backends
@@ -39,14 +40,16 @@
 
 (defun shell-scripts/init-flycheck-bashate ()
   (use-package flycheck-bashate
+    :defer t
     :init (add-hook 'sh-mode-hook 'flycheck-bashate-setup)))
 
 (defun shell-scripts/init-fish-mode ()
   (use-package fish-mode
-   ))
+    :defer t))
 
 (defun shell-scripts/init-sh-script ()
   (use-package sh-script
+    :defer t
     :init
     (progn
       ;; Add meaningful names for prefix categories
@@ -98,6 +101,7 @@
 
 (defun shell-scripts/init-insert-shebang ()
   (use-package insert-shebang
+    :defer t
     :init
     (progn
       ;; Insert shebang must be available for non shell modes like python or

layers/+lang/sml/packages.el

@@ -19,6 +19,7 @@
 (defun sml/init-sml-mode ()
   (use-package sml-mode
     :mode ("\\.\\(sml\\|sig\\)\\'" . sml-mode)
+    :defer t
     :commands run-sml
     :init (spacemacs/register-repl 'sml-mode 'run-sml "sml")
     :config

layers/+lang/sql/packages.el

@@ -19,6 +19,7 @@
 
 (defun sql/init-sql ()
   (use-package sql
+    :defer t
     :init (spacemacs/register-repl 'sql 'spacemacs/sql-start "sql")
     :config
     (progn
@@ -125,10 +126,11 @@
 
 (defun sql/init-sql-indent ()
   (use-package sql-indent
-   ))
+    :defer t))
 
 (defun sql/init-sqlup-mode ()
   (use-package sqlup-mode
+    :defer t
     :init
     (progn
       (add-hook 'sql-mode-hook 'sqlup-mode)

layers/+lang/swift/packages.el

@@ -22,6 +22,7 @@
 (defun swift/init-swift-mode ()
   (use-package swift-mode
     :mode ("\\.swift\\'" . swift-mode)
+    :defer t
     :init
     (progn
       (spacemacs|advise-commands "store-initial-buffer-name"

layers/+lang/typescript/packages.el

@@ -43,6 +43,7 @@
 
 (defun typescript/init-tide ()
   (use-package tide
+    :defer t
     :commands (typescript/jump-to-type-def)
     :init
     (progn
@@ -93,6 +94,7 @@
 
 (defun typescript/init-typescript-mode ()
   (use-package typescript-mode
+    :defer t
     :config
     (progn
       (when typescript-fmt-on-save

layers/+lang/vimscript/packages.el

@@ -23,6 +23,7 @@
   (use-package vimrc-mode
     :mode "\\.vim[rc]?\\'"
     :mode "_vimrc\\'"
+    :defer t
     :init
     (progn
     (defun spacemacs//vimrc-mode-hook ()
@@ -39,7 +40,7 @@
     :mode "_vimperatorrc\\'"
     :mode "\\.penta\\'"
     :mode "\\.vimp\\'"
-   ))
+    :defer t))
 
 (defun vimscript/post-init-ggtags ()
   (add-hook 'vimrc-mode-local-vars-hook #'spacemacs/ggtags-mode-enable))

layers/+lang/windows-scripts/packages.el

@@ -60,6 +60,7 @@
   (use-package powershell
     :mode (("\\.ps1\\'"  . powershell-mode)
            ("\\.psm1\\'" . powershell-mode))
+    :defer t
     :init
     (progn
       (defun powershell/define-text-objects ()

layers/+misc/nlinum/packages.el

@@ -19,7 +19,6 @@
 
 (defun nlinum/init-nlinum ()
   (use-package nlinum
-    :demand t
     :init
     (spacemacs|add-toggle line-numbers
       :mode nlinum-mode

layers/+misc/parinfer/packages.el

@@ -14,6 +14,7 @@
 
 (defun parinfer/init-parinfer ()
   (use-package parinfer
+    :defer t
     :diminish parinfer-mode
     :init
     (progn

layers/+os/nixos/packages.el

@@ -18,10 +18,11 @@
 
 (defun nixos/init-company-nixos-options ()
   (use-package company-nixos-options
-   ))
+    :defer t))
 
 (defun nixos/init-helm-nixos-options ()
   (use-package helm-nixos-options
+    :defer t
     :init
     (progn
       (spacemacs/set-leader-keys
@@ -29,13 +30,14 @@
 
 (defun nixos/init-nix-mode ()
   (use-package nix-mode
+    :defer t
     :init
     (add-to-list 'spacemacs-indent-sensitive-modes 'nix-mode)
     :config
     (electric-indent-mode -1)))
 
 (defun nixos/init-nixos-options ()
-  (use-package nixos-options))
+  (use-package nixos-options :defer t))
 
 (defun nixos/post-init-flycheck ()
   (spacemacs/enable-flycheck 'nix-mode))

layers/+os/osx/packages.el

@@ -51,6 +51,7 @@
 (defun osx/init-launchctl ()
   (use-package launchctl
     :if (spacemacs/system-is-mac)
+    :defer t
     :init
     (progn
       (add-to-list 'auto-mode-alist '("\\.plist\\'" . nxml-mode))

layers/+pair-programming/floobits/packages.el

@@ -16,6 +16,7 @@
 
 (defun floobits/init-floobits ()
   (use-package floobits
+    :defer t
     :init
     (progn
       (spacemacs/declare-prefix "P" "PP/floobits")

layers/+source-control/git/packages.el

@@ -39,6 +39,7 @@
 
 (defun git/init-evil-magit ()
   (use-package evil-magit
+    :defer t
     :init (add-hook 'spacemacs-editing-style-hook
                     'spacemacs//magit-evil-magit-bindings)))
 
@@ -47,14 +48,16 @@
 
 (defun git/init-helm-gitignore ()
   (use-package helm-gitignore
+    :defer t
     :init (spacemacs/set-leader-keys "gI" 'helm-gitignore)))
 
 (defun git/init-git-commit ()
   (use-package git-commit
-   ))
+    :defer t))
 
 (defun git/init-git-link ()
   (use-package git-link
+    :defer t
     :init
     (progn
       (spacemacs/declare-prefix "gl" "links")
@@ -68,11 +71,13 @@
 
 (defun git/init-git-messenger ()
   (use-package git-messenger
+    :defer t
     :init (spacemacs/set-leader-keys "gM" 'git-messenger:popup-message)
     :config (define-key git-messenger-map [escape] 'git-messenger:popup-close)))
 
 (defun git/init-git-timemachine ()
   (use-package git-timemachine
+    :defer t
     :commands spacemacs/time-machine-transient-state/body
     :init
     (spacemacs/set-leader-keys
@@ -100,18 +105,19 @@
 
 (defun git/init-gitattributes-mode ()
   (use-package gitattributes-mode
-   ))
+    :defer t))
 
 (defun git/init-gitconfig-mode ()
   (use-package gitconfig-mode
-   ))
+    :defer t))
 
 (defun git/init-gitignore-mode ()
   (use-package gitignore-mode
-   ))
+    :defer t))
 
 (defun git/init-magit ()
   (use-package magit
+    :defer t
     :init
     (progn
       (setq magit-completing-read-function
@@ -208,6 +214,7 @@ Press [_b_] again to blame further in the history, [_q_] to go up or quit."
 
 (defun git/init-smeargle ()
   (use-package smeargle
+    :defer t
     :init
     (progn
       (spacemacs/declare-prefix "gH" "highlight")

layers/+source-control/github/packages.el

@@ -24,6 +24,7 @@
 
 (defun github/init-gist ()
   (use-package gist
+    :defer t
     :init
     (progn
       (spacemacs/declare-prefix "gg" "github gist")
@@ -48,6 +49,7 @@
 
 (defun github/init-github-clone ()
   (use-package github-clone
+    :defer t
     :init
     (progn
       (spacemacs/declare-prefix "ghc" "clone")
@@ -73,7 +75,6 @@
     :pre-config
     (progn
       (use-package magit-gh-pulls
-        :demand t
         :config
         (define-key magit-mode-map "#" 'spacemacs/load-gh-pulls-mode)
         (spacemacs|diminish magit-gh-pulls-mode "Github-PR")))))
@@ -81,6 +82,7 @@
 
 (defun github/init-magithub ()
   (use-package magithub
+    :defer t
     :after magit
     :init
     (setq magithub-dir (concat spacemacs-cache-directory "magithub/"))

layers/+source-control/version-control/packages.el

@@ -25,6 +25,7 @@
 
 (defun version-control/init-vc ()
   (use-package vc
+    :defer t
     :init
     (spacemacs/declare-prefix "gv" "version-control")
     :config
@@ -86,6 +87,7 @@
 
 (defun version-control/init-diff-mode ()
   (use-package diff-mode
+    :defer t
     :config
     (evilified-state-evilify diff-mode diff-mode-map
       (kbd "C-j") 'diff-hunk-next
@@ -247,6 +249,7 @@
 
 (defun version-control/init-smerge-mode ()
   (use-package smerge-mode
+    :defer t
     :diminish smerge-mode
     :commands spacemacs/smerge-transient-state/body
     :init
@@ -283,4 +286,5 @@
 
 (defun version-control/init-browse-at-remote ()
   (use-package browse-at-remote
+    :defer t
     :init (spacemacs/set-leader-keys "gho" 'browse-at-remote)))

layers/+spacemacs/spacemacs-editing-visual/packages.el

@@ -60,6 +60,7 @@
 
 (defun spacemacs-editing-visual/init-highlight-indentation ()
   (use-package highlight-indentation
+    :defer t
     :init
     (progn
       (spacemacs|add-toggle highlight-indentation
@@ -77,6 +78,7 @@
 
 (defun spacemacs-editing-visual/init-highlight-numbers ()
   (use-package highlight-numbers
+    :defer t
     :init
     (progn
       (add-hook 'prog-mode-hook 'highlight-numbers-mode)
@@ -84,6 +86,7 @@
 
 (defun spacemacs-editing-visual/init-highlight-parentheses ()
   (use-package highlight-parentheses
+    :defer t
     :init
     (progn
       (when (member dotspacemacs-highlight-delimiters '(all current))
@@ -118,6 +121,7 @@
 
 (defun spacemacs-editing-visual/init-indent-guide ()
   (use-package indent-guide
+    :defer t
     :init
     (progn
       (setq indent-guide-delay 0.3)
@@ -136,6 +140,7 @@
 
 (defun spacemacs-editing-visual/init-rainbow-delimiters ()
   (use-package rainbow-delimiters
+    :defer t
     :init
     (progn
       (spacemacs/set-leader-keys "tCd" 'rainbow-delimiters-mode)

layers/+spacemacs/spacemacs-editing/packages.el

@@ -35,6 +35,7 @@
 
 (defun spacemacs-editing/init-aggressive-indent ()
   (use-package aggressive-indent
+    :defer t
     :init
     (progn
       (spacemacs|add-toggle aggressive-indent
@@ -52,6 +53,7 @@
 
 (defun spacemacs-editing/init-avy ()
   (use-package avy
+    :defer t
     :commands (spacemacs/avy-open-url spacemacs/avy-goto-url avy-pop-mark)
     :init
     (progn
@@ -79,18 +81,17 @@
 
 (defun spacemacs-editing/init-bracketed-paste ()
   (use-package bracketed-paste
+    :defer t
     :init
     ;; Enable bracketed-paste for tty
     (add-hook 'tty-setup-hook 'bracketed-paste-enable)))
 
 (defun spacemacs-editing/init-clean-aindent-mode ()
   (use-package clean-aindent-mode
-    :demand t
     :config (clean-aindent-mode)))
 
 (defun spacemacs-editing/init-editorconfig ()
   (use-package editorconfig
-    :demand t
     :init
     (spacemacs|diminish editorconfig-mode)
     :config
@@ -103,6 +104,7 @@
 
 (defun spacemacs-editing/init-expand-region ()
   (use-package expand-region
+    :defer t
     :init (spacemacs/set-leader-keys "v" 'er/expand-region)
     :config
     (progn
@@ -137,6 +139,7 @@
 
 (defun spacemacs-editing/init-hexl ()
   (use-package hexl
+    :defer t
     :init
     (progn
       (spacemacs/set-leader-keys "fh" 'hexl-find-file)
@@ -159,6 +162,7 @@
 
 (defun spacemacs-editing/init-hungry-delete ()
   (use-package hungry-delete
+    :defer t
     :init
     (spacemacs|add-toggle hungry-delete
       :mode hungry-delete-mode
@@ -172,6 +176,7 @@
 
 (defun spacemacs-editing/init-link-hint ()
   (use-package link-hint
+    :defer t
     :init
     (spacemacs/set-leader-keys
       "xo" 'link-hint-open-link
@@ -192,6 +197,7 @@
 
 (defun spacemacs-editing/init-move-text ()
   (use-package move-text
+    :defer t
     :init
     (spacemacs|define-transient-state move-text
       :title "Move Text Transient State"
@@ -204,6 +210,7 @@
 
 (defun spacemacs-editing/init-origami ()
   (use-package origami
+    :defer t
     :init
     (progn
       (global-origami-mode)
@@ -255,6 +262,7 @@
 
 (defun spacemacs-editing/init-password-generator ()
   (use-package password-generator
+    :defer t
     :init
     (progn
       (spacemacs/declare-prefix "ip" "passwords")
@@ -267,6 +275,7 @@
 
 (defun spacemacs-editing/init-smartparens ()
   (use-package smartparens
+    :defer t
     :commands (sp-split-sexp sp-newline sp-up-sexp)
     :init
     (progn
@@ -405,5 +414,4 @@
   ;; not deferred on purpose, init-spacemacs-whitespace-cleanup need
   ;; it to be loaded.
   (use-package ws-butler
-    :demand t
     :config (spacemacs|hide-lighter ws-butler-mode)))

layers/+spacemacs/spacemacs-evil/packages.el

@@ -41,7 +41,6 @@
 
 (defun spacemacs-evil/init-evil-anzu ()
   (use-package evil-anzu
-    :demand t
     :init
     (global-anzu-mode t)
     :config
@@ -75,6 +74,7 @@
 
 (defun spacemacs-evil/init-evil-cleverparens ()
   (use-package evil-cleverparens
+    :defer t
     :init
     (progn
       (setq evil-cleverparens-use-regular-insert t)
@@ -89,7 +89,6 @@
 
 (defun spacemacs-evil/init-evil-ediff ()
   (use-package evil-ediff
-    :demand t
     :after (ediff)
     :if (memq dotspacemacs-editing-style '(hybrid vim))))
 
@@ -132,12 +131,12 @@
 
 (defun spacemacs-evil/init-evil-lisp-state ()
   (use-package evil-lisp-state
-    :demand t
     :init (setq evil-lisp-state-global t)
     :config (spacemacs/set-leader-keys "k" evil-lisp-state-map)))
 
 (defun spacemacs-evil/init-evil-mc ()
   (use-package evil-mc
+    :defer t
     :init
     (progn
       ;; evil-mc is not compatible with the paste transient state
@@ -212,11 +211,10 @@
 
 (defun spacemacs-evil/init-evil-matchit ()
   (use-package evil-matchit
-   ))
+    :defer t))
 
 (defun spacemacs-evil/init-evil-numbers ()
   (use-package evil-numbers
-    :demand t
     :config
     (progn
       (spacemacs|define-transient-state evil-numbers
@@ -259,7 +257,6 @@
 
 (defun spacemacs-evil/init-evil-terminal-cursor-changer ()
   (use-package evil-terminal-cursor-changer
-    :demand t
     :if (not (display-graphic-p))
     :init (setq evil-visual-state-cursor 'box
                 evil-insert-state-cursor 'bar
@@ -277,10 +274,11 @@
 
 (defun spacemacs-evil/init-evil-unimpaired ()
   ;; No laziness here, unimpaired bindings should be available right away.
-  (use-package evil-unimpaired :demand t))
+  (use-package evil-unimpaired))
 
 (defun spacemacs-evil/init-evil-visual-mark-mode ()
   (use-package evil-visual-mark-mode
+    :defer t
     :init
     (spacemacs|add-toggle evil-visual-mark-mode
       :mode evil-visual-mark-mode

layers/+spacemacs/spacemacs-language/packages.el

@@ -15,6 +15,7 @@
 
 (defun spacemacs-language/init-define-word ()
   (use-package define-word
+    :defer t
     :init
     (spacemacs/set-leader-keys
       "xwd" 'define-word-at-point)))

layers/+spacemacs/spacemacs-layouts/packages.el

@@ -240,4 +240,5 @@
 
 (defun spacemacs-layouts/init-counsel-projectile ()
   (use-package counsel-projectile
+    :defer t
     :init (spacemacs/set-leader-keys "pl" 'spacemacs/ivy-persp-switch-project)))