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

Warning now `:defer t` is implied, to force a package to load `:demand t` is now necessary.
2018-02-27 22:52:56 -05:00 · 2018-02-27 22:52:56 -05:00 · 29c78ce841
parent 1e6a0a66c0
commit 29c78ce841
138 changed files with 96 additions and 444 deletions
--- a/layers/+chat/erc/packages.el
+++ b/layers/+chat/erc/packages.el
@ -46,7 +46,6 @@
 (defun erc/init-erc ()
  "Initialize ERC"
  (use-package erc
-    :defer t
    :init
    (progn
      (spacemacs/set-leader-keys
@ -59,7 +58,6 @@
    :config
    (progn
      (use-package erc-autoaway
-        :defer t
        :init
        (setq erc-auto-discard-away t
              erc-autoaway-idle-seconds 600
@ -117,7 +115,6 @@
  (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?
@ -186,7 +183,6 @@

 (defun erc/init-erc-view-log ()
  (use-package erc-view-log
-    :defer t
    :init
    (progn
      (setq erc-log-channels-directory
@ -219,7 +215,6 @@

 (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))))
--- a/layers/+chat/jabber/packages.el
+++ b/layers/+chat/jabber/packages.el
@ -13,7 +13,6 @@

 (defun jabber/init-jabber ()
  (use-package jabber
-    :defer t
    :init
    (progn
      (add-hook 'jabber-post-connect-hooks 'spacemacs/jabber-connect-hook)
--- a/layers/+chat/rcirc/packages.el
+++ b/layers/+chat/rcirc/packages.el
@ -45,7 +45,6 @@

 (defun rcirc/init-rcirc ()
  (use-package rcirc
-    :defer t
    :init
    (progn
      (spacemacs/add-to-hook 'rcirc-mode-hook '(rcirc-omit-mode
@ -91,11 +90,10 @@
      (require 'rcirc-color))))

 (defun rcirc/init-rcirc-color ()
-  (use-package rcirc-color :defer t))
+  (use-package rcirc-color))

 (defun rcirc/init-rcirc-notify ()
  (use-package rcirc-notify
-    :defer t
    :config
    (progn
      (add-hook 'rcirc-notify-page-me-hooks 'spacemacs/rcirc-notify-beep))))
--- a/layers/+chat/slack/packages.el
+++ b/layers/+chat/slack/packages.el
@ -27,7 +27,6 @@

 (defun slack/init-alert ()
  (use-package alert
-    :defer t
    :init (setq alert-default-style 'notifier)))

 (defun slack/post-init-emoji-cheat-sheet-plus ()
@ -58,7 +57,6 @@
  "Initialize Slack"
  (use-package slack
    :commands (slack-start)
-    :defer t
    :init
    (progn
      (spacemacs/set-leader-keys
--- a/layers/+checkers/spell-checking/packages.el
+++ b/layers/+checkers/spell-checking/packages.el
@ -22,7 +22,6 @@

 (defun spell-checking/init-auto-dictionary ()
  (use-package auto-dictionary
-    :defer t
    :if spell-checking-enable-auto-dictionary
    :init
    (progn
@ -40,7 +39,6 @@

 (defun spell-checking/init-flyspell ()
  (use-package flyspell
-    :defer t
    :commands (spell-checking/change-dictionary)
    :init
    (progn
@ -94,7 +92,6 @@

 (defun spell-checking/init-flyspell-popup ()
  (use-package flyspell-popup
-    :defer t
    :init
    (progn
      (setq flyspell-popup-correct-delay 0.8)
--- a/layers/+checkers/syntax-checking/packages.el
+++ b/layers/+checkers/syntax-checking/packages.el
@ -18,7 +18,6 @@

 (defun syntax-checking/init-flycheck ()
  (use-package flycheck
-    :defer t
    :init
    (progn
      (setq flycheck-standard-error-navigation nil
@ -100,7 +99,6 @@
 (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))))
--- a/layers/+completion/auto-completion/packages.el
+++ b/layers/+completion/auto-completion/packages.el
@ -30,7 +30,6 @@
 ;; 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)
@ -41,7 +40,6 @@

 (defun auto-completion/init-auto-complete ()
  (use-package auto-complete
-    :defer t
    :init
    (setq ac-auto-start 0
          ac-delay auto-completion-idle-delay
@ -68,7 +66,6 @@

 (defun auto-completion/init-auto-yasnippet ()
  (use-package auto-yasnippet
-    :defer t
    :init
    (progn
      (setq aya-persist-snippets-dir
@ -82,7 +79,6 @@

 (defun auto-completion/init-company ()
  (use-package company
-    :defer t
    :init
    (progn
      (setq company-idle-delay auto-completion-idle-delay
@ -121,7 +117,6 @@
 (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
@ -129,7 +124,7 @@
      (add-hook 'company-mode-hook 'company-statistics-mode))))

 (defun auto-completion/init-fuzzy ()
-  (use-package fuzzy :defer t))
+  (use-package fuzzy))

 (defun auto-completion/init-company-quickhelp ()
  (use-package company-quickhelp
@ -144,7 +139,6 @@

 (defun auto-completion/init-helm-c-yasnippet ()
  (use-package helm-c-yasnippet
-    :defer t
    :init
    (progn
      (spacemacs/set-leader-keys "is" 'spacemacs/helm-yas)
@ -153,7 +147,6 @@
 (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))))
--- a/layers/+completion/helm/packages.el
+++ b/layers/+completion/helm/packages.el
@ -36,7 +36,6 @@

 (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))))
@ -59,7 +58,6 @@

 (defun helm/init-helm ()
  (use-package helm
-    :defer 1
    :commands (spacemacs/helm-find-files
               helm-current-directory)
    :init
@ -148,7 +146,6 @@

 (defun helm/init-helm-ag ()
  (use-package helm-ag
-    :defer t
    :init
    (progn
      (defun spacemacs//helm-do-ag-region-or-symbol (func &optional dir)
@ -581,7 +578,6 @@ 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)
@ -598,11 +594,10 @@ 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 :defer t))
+  (use-package helm-flx))

 (defun helm/init-helm-make ()
  (use-package helm-make
-    :defer t
    :init
    (spacemacs/set-leader-keys
      "cc" 'helm-make-projectile
@ -610,7 +605,6 @@ 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
@ -678,7 +672,6 @@ 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
@ -708,14 +701,12 @@ 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)))

 (defun helm/init-helm-xref ()
  (use-package helm-xref
-    :defer t
    :init
    (progn
      ;; This is required to make `xref-find-references' not give a prompt.
--- a/layers/+completion/ivy/packages.el
+++ b/layers/+completion/ivy/packages.el
@ -164,7 +164,6 @@

 (defun ivy/init-helm-make ()
  (use-package helm-make
-    :defer t
    :init
    (progn
      (setq helm-make-completion-method 'ivy)
@ -218,7 +217,6 @@

 (defun ivy/init-ivy-rich ()
  (use-package ivy-rich
-    :defer t
    :init
    (progn
      (setq ivy-rich-abbreviate-paths t
@ -247,7 +245,6 @@

 (defun ivy/init-ivy-xref ()
  (use-package ivy-xref
-    :defer t
    :init
    (progn
      (setq xref-prompt-for-identifier '(not xref-find-definitions
@ -316,7 +313,6 @@

 (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"))))
--- a/layers/+distributions/spacemacs-base/packages.el
+++ b/layers/+distributions/spacemacs-base/packages.el
@ -66,7 +66,6 @@

 (defun spacemacs-base/init-ace-window ()
  (use-package ace-window
-    :defer t
    :init
    (progn
      (spacemacs/set-leader-keys
@ -86,7 +85,6 @@

 (defun spacemacs-base/init-bookmark ()
  (use-package bookmark
-    :defer t
    :init
    (progn
      (setq bookmark-default-file (concat spacemacs-cache-directory "bookmarks")
@ -137,7 +135,6 @@
 ;; ```
 (defun spacemacs-base/init-ediff ()
  (use-package ediff
-    :defer t
    :init
    (progn
      ;; first we set some sane defaults
@ -154,7 +151,6 @@

 (defun spacemacs-base/init-eldoc ()
  (use-package eldoc
-    :defer t
    :config
    (progn
      ;; enable eldoc in `eval-expression'
@ -170,7 +166,8 @@
    :config (spacemacs|hide-lighter evil-escape-mode)))

 (defun spacemacs-base/init-evil-evilified-state ()
-  (use-package evil-evilified-state)
+  (use-package evil-evilified-state
+    :demand t)
  (define-key evil-evilified-state-map (kbd dotspacemacs-leader-key)
    spacemacs-default-map))

@ -264,7 +261,6 @@

 (defun spacemacs-base/init-imenu ()
  (use-package imenu
-    :defer t
    :init (spacemacs/set-leader-keys "ji" 'imenu)))

 (defun spacemacs-base/init-linum ()
@ -303,7 +299,6 @@

 (defun spacemacs-base/init-pcre2el ()
  (use-package pcre2el
-    :defer t
    :init
    (progn
      (spacemacs/declare-prefix "xr" "regular expressions")
@ -393,7 +388,6 @@

 (defun spacemacs-base/init-recentf ()
  (use-package recentf
-    :defer t
    :init
    (progn
      ;; lazy load recentf
@ -441,7 +435,6 @@

 (defun spacemacs-base/init-spacemacs-theme ()
  (use-package spacemacs-theme
-    :defer t
    :init
    (progn
      (setq spacemacs-theme-comment-bg t)
@ -449,7 +442,6 @@

 (defun spacemacs-base/init-subword ()
  (use-package subword
-    :defer t
    :init
    (progn
      (unless (category-docstring ?U)
@ -495,7 +487,6 @@

 (defun spacemacs-base/init-whitespace ()
  (use-package whitespace
-    :defer t
    :init
    (progn
      (setq spacemacs-show-trailing-whitespace t)
--- a/layers/+distributions/spacemacs-bootstrap/packages.el
+++ b/layers/+distributions/spacemacs-bootstrap/packages.el
@ -280,6 +280,7 @@
 (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))
--- a/layers/+emacs/better-defaults/packages.el
+++ b/layers/+emacs/better-defaults/packages.el
@ -16,7 +16,6 @@

 (defun better-defaults/init-mwim ()
  (use-package mwim
-    :defer t
    :init
    (progn
      (if better-defaults-move-to-beginning-of-code-first
@ -29,7 +28,6 @@

 (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)))
--- a/layers/+emacs/ibuffer/packages.el
+++ b/layers/+emacs/ibuffer/packages.el
@ -17,7 +17,6 @@

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

 (defun ibuffer/init-ibuffer-projectile()
    (use-package ibuffer-projectile
-      :defer t
      :init
      (progn
        (defun spacemacs//ibuffer-group-by-projects ()
--- a/layers/+emacs/org/packages.el
+++ b/layers/+emacs/org/packages.el
@ -50,7 +50,6 @@

 (defun org/init-evil-org ()
  (use-package evil-org
-    :defer t
    :init
    (progn
      (add-hook 'org-mode-hook 'spacemacs//evil-org-mode)
@ -70,17 +69,15 @@

 (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 ()
@ -93,7 +90,6 @@

 (defun org/init-org ()
  (use-package org
-    :defer t
    :commands (orgtbl-mode)
    :init
    (progn
@ -385,7 +381,6 @@ 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)
@ -512,7 +507,6 @@ Headline^^            Visit entry^^               Filter^^                    Da

 (defun org/init-org-brain ()
  (use-package org-brain
-    :defer t
    :init
    (progn
      (spacemacs/set-leader-keys
@ -545,7 +539,6 @@ 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
@ -555,7 +548,6 @@ Headline^^            Visit entry^^               Filter^^                    Da

 (defun org/init-org-pomodoro ()
  (use-package org-pomodoro
-    :defer t
    :init
    (progn
      (when (spacemacs/system-is-mac)
@ -567,7 +559,6 @@ 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
@ -633,7 +624,6 @@ 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
--- a/layers/+emacs/semantic/packages.el
+++ b/layers/+emacs/semantic/packages.el
@ -18,16 +18,15 @@

 (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 :defer t))
+  (use-package srefactor))

 (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 :defer t))
+  (use-package stickyfunc-enhance))
--- a/layers/+emacs/smex/packages.el
+++ b/layers/+emacs/smex/packages.el
@ -13,7 +13,6 @@

 (defun smex/init-smex ()
  (use-package smex
-    :defer t
    :init
    (progn
      (setq-default smex-history-length 32
--- a/layers/+emacs/typography/packages.el
+++ b/layers/+emacs/typography/packages.el
@ -17,7 +17,6 @@

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

 (defun typography/init-tildify ()
  (use-package tildify
-    :defer t
    :init
    (progn
      (when typography-enable-typographic-editing
--- a/layers/+email/gnus/packages.el
+++ b/layers/+email/gnus/packages.el
@ -14,7 +14,6 @@
 (defun gnus/init-gnus ()
  "Initialize my package"
  (use-package gnus
-    :defer t
    :commands gnus
    :init
    (spacemacs/set-leader-keys "ag" 'gnus)
--- a/layers/+email/mu4e/packages.el
+++ b/layers/+email/mu4e/packages.el
@ -119,7 +119,6 @@

 (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))
@ -128,7 +127,6 @@

 (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
--- a/layers/+email/notmuch/packages.el
+++ b/layers/+email/notmuch/packages.el
@ -22,17 +22,14 @@

 (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
--- a/layers/+filetree/neotree/packages.el
+++ b/layers/+filetree/neotree/packages.el
@ -17,7 +17,6 @@

 (defun neotree/init-neotree ()
  (use-package neotree
-    :defer t
    :commands neo-global--window-exists-p
    :init
    (progn
--- a/layers/+filetree/treemacs/packages.el
+++ b/layers/+filetree/treemacs/packages.el
@ -25,7 +25,6 @@
 (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
@ -67,7 +66,6 @@

 (defun treemacs/init-treemacs-projectile ()
  (use-package treemacs-projectile
-    :defer t
    :init
    (spacemacs/set-leader-keys
      "fp" #'treemacs-projectile-toggle
--- a/layers/+fonts/unicode-fonts/packages.el
+++ b/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
--- a/layers/+frameworks/django/packages.el
+++ b/layers/+frameworks/django/packages.el
@ -16,7 +16,6 @@

 (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")
--- a/layers/+frameworks/react/packages.el
+++ b/layers/+frameworks/react/packages.el
@ -45,10 +45,11 @@
  (add-hook 'react-mode-hook 'spacemacs/js-doc-require)
  (spacemacs/js-doc-set-key-bindings 'react-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/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-tern ()
  (add-hook 'react-mode-hook 'tern-mode)
--- a/layers/+fun/emoji/packages.el
+++ b/layers/+fun/emoji/packages.el
@ -39,13 +39,11 @@

 (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)
--- a/layers/+fun/games/packages.el
+++ b/layers/+fun/games/packages.el
@ -22,7 +22,6 @@

 (defun games/init-2048-game ()
  (use-package 2048-mode
-    :defer t
    :init
    (progn
      (push '("2048" . (2048-game :quit (kill-buffer-ask (get-buffer "2048"))
@ -43,7 +42,6 @@

 (defun games/init-pacmacs ()
  (use-package pacmacs
-    :defer t
    :init
    (push '("pacmacs" . (pacmacs-start
                         :quit (kill-buffer-ask (get-buffer "*Pacmacs*"))
@ -56,7 +54,6 @@

 (defun games/init-tetris ()
  (use-package tetris
-    :defer t
    :init
    (progn
      (push '("Tetris" . (tetris :quit spacemacs/tetris-quit-game
@ -75,7 +72,6 @@

 (defun games/init-sudoku ()
  (use-package sudoku
-    :defer t
    :init
    (progn
      (push '("sudoku" . (sudoku :quit (kill-buffer-ask (get-buffer "*Sudoku*"))
@ -121,7 +117,6 @@

 (defun games/init-typit ()
  (use-package typit
-    :defer t
    :init
    (progn
      (push '("typit (beginner)" .
--- a/layers/+fun/xkcd/packages.el
+++ b/layers/+fun/xkcd/packages.el
@ -13,7 +13,6 @@

 (defun xkcd/init-xkcd ()
  (use-package xkcd-mode
-    :defer t
    :init
    (progn
      (setq xkcd-cache-dir (concat spacemacs-cache-directory "xkcd/"))
--- a/layers/+intl/chinese/packages.el
+++ b/layers/+intl/chinese/packages.el
@ -72,11 +72,10 @@

 (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
@ -86,7 +85,6 @@

 (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.
--- a/layers/+intl/japanese/packages.el
+++ b/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,7 +41,6 @@

 (defun japanese/init-ddskk ()
  (use-package ddskk
-    :defer t
    :bind (("C-x j" . skk-mode))))

 (defun japanese/init-japanese-holidays ()
--- a/layers/+lang/agda/packages.el
+++ b/layers/+lang/agda/packages.el
@ -30,7 +30,6 @@
                             (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
--- a/layers/+lang/asciidoc/packages.el
+++ b/layers/+lang/asciidoc/packages.el
@ -17,7 +17,6 @@
    ;; 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.
--- a/layers/+lang/autohotkey/packages.el
+++ b/layers/+lang/autohotkey/packages.el
@ -16,7 +16,6 @@
 (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
--- a/layers/+lang/bibtex/packages.el
+++ b/layers/+lang/bibtex/packages.el
@ -30,7 +30,6 @@

 (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
--- a/layers/+lang/c-c++/packages.el
+++ b/layers/+lang/c-c++/packages.el
@ -39,7 +39,6 @@

 (defun c-c++/init-cc-mode ()
  (use-package cc-mode
-    :defer t
    :init
    (progn
      (add-to-list 'auto-mode-alist
@ -58,7 +57,6 @@

 (defun c-c++/init-disaster ()
  (use-package disaster
-    :defer t
    :commands (disaster)
    :init
    (progn
@ -90,7 +88,6 @@

 (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)))
@ -98,7 +95,6 @@
 (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)
@ -125,7 +121,6 @@

 (defun c-c++/init-gdb-mi ()
  (use-package gdb-mi
-    :defer t
    :init
    (setq
     ;; use gdb-many-windows by default when `M-x gdb'
@ -203,7 +198,6 @@

 (defun c-c++/init-realgud()
  (use-package realgud
-    :defer t
    :commands (realgud:gdb)
    :init
    (progn
--- a/layers/+lang/clojure/packages.el
+++ b/layers/+lang/clojure/packages.el
@ -33,7 +33,6 @@

 (defun clojure/init-cider ()
  (use-package cider
-    :defer t
    :init
    (progn
      (spacemacs/register-repl 'cider 'cider-jack-in "cider")
@ -242,7 +241,6 @@

 (defun clojure/init-clj-refactor ()
  (use-package clj-refactor
-    :defer t
    :init
    (add-hook 'clojure-mode-hook 'clj-refactor-mode)
    :config
@ -286,7 +284,6 @@

 (defun clojure/init-clojure-cheatsheet ()
  (use-package clojure-cheatsheet
-    :defer t
    :init
    (progn
      (setq sayid--key-binding-prefixes
@ -305,7 +302,6 @@

 (defun clojure/init-clojure-mode ()
  (use-package clojure-mode
-    :defer t
    :init
    (progn
      (add-to-list 'auto-mode-alist '("\\.boot\\'" . clojure-mode))
@ -341,13 +337,14 @@
    (push '("*cider-doc*" :dedicated t :position bottom :stick t :noselect nil :height 0.4)
          popwin:special-display-config)))

-(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/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-subword ()
  (add-hook 'cider-mode-hook 'subword-mode))
@ -370,7 +367,7 @@

 (defun clojure/init-clojure-snippets ()
  (use-package clojure-snippets
-    :defer t))
+   ))

 (defun clojure/pre-init-org ()
  (spacemacs|use-package-add-hook org
@ -379,7 +376,6 @@

 (defun clojure/init-sayid ()
  (use-package sayid
-    :defer t
    :init
    (progn
      (setq sayid--key-binding-prefixes
--- a/layers/+lang/common-lisp/funcs.el
+++ b/layers/+lang/common-lisp/funcs.el
@ -32,3 +32,11 @@
  (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))
--- a/layers/+lang/common-lisp/packages.el
+++ b/layers/+lang/common-lisp/packages.el
@ -85,12 +85,7 @@
      ;; enable fuzzy matching in code buffer and SLIME REPL
      (setq slime-complete-symbol*-fancy t)
      (setq slime-complete-symbol-function 'slime-fuzzy-complete-symbol)
-      ;; 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)
+      (add-hook 'slime-repl-mode-hook #'spacemacs/slime-disable-smartparens)
      (spacemacs/add-to-hooks 'slime-mode '(lisp-mode-hook)))
    :config
    (progn
--- a/layers/+lang/coq/packages.el
+++ b/layers/+lang/coq/packages.el
@ -22,7 +22,6 @@

 (defun coq/init-company-coq ()
  (use-package company-coq
-    :defer t
    :init
    (progn
      (add-hook 'coq-mode-hook #'company-coq-mode)
@ -42,7 +41,6 @@
 (defun coq/init-proof-general ()
  (use-package proof-site
    :mode ("\\.v\\'" . coq-mode)
-    :defer t
    :init
    (progn
      (setq coq/proof-general-load-path
@ -97,11 +95,13 @@
        ;; Insertions
        "ie" 'coq-end-Section))))

-(defun coq/post-init-smartparens ()
-  (spacemacs/add-to-hooks (if dotspacemacs-smartparens-strict-mode
-                              'smartparens-strict-mode
-                            'smartparens-mode)
-                          '(coq-mode-hook)))
+(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-vi-tilde-fringe ()
  (spacemacs/add-to-hooks 'spacemacs/disable-vi-tilde-fringe
--- a/layers/+lang/csharp/packages.el
+++ b/layers/+lang/csharp/packages.el
@ -26,7 +26,6 @@
  ;; 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))
@ -103,7 +102,7 @@

 (defun csharp/init-csharp-mode ()
  (use-package csharp-mode
-    :defer t))
+   ))

 (defun csharp/post-init-evil-matchit ()
  (with-eval-after-load 'evil-matchit
--- a/layers/+lang/csv/packages.el
+++ b/layers/+lang/csv/packages.el
@ -13,7 +13,6 @@

 (defun csv/init-csv-mode ()
  (use-package csv-mode
-    :defer t
    :init
    (progn
      (spacemacs/declare-prefix-for-mode 'csv-mode "ms" "sort")
--- a/layers/+lang/d/packages.el
+++ b/layers/+lang/d/packages.el
@ -30,7 +30,6 @@

 (defun d/init-company-dcd ()
  (use-package company-dcd
-    :defer t
    :init
    (progn
      (spacemacs|add-company-backends :backends company-dcd :modes d-mode)
@ -41,13 +40,13 @@
        "gr" 'company-dcd-ivy-search-symbol))))

 (defun d/init-d-mode ()
-  (use-package d-mode :defer t))
+  (use-package d-mode))

 (defun d/post-init-flycheck ()
  (spacemacs/enable-flycheck 'd-mode))

 (defun d/init-flycheck-dmd-dub ()
-  (use-package flycheck-dmd-dub :defer t
+  (use-package flycheck-dmd-dub
    :init
    (progn
      (add-hook 'd-mode-hook 'flycheck-dmd-dub-set-include-path)
--- a/layers/+lang/elixir/packages.el
+++ b/layers/+lang/elixir/packages.el
@ -33,7 +33,6 @@

 (defun elixir/init-alchemist ()
  (use-package alchemist
-    :defer t
    :init
    (progn
      (spacemacs/register-repl 'alchemist 'alchemist-iex-run "alchemist")
@ -159,12 +158,11 @@

 (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))
--- a/layers/+lang/elm/packages.el
+++ b/layers/+lang/elm/packages.el
@ -29,7 +29,6 @@
 (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 ()
@ -98,7 +97,8 @@
    (push '("*elm*" :tail t :noselect t) popwin:special-display-config)
    (push '("*elm-make*" :tail t :noselect t) popwin:special-display-config)))

-(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)))
+(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))))
--- a/layers/+lang/emacs-lisp/packages.el
+++ b/layers/+lang/emacs-lisp/packages.el
@ -35,7 +35,6 @@

 (defun emacs-lisp/init-ielm ()
  (use-package ielm
-    :defer t
    :init
    (progn
      (spacemacs/register-repl 'ielm 'ielm)
@ -60,7 +59,6 @@

 (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
@ -70,7 +68,6 @@

 (defun emacs-lisp/init-edebug ()
  (use-package edebug
-    :defer t
    :init
    (progn
      ;; key bindings
@ -108,7 +105,6 @@

 (defun emacs-lisp/init-auto-compile ()
  (use-package auto-compile
-    :defer t
    :init
    (progn
      (setq auto-compile-display-buffer nil
@ -125,7 +121,6 @@
 (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)
@ -161,7 +156,6 @@

 (defun emacs-lisp/init-macrostep ()
  (use-package macrostep
-    :defer t
    :mode (("\\*.el\\'" . emacs-lisp-mode)
           ("Cask\\'" . emacs-lisp-mode))
    :init
@ -182,7 +176,6 @@

 (defun emacs-lisp/init-nameless ()
  (use-package nameless
-    :defer t
    :init
    (progn
      (setq
@ -211,7 +204,6 @@

 (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
--- a/layers/+lang/erlang/packages.el
+++ b/layers/+lang/erlang/packages.el
@ -24,7 +24,6 @@

 (defun erlang/init-erlang ()
  (use-package erlang
-    :defer t
    :init
    (progn
      ;; explicitly run prog-mode hooks since erlang mode does is not
--- a/layers/+lang/ess/packages.el
+++ b/layers/+lang/ess/packages.el
@ -121,7 +121,6 @@

 (defun ess/init-ess-smart-equals ()
  (use-package ess-smart-equals
-    :defer t
    :init
    (progn
      (add-hook 'ess-mode-hook 'ess-smart-equals-mode)
--- a/layers/+lang/faust/packages.el
+++ b/layers/+lang/faust/packages.el
@ -21,7 +21,6 @@

 (defun faust/init-faust-mode ()
  (use-package faust-mode
-    :defer t
    :mode "\\.\\(dsp\\|lib\\)\\'"
    :init
    (progn
--- a/layers/+lang/forth/packages.el
+++ b/layers/+lang/forth/packages.el
@ -14,7 +14,6 @@

 (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
--- a/layers/+lang/fsharp/packages.el
+++ b/layers/+lang/fsharp/packages.el
@ -19,7 +19,6 @@

 (defun fsharp/init-fsharp-mode ()
  (use-package fsharp-mode
-    :defer t
    :init
    (progn
      (setq fsharp-doc-idle-delay .2)
--- a/layers/+lang/go/packages.el
+++ b/layers/+lang/go/packages.el
@ -36,7 +36,6 @@

 (defun go/init-company-go ()
  (use-package company-go
-    :defer t
    :init
    (spacemacs|add-company-backends
      :backends company-go
@ -55,7 +54,6 @@

 (defun go/init-go-mode()
  (use-package go-mode
-    :defer t
    :init
    (progn
      (defun spacemacs//go-set-tab-width ()
@ -115,7 +113,6 @@

 (defun go/init-godoctor ()
  (use-package godoctor
-    :defer t
    :init
    (progn
      (spacemacs/declare-prefix-for-mode 'go-mode "mr" "refactoring")
@ -135,7 +132,6 @@

 (defun go/init-flycheck-gometalinter ()
  (use-package flycheck-gometalinter
-    :defer t
    :init
    (add-hook 'go-mode-hook 'spacemacs//go-enable-gometalinter t)))

--- a/layers/+lang/gpu/packages.el
+++ b/layers/+lang/gpu/packages.el
@ -23,22 +23,19 @@

 (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 :defer t))
+  (use-package cuda-mode))

 (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))))
--- a/layers/+lang/groovy/packages.el
+++ b/layers/+lang/groovy/packages.el
@ -22,11 +22,10 @@

 (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")
--- a/layers/+lang/haskell/packages.el
+++ b/layers/+lang/haskell/packages.el
@ -32,35 +32,33 @@

 (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 " λ" " \\")
@ -69,7 +67,6 @@

 (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))))
@ -84,7 +81,6 @@

 (defun haskell/init-haskell-mode ()
  (use-package haskell-mode
-    :defer t
    :init
    (progn
      (add-hook 'haskell-mode-local-vars-hook
@ -272,7 +268,6 @@
 ;; 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)
@ -283,7 +278,6 @@

 (defun haskell/init-hlint-refactor ()
  (use-package hlint-refactor
-    :defer t
    :init
    (progn
      (spacemacs/set-leader-keys-for-major-mode 'haskell-mode
--- a/layers/+lang/html/packages.el
+++ b/layers/+lang/html/packages.el
@ -50,7 +50,6 @@

 (defun html/init-company-web ()
  (use-package company-web
-    :defer t
    :init
    (progn
      (spacemacs|add-company-backends
@ -68,7 +67,6 @@

 (defun html/init-css-mode ()
  (use-package css-mode
-    :defer t
    :init
    (progn
      ;; Mark `css-indent-offset' as safe-local variable
@ -108,7 +106,6 @@

 (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
@ -139,11 +136,10 @@

 (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)
@ -151,14 +147,12 @@

 (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))
@ -166,40 +160,37 @@

 (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/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))
+(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)))

  (add-hook 'web-mode-hook 'spacemacs/toggle-smartparens-off))

 (defun html/init-tagedit ()
  (use-package tagedit
-    :defer t
    :config
    (progn
      (tagedit-add-experimental-features)
@ -208,7 +199,6 @@

 (defun html/init-web-mode ()
  (use-package web-mode
-    :defer t
    :config
    (progn
      (spacemacs/declare-prefix-for-mode 'web-mode "me" "errors")
--- a/layers/+lang/idris/packages.el
+++ b/layers/+lang/idris/packages.el
@ -24,7 +24,6 @@

 (defun idris/init-idris-mode ()
  (use-package idris-mode
-    :defer t
    :init (spacemacs/register-repl 'idris-mode 'idris-repl "idris")
    :config
    (progn
--- a/layers/+lang/ipython-notebook/packages.el
+++ b/layers/+lang/ipython-notebook/packages.el
@ -21,7 +21,6 @@

 (defun ipython-notebook/init-ein ()
  (use-package ein
-    :defer t
    :commands (ein:notebooklist-open ein:notebooklist-login)
    :init
    (progn
--- a/layers/+lang/java/packages.el
+++ b/layers/+lang/java/packages.el
@ -36,7 +36,6 @@

 (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'
@ -44,7 +43,6 @@

 (defun java/init-eclim ()
  (use-package eclim
-    :defer t
    ;; :init (setq eclim-auto-save nil)
    :config
    (progn
@ -157,7 +155,6 @@

 (defun java/init-ensime ()
  (use-package ensime
-    :defer t
    :commands ensime-mode
    :init
    (progn
@ -291,7 +288,6 @@
 ;; (defun java/post-init-ensime ()
 ;;   (when (eq 'ensime java-backend)
 ;;     (use-package ensime
-;;       :defer t
 ;;       :init
 ;;       (progn
 ;;         (spacemacs//ensime-init 'java-mode t nil)
@ -318,7 +314,6 @@

 (defun java/init-gradle-mode ()
  (use-package gradle-mode
-    :defer t
    :init
    (progn
      (when (configuration-layer/package-used-p 'groovy-mode)
@ -351,7 +346,6 @@

 (defun java/init-java-mode ()
  (use-package java-mode
-    :defer t
    :init
    (progn
      (add-hook 'java-mode-local-vars-hook #'spacemacs//java-setup-backend)
@ -360,7 +354,6 @@

 (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)
@ -381,7 +374,6 @@

 (defun java/init-meghanada ()
  (use-package meghanada
-    :defer t
    :init
    (progn
      (setq meghanada-server-install-dir (concat spacemacs-cache-directory
@ -434,7 +426,6 @@

 (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")
--- a/layers/+lang/javascript/packages.el
+++ b/layers/+lang/javascript/packages.el
@ -40,7 +40,6 @@

 (defun javascript/init-coffee-mode ()
  (use-package coffee-mode
-    :defer t
    :init
    (progn
      (spacemacs/register-repl 'coffee-mode 'coffee-repl "coffeescript")
@ -66,7 +65,6 @@
  (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)))
@ -94,12 +92,10 @@

 (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))
@ -127,7 +123,6 @@

 (defun javascript/init-js2-refactor ()
  (use-package js2-refactor
-    :defer t
    :init
    (progn
      (add-hook 'js2-mode-hook 'spacemacs/js2-refactor-require)
@ -182,18 +177,16 @@

 (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
@ -204,7 +197,6 @@

 (defun javascript/init-web-beautify ()
  (use-package web-beautify
-    :defer t
    :init
    (progn
      (spacemacs/set-leader-keys-for-major-mode 'js2-mode
@ -218,7 +210,6 @@

 (defun javascript/init-skewer-mode ()
  (use-package skewer-mode
-    :defer t
    :init
    (progn
      (spacemacs/register-repl 'skewer-mode
@ -245,7 +236,6 @@

 (defun javascript/init-livid-mode ()
  (use-package livid-mode
-    :defer t
    :init
    (progn
      (spacemacs|add-toggle javascript-repl-live-evaluation
--- a/layers/+lang/kotlin/packages.el
+++ b/layers/+lang/kotlin/packages.el
@ -23,7 +23,6 @@

 (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 ()
@ -34,4 +33,4 @@

 (defun kotlin/init-kotlin-mode ()
  (use-package kotlin-mode
-    :defer t))
+   ))
--- a/layers/+lang/latex/packages.el
+++ b/layers/+lang/latex/packages.el
@ -30,7 +30,6 @@

 (defun latex/init-auctex ()
  (use-package tex
-    :defer t
    :init
    (progn
      (setq TeX-command-default latex-build-command
@ -136,12 +135,10 @@

 (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
@ -207,7 +204,6 @@

 (defun latex/init-magic-latex-buffer ()
  (use-package magic-latex-buffer
-    :defer t
    :init
    (progn
      (add-hook 'LaTeX-mode-hook 'magic-latex-buffer)
--- a/layers/+lang/lua/packages.el
+++ b/layers/+lang/lua/packages.el
@ -25,7 +25,6 @@

 (defun lua/init-lua-mode ()
  (use-package lua-mode
-    :defer t
    :mode ("\\.lua\\'" . lua-mode)
    :interpreter ("lua" . lua-mode)
    :init
@ -44,7 +43,6 @@

 (defun lua/init-company-lua ()
  (use-package company-lua
-    :defer t
    :init (spacemacs|add-company-backends
            :backends company-lua
            :modes lua-mode)))
--- a/layers/+lang/major-modes/packages.el
+++ b/layers/+lang/major-modes/packages.el
@ -44,7 +44,6 @@

 (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
@ -53,7 +52,6 @@
 (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
@ -66,7 +64,6 @@

 (defun major-modes/init-qml-mode ()
  (use-package qml-mode
-    :defer t
    :mode "\\.qml\\'"))

 (defun major-modes/init-scad-mode ())
@ -77,7 +74,6 @@

 (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
@ -89,6 +85,5 @@
 ;; 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\\'"))
--- a/layers/+lang/markdown/packages.el
+++ b/layers/+lang/markdown/packages.el
@ -39,7 +39,6 @@

 (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
@ -53,7 +52,6 @@
    :mode
    (("\\.m[k]d" . markdown-mode)
     ("\\.mdk" . markdown-mode))
-    :defer t
    :config
    (progn
      (add-hook 'markdown-mode-hook 'orgtbl-mode)
@ -150,7 +148,6 @@

 (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
@ -165,7 +162,6 @@

 (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
--- a/layers/+lang/nim/packages.el
+++ b/layers/+lang/nim/packages.el
@ -18,7 +18,6 @@

 (defun nim/init-nim-mode ()
  (use-package nim-mode
-    :defer t
    :init
    (progn
      (add-hook 'nim-mode-hook 'nimsuggest-mode)
--- a/layers/+lang/ocaml/packages.el
+++ b/layers/+lang/ocaml/packages.el
@ -38,7 +38,6 @@
  (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
@ -56,7 +55,6 @@

 (defun ocaml/init-merlin ()
  (use-package merlin
-    :defer t
    :init
    (progn
      (add-to-list 'spacemacs-jump-handlers-tuareg-mode
@ -86,7 +84,6 @@

 (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
@ -102,7 +99,6 @@
  (use-package tuareg
    :mode (("\\.ml[ily]?$" . tuareg-mode)
           ("\\.topml$" . tuareg-mode))
-    :defer t
    :init
    (progn
      (spacemacs//init-ocaml-opam)
@ -115,7 +111,6 @@

 (defun ocaml/init-utop ()
  (use-package utop
-    :defer t
    :init
    (progn
      (add-hook 'tuareg-mode-hook 'utop-minor-mode)
--- a/layers/+lang/perl5/packages.el
+++ b/layers/+lang/perl5/packages.el
@ -19,7 +19,6 @@

 (defun perl5/init-company-plsense ()
  (use-package company-plsense
-    :defer t
    :init
    (spacemacs|add-company-backends
      :backends company-plsense
@ -27,7 +26,6 @@

 (defun perl5/init-cperl-mode ()
  (use-package cperl-mode
-    :defer t
    :mode "\\.\\(p[lm]x?\\|P[LM]X?\\)\\'"
    :interpreter "perl"
    :interpreter "perl5"
--- a/layers/+lang/perl6/packages.el
+++ b/layers/+lang/perl6/packages.el
@ -37,5 +37,4 @@

 (defun perl6/init-perl6-mode()
  (use-package perl6-mode
-    :defer t
    :mode (("/perl6/site/sources/" . perl6-mode))))
--- a/layers/+lang/php/packages.el
+++ b/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,28 +46,26 @@

 (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)
--- a/layers/+lang/plantuml/packages.el
+++ b/layers/+lang/plantuml/packages.el
@ -25,7 +25,6 @@

 (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
--- a/layers/+lang/purescript/packages.el
+++ b/layers/+lang/purescript/packages.el
@ -29,7 +29,6 @@

 (defun purescript/init-purescript-mode ()
  (use-package purescript-mode
-    :defer t
    :init
    (progn
      (add-hook 'purescript-mode-hook 'turn-on-purescript-indentation)
@ -42,7 +41,6 @@

 (defun purescript/init-psci ()
  (use-package psci
-    :defer t
    :init
    (progn
      (spacemacs/register-repl 'psci 'psci "purescript")
@ -56,7 +54,6 @@

 (defun purescript/init-psc-ide ()
  (use-package psc-ide
-    :defer t
    :init
    (progn
      (add-hook 'purescript-mode-hook 'psc-ide-mode)
--- a/layers/+lang/python/packages.el
+++ b/layers/+lang/python/packages.el
@ -88,13 +88,11 @@

 (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
@ -126,13 +124,11 @@

 (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
@ -157,7 +153,6 @@

 (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
@ -207,11 +202,10 @@

 (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
@ -220,7 +214,6 @@

 (defun python/init-py-isort ()
  (use-package py-isort
-    :defer t
    :init
    (progn
      (add-hook 'before-save-hook 'spacemacs//python-sort-imports)
@ -250,7 +243,6 @@

 (defun python/init-pyvenv ()
  (use-package pyvenv
-    :defer t
    :init
    (progn
      (pcase python-auto-set-local-pyvenv-virtualenv
@ -299,7 +291,6 @@

 (defun python/init-python ()
  (use-package python
-    :defer t
    :mode (("SConstruct\\'" . python-mode) ("SConscript\\'" . python-mode))
    :init
    (progn
@ -404,7 +395,6 @@ fix this issue."

 (defun python/init-yapfify ()
  (use-package yapfify
-    :defer t
    :init
    (progn
      (spacemacs/set-leader-keys-for-major-mode 'python-mode
--- a/layers/+lang/racket/packages.el
+++ b/layers/+lang/racket/packages.el
@ -40,7 +40,6 @@

 (defun racket/init-racket-mode ()
  (use-package racket-mode
-    :defer t
    :init
    (progn
      (spacemacs/register-repl 'racket-mode 'racket-repl "racket"))
--- a/layers/+lang/restructuredtext/packages.el
+++ b/layers/+lang/restructuredtext/packages.el
@ -49,7 +49,6 @@

 (defun restructuredtext/init-rst ()
  (use-package rst
-    :defer t
    :config (add-hook 'rst-adjust-hook 'rst-toc-update)))

 (defun restructuredtext/post-init-flyspell ()
--- a/layers/+lang/ruby/packages.el
+++ b/layers/+lang/ruby/packages.el
@ -39,7 +39,6 @@

 (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
@ -63,7 +62,6 @@
  (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))))

@ -100,7 +98,6 @@

 (defun ruby/init-minitest ()
  (use-package minitest
-    :defer t
    :init
    (progn
      (spacemacs/add-to-hooks 'spacemacs//ruby-enable-minitest-mode
@ -132,13 +129,11 @@
 (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")
@ -170,7 +165,6 @@

 (defun ruby/init-rspec-mode ()
  (use-package rspec-mode
-    :defer t
    :init
    (progn
      (spacemacs/add-to-hooks 'spacemacs//ruby-enable-rspec-mode
@ -202,7 +196,6 @@

 (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))
@ -217,7 +210,6 @@

 (defun ruby/init-ruby-mode ()
  (use-package ruby-mode
-    :defer t
    :mode (("Appraisals\\'" . ruby-mode)
           ("Puppetfile" . ruby-mode))
    :init
@ -232,7 +224,6 @@

 (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
@ -240,7 +231,6 @@

 (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
@ -255,7 +245,6 @@

 (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
@ -271,7 +260,6 @@
 (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))
@ -290,7 +278,6 @@
 (defun ruby/init-rvm ()
  (use-package rvm
    :if (equal ruby-version-manager 'rvm)
-    :defer t
    :init
    (progn
      (setq rspec-use-rvm t)
@ -310,7 +297,6 @@

 (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
--- a/layers/+lang/rust/packages.el
+++ b/layers/+lang/rust/packages.el
@ -25,7 +25,6 @@

 (defun rust/init-cargo ()
  (use-package cargo
-    :defer t
    :init
    (progn
      (spacemacs/declare-prefix-for-mode 'rust-mode "mc" "cargo")
@ -54,7 +53,6 @@

 (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 ()
@ -68,7 +66,6 @@

 (defun rust/init-rust-mode ()
  (use-package rust-mode
-    :defer t
    :init
    (progn
      (spacemacs/set-leader-keys-for-major-mode 'rust-mode
@ -100,7 +97,6 @@

 (defun rust/init-racer ()
  (use-package racer
-    :defer t
    :init
    (progn
      (spacemacs/add-to-hook 'rust-mode-hook '(racer-mode))
--- a/layers/+lang/scala/packages.el
+++ b/layers/+lang/scala/packages.el
@ -34,7 +34,6 @@

 (defun scala/post-init-ensime ()
  (use-package ensime
-    :defer t
    :init
    (progn
      (add-hook 'scala-mode-hook #'spacemacs//scala-setup-ensime)
@ -67,14 +66,12 @@

 (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"))
--- a/layers/+lang/shell-scripts/packages.el
+++ b/layers/+lang/shell-scripts/packages.el
@ -25,7 +25,6 @@

 (defun shell-scripts/init-company-shell ()
  (use-package company-shell
-    :defer t
    :init
    (progn
      (spacemacs|add-company-backends
@ -40,16 +39,14 @@

 (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
@ -101,7 +98,6 @@

 (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
--- a/layers/+lang/sml/packages.el
+++ b/layers/+lang/sml/packages.el
@ -19,7 +19,6 @@
 (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
--- a/layers/+lang/sql/packages.el
+++ b/layers/+lang/sql/packages.el
@ -19,7 +19,6 @@

 (defun sql/init-sql ()
  (use-package sql
-    :defer t
    :init (spacemacs/register-repl 'sql 'spacemacs/sql-start "sql")
    :config
    (progn
@ -126,11 +125,10 @@

 (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)
--- a/layers/+lang/swift/packages.el
+++ b/layers/+lang/swift/packages.el
@ -22,7 +22,6 @@
 (defun swift/init-swift-mode ()
  (use-package swift-mode
    :mode ("\\.swift\\'" . swift-mode)
-    :defer t
    :init
    (progn
      (spacemacs|advise-commands "store-initial-buffer-name"
--- a/layers/+lang/typescript/packages.el
+++ b/layers/+lang/typescript/packages.el
@ -42,7 +42,6 @@

 (defun typescript/init-tide ()
  (use-package tide
-    :defer t
    :commands (typescript/jump-to-type-def)
    :init
    (progn
@ -90,7 +89,6 @@

 (defun typescript/init-typescript-mode ()
  (use-package typescript-mode
-    :defer t
    :config
    (progn
      (when typescript-fmt-on-save
--- a/layers/+lang/vimscript/packages.el
+++ b/layers/+lang/vimscript/packages.el
@ -23,7 +23,6 @@
  (use-package vimrc-mode
    :mode "\\.vim[rc]?\\'"
    :mode "_vimrc\\'"
-    :defer t
    :init
    (progn
    (defun spacemacs//vimrc-mode-hook ()
@ -40,7 +39,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))
--- a/layers/+lang/windows-scripts/packages.el
+++ b/layers/+lang/windows-scripts/packages.el
@ -60,7 +60,6 @@
  (use-package powershell
    :mode (("\\.ps1\\'"  . powershell-mode)
           ("\\.psm1\\'" . powershell-mode))
-    :defer t
    :init
    (progn
      (defun powershell/define-text-objects ()
--- a/layers/+misc/parinfer/packages.el
+++ b/layers/+misc/parinfer/packages.el
@ -14,7 +14,6 @@

 (defun parinfer/init-parinfer ()
  (use-package parinfer
-    :defer t
    :diminish parinfer-mode
    :init
    (progn
--- a/layers/+os/nixos/packages.el
+++ b/layers/+os/nixos/packages.el
@ -18,11 +18,10 @@

 (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
@ -30,14 +29,13 @@

 (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 :defer t))
+  (use-package nixos-options))

 (defun nixos/post-init-flycheck ()
  (spacemacs/enable-flycheck 'nix-mode))
--- a/layers/+os/osx/packages.el
+++ b/layers/+os/osx/packages.el
@ -51,7 +51,6 @@
 (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))
--- a/layers/+pair-programming/floobits/packages.el
+++ b/layers/+pair-programming/floobits/packages.el
@ -16,7 +16,6 @@

 (defun floobits/init-floobits ()
  (use-package floobits
-    :defer t
    :init
    (progn
      (spacemacs/declare-prefix "P" "PP/floobits")
--- a/layers/+source-control/git/packages.el
+++ b/layers/+source-control/git/packages.el
@ -39,7 +39,6 @@

 (defun git/init-evil-magit ()
  (use-package evil-magit
-    :defer t
    :init (add-hook 'spacemacs-editing-style-hook
                    'spacemacs//magit-evil-magit-bindings)))

@ -48,16 +47,14 @@

 (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")
@ -71,13 +68,11 @@

 (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
@ -105,19 +100,18 @@

 (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
@ -214,7 +208,6 @@ 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")
--- a/layers/+source-control/github/packages.el
+++ b/layers/+source-control/github/packages.el
@ -24,7 +24,6 @@

 (defun github/init-gist ()
  (use-package gist
-    :defer t
    :init
    (progn
      (spacemacs/declare-prefix "gg" "github gist")
@ -49,7 +48,6 @@

 (defun github/init-github-clone ()
  (use-package github-clone
-    :defer t
    :init
    (progn
      (spacemacs/declare-prefix "ghc" "clone")
@ -75,6 +73,7 @@
    :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")))))
@ -82,7 +81,6 @@

 (defun github/init-magithub ()
  (use-package magithub
-    :defer t
    :after magit
    :init
    (setq magithub-dir (concat spacemacs-cache-directory "magithub/"))
--- a/layers/+source-control/version-control/packages.el
+++ b/layers/+source-control/version-control/packages.el
@ -25,7 +25,6 @@

 (defun version-control/init-vc ()
  (use-package vc
-    :defer t
    :init
    (spacemacs/declare-prefix "gv" "version-control")
    :config
@ -87,7 +86,6 @@

 (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
@ -249,7 +247,6 @@

 (defun version-control/init-smerge-mode ()
  (use-package smerge-mode
-    :defer t
    :diminish smerge-mode
    :commands spacemacs/smerge-transient-state/body
    :init
@ -286,5 +283,4 @@

 (defun version-control/init-browse-at-remote ()
  (use-package browse-at-remote
-    :defer t
    :init (spacemacs/set-leader-keys "gho" 'browse-at-remote)))
--- a/layers/+spacemacs/spacemacs-editing-visual/packages.el
+++ b/layers/+spacemacs/spacemacs-editing-visual/packages.el
@ -60,7 +60,6 @@

 (defun spacemacs-editing-visual/init-highlight-indentation ()
  (use-package highlight-indentation
-    :defer t
    :init
    (progn
      (spacemacs|add-toggle highlight-indentation
@ -78,7 +77,6 @@

 (defun spacemacs-editing-visual/init-highlight-numbers ()
  (use-package highlight-numbers
-    :defer t
    :init
    (progn
      (add-hook 'prog-mode-hook 'highlight-numbers-mode)
@ -86,7 +84,6 @@

 (defun spacemacs-editing-visual/init-highlight-parentheses ()
  (use-package highlight-parentheses
-    :defer t
    :init
    (progn
      (when (member dotspacemacs-highlight-delimiters '(all current))
@ -121,7 +118,6 @@

 (defun spacemacs-editing-visual/init-indent-guide ()
  (use-package indent-guide
-    :defer t
    :init
    (progn
      (setq indent-guide-delay 0.3)
@ -140,7 +136,6 @@

 (defun spacemacs-editing-visual/init-rainbow-delimiters ()
  (use-package rainbow-delimiters
-    :defer t
    :init
    (progn
      (spacemacs/set-leader-keys "tCd" 'rainbow-delimiters-mode)
--- a/layers/+spacemacs/spacemacs-editing/packages.el
+++ b/layers/+spacemacs/spacemacs-editing/packages.el
@ -35,7 +35,6 @@

 (defun spacemacs-editing/init-aggressive-indent ()
  (use-package aggressive-indent
-    :defer t
    :init
    (progn
      (spacemacs|add-toggle aggressive-indent
@ -53,7 +52,6 @@

 (defun spacemacs-editing/init-avy ()
  (use-package avy
-    :defer t
    :commands (spacemacs/avy-open-url spacemacs/avy-goto-url avy-pop-mark)
    :init
    (progn
@ -81,7 +79,6 @@

 (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)))
@ -104,7 +101,6 @@

 (defun spacemacs-editing/init-expand-region ()
  (use-package expand-region
-    :defer t
    :init (spacemacs/set-leader-keys "v" 'er/expand-region)
    :config
    (progn
@ -139,7 +135,6 @@

 (defun spacemacs-editing/init-hexl ()
  (use-package hexl
-    :defer t
    :init
    (progn
      (spacemacs/set-leader-keys "fh" 'hexl-find-file)
@ -162,7 +157,6 @@

 (defun spacemacs-editing/init-hungry-delete ()
  (use-package hungry-delete
-    :defer t
    :init
    (spacemacs|add-toggle hungry-delete
      :mode hungry-delete-mode
@ -176,7 +170,6 @@

 (defun spacemacs-editing/init-link-hint ()
  (use-package link-hint
-    :defer t
    :init
    (spacemacs/set-leader-keys
      "xo" 'link-hint-open-link
@ -197,7 +190,6 @@

 (defun spacemacs-editing/init-move-text ()
  (use-package move-text
-    :defer t
    :init
    (spacemacs|define-transient-state move-text
      :title "Move Text Transient State"
@ -210,7 +202,6 @@

 (defun spacemacs-editing/init-origami ()
  (use-package origami
-    :defer t
    :init
    (progn
      (global-origami-mode)
@ -262,7 +253,6 @@

 (defun spacemacs-editing/init-password-generator ()
  (use-package password-generator
-    :defer t
    :init
    (progn
      (spacemacs/declare-prefix "ip" "passwords")
@ -275,7 +265,6 @@

 (defun spacemacs-editing/init-smartparens ()
  (use-package smartparens
-    :defer t
    :commands (sp-split-sexp sp-newline sp-up-sexp)
    :init
    (progn
--- a/layers/+spacemacs/spacemacs-evil/packages.el
+++ b/layers/+spacemacs/spacemacs-evil/packages.el
@ -41,6 +41,7 @@

 (defun spacemacs-evil/init-evil-anzu ()
  (use-package evil-anzu
+    :demand t
    :init
    (global-anzu-mode t)
    :config
@ -74,7 +75,6 @@

 (defun spacemacs-evil/init-evil-cleverparens ()
  (use-package evil-cleverparens
-    :defer t
    :init
    (progn
      (setq evil-cleverparens-use-regular-insert t)
@ -131,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
@ -211,7 +211,7 @@

 (defun spacemacs-evil/init-evil-matchit ()
  (use-package evil-matchit
-    :defer t))
+   ))

 (defun spacemacs-evil/init-evil-numbers ()
  (use-package evil-numbers
@ -278,7 +278,6 @@

 (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
--- a/layers/+spacemacs/spacemacs-language/packages.el
+++ b/layers/+spacemacs/spacemacs-language/packages.el
@ -15,7 +15,6 @@

 (defun spacemacs-language/init-define-word ()
  (use-package define-word
-    :defer t
    :init
    (spacemacs/set-leader-keys
      "xwd" 'define-word-at-point)))
--- a/layers/+spacemacs/spacemacs-layouts/packages.el
+++ b/layers/+spacemacs/spacemacs-layouts/packages.el
@ -240,5 +240,4 @@

 (defun spacemacs-layouts/init-counsel-projectile ()
  (use-package counsel-projectile
-    :defer t
    :init (spacemacs/set-leader-keys "pl" 'spacemacs/ivy-persp-switch-project)))
--- a/layers/+spacemacs/spacemacs-misc/packages.el
+++ b/layers/+spacemacs/spacemacs-misc/packages.el
@ -17,7 +17,6 @@

 (defun spacemacs-misc/init-dumb-jump ()
  (use-package dumb-jump
-    :defer t
    :init
    (progn
      ;; not activating `dumb-jump-mode' because it only adds key bindings, and
--- a/layers/+spacemacs/spacemacs-modeline/packages.el
+++ b/layers/+spacemacs/spacemacs-modeline/packages.el
@ -33,7 +33,6 @@

 (defun spacemacs-modeline/init-fancy-battery ()
  (use-package fancy-battery
-    :defer t
    :init
    (progn
      (spacemacs|add-toggle mode-line-battery
@ -51,6 +50,7 @@
 (defun spacemacs-modeline/init-spaceline ()
  (use-package spaceline-config
    :if (memq (spacemacs/get-mode-line-theme-name) '(spacemacs all-the-icons custom))
+    :demand t
    :init
    (progn
      (add-hook 'spacemacs-post-user-config-hook 'spaceline-compile)
@ -159,7 +159,6 @@

 (defun spacemacs-modeline/init-spaceline-all-the-icons ()
  (use-package spaceline-all-the-icons
-    :defer t
    :init
    (progn
      (setq
@ -170,7 +169,6 @@

 (defun spacemacs-modeline/init-symon ()
  (use-package symon
-    :defer t
    :init
    (progn
      (setq symon-delay 0
--- a/layers/+spacemacs/spacemacs-navigation/packages.el
+++ b/layers/+spacemacs/spacemacs-navigation/packages.el
@ -41,7 +41,6 @@

 (defun spacemacs-navigation/init-auto-highlight-symbol ()
  (use-package auto-highlight-symbol
-    :defer t
    :init
    (progn
      (setq ahs-case-fold-search nil
@ -150,13 +149,11 @@

 (defun spacemacs-navigation/init-compile ()
  (use-package compile
-    :defer t
    :config
    (define-key compilation-mode-map "h" nil)))

 (defun spacemacs-navigation/init-doc-view ()
  (use-package doc-view
-    :defer t
    :init
    (evilified-state-evilify doc-view-mode doc-view-mode-map
      "/"  'spacemacs/doc-view-search-new-query
@ -193,7 +190,6 @@

 (defun spacemacs-navigation/init-golden-ratio ()
  (use-package golden-ratio
-    :defer t
    :init
    (progn
      (spacemacs/transient-state-register-add-bindings 'window-manipulation
@ -289,13 +285,11 @@

 (defun spacemacs-navigation/init-grep ()
  (use-package grep
-    :defer t
    :config
    (define-key grep-mode-map "h" nil)))

 (defun spacemacs-navigation/init-info+ ()
  (use-package info+
-    :defer t
    :init
    (progn
      (with-eval-after-load 'info
@ -304,7 +298,6 @@

 (defun spacemacs-navigation/init-open-junk-file ()
  (use-package open-junk-file
-    :defer t
    :commands (open-junk-file)
    :init
    (progn
@ -328,7 +321,6 @@

 (defun spacemacs-navigation/init-restart-emacs ()
  (use-package restart-emacs
-    :defer t
    :init
    (spacemacs/set-leader-keys
      "qd" 'spacemacs/restart-emacs-debug-init
@ -351,6 +343,7 @@

 (defun spacemacs-navigation/init-winum ()
  (use-package winum
+    :demand t
    :config
    (progn
      (setq winum-auto-assign-0-to-minibuffer nil
--- a/layers/+spacemacs/spacemacs-org/packages.el
+++ b/layers/+spacemacs/spacemacs-org/packages.el
@ -36,7 +36,6 @@
 (defun spacemacs-org/init-default-org-config ()
  (use-package org
    :commands (org-clock-out org-occur-in-agenda-files org-agenda-files)
-    :defer t
    :init
    (progn
      ;; FIXME: This check has been disabled pending a resolution of
@ -64,12 +63,10 @@

 (defun spacemacs-org/init-org-bullets ()
  (use-package org-bullets
-    :defer t
    :init (add-hook 'org-mode-hook 'org-bullets-mode)))

 (defun spacemacs-org/init-toc-org ()
  (use-package toc-org
-    :defer t
    :init
    (progn
      (setq toc-org-max-depth 10)
--- a/Show More
+++ b/Show More