From ebe4c602647801d59013915c8c97d44570556f3e Mon Sep 17 00:00:00 2001 From: syl20bnr Date: Sat, 3 Mar 2018 23:37:53 -0500 Subject: [PATCH] Revert "Defer packages by default using use-package-always-defer" This reverts commit 29c78ce841ee5a99bb4077a2862afc96c8136107 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 | 19 ++++-------- doc/VIMUSERS.org | 8 +++-- layers/+chat/erc/packages.el | 5 ++++ layers/+chat/jabber/packages.el | 1 + layers/+chat/rcirc/packages.el | 4 ++- layers/+chat/slack/packages.el | 2 ++ layers/+checkers/spell-checking/packages.el | 3 ++ layers/+checkers/syntax-checking/packages.el | 2 ++ layers/+completion/auto-completion/README.org | 1 + .../+completion/auto-completion/packages.el | 9 +++++- layers/+completion/helm/packages.el | 10 ++++++- layers/+completion/ivy/packages.el | 11 +++---- .../+distributions/spacemacs-base/packages.el | 15 +++++++--- .../spacemacs-bootstrap/packages.el | 1 - layers/+emacs/better-defaults/packages.el | 2 ++ layers/+emacs/ibuffer/packages.el | 2 ++ layers/+emacs/org/packages.el | 12 +++++++- layers/+emacs/semantic/packages.el | 5 ++-- layers/+emacs/smex/packages.el | 1 + layers/+emacs/typography/packages.el | 2 ++ layers/+email/gnus/packages.el | 1 + layers/+email/mu4e/packages.el | 2 ++ layers/+email/notmuch/packages.el | 3 ++ layers/+filetree/neotree/packages.el | 1 + layers/+filetree/treemacs/packages.el | 3 +- layers/+fonts/unicode-fonts/packages.el | 2 +- layers/+frameworks/django/packages.el | 1 + layers/+frameworks/react/packages.el | 9 +++--- layers/+fun/emoji/packages.el | 2 ++ layers/+fun/games/packages.el | 5 ++++ layers/+fun/xkcd/packages.el | 1 + layers/+intl/chinese/packages.el | 4 ++- layers/+intl/japanese/packages.el | 3 +- layers/+lang/agda/packages.el | 1 + layers/+lang/asciidoc/packages.el | 1 + layers/+lang/autohotkey/packages.el | 1 + layers/+lang/bibtex/packages.el | 1 + layers/+lang/c-c++/packages.el | 6 ++++ layers/+lang/clojure/packages.el | 22 ++++++++------ layers/+lang/common-lisp/funcs.el | 8 ----- layers/+lang/common-lisp/packages.el | 7 ++++- layers/+lang/coq/packages.el | 14 ++++----- layers/+lang/csharp/packages.el | 3 +- layers/+lang/csv/packages.el | 1 + layers/+lang/d/packages.el | 5 ++-- layers/+lang/elixir/packages.el | 4 ++- layers/+lang/elm/packages.el | 10 +++---- layers/+lang/emacs-lisp/packages.el | 8 +++++ layers/+lang/erlang/packages.el | 1 + layers/+lang/ess/packages.el | 1 + layers/+lang/faust/packages.el | 1 + layers/+lang/forth/packages.el | 1 + layers/+lang/fsharp/packages.el | 1 + layers/+lang/go/packages.el | 4 +++ layers/+lang/gpu/packages.el | 5 +++- layers/+lang/groovy/packages.el | 3 +- layers/+lang/haskell/packages.el | 14 ++++++--- layers/+lang/html/packages.el | 30 ++++++++++++------- layers/+lang/idris/packages.el | 1 + layers/+lang/ipython-notebook/packages.el | 1 + layers/+lang/java/packages.el | 9 ++++++ layers/+lang/javascript/packages.el | 12 +++++++- layers/+lang/kotlin/packages.el | 3 +- layers/+lang/latex/packages.el | 4 +++ layers/+lang/lua/packages.el | 2 ++ layers/+lang/major-modes/packages.el | 5 ++++ layers/+lang/markdown/packages.el | 4 +++ layers/+lang/nim/packages.el | 1 + layers/+lang/ocaml/packages.el | 5 ++++ layers/+lang/perl5/packages.el | 2 ++ layers/+lang/perl6/packages.el | 1 + layers/+lang/php/packages.el | 12 ++++---- layers/+lang/plantuml/packages.el | 1 + layers/+lang/purescript/packages.el | 3 ++ layers/+lang/python/packages.el | 12 +++++++- layers/+lang/racket/packages.el | 1 + layers/+lang/restructuredtext/packages.el | 1 + layers/+lang/ruby/packages.el | 14 +++++++++ layers/+lang/rust/packages.el | 4 +++ layers/+lang/scala/packages.el | 3 ++ layers/+lang/shell-scripts/packages.el | 6 +++- layers/+lang/sml/packages.el | 1 + layers/+lang/sql/packages.el | 4 ++- layers/+lang/swift/packages.el | 1 + layers/+lang/typescript/packages.el | 2 ++ layers/+lang/vimscript/packages.el | 3 +- layers/+lang/windows-scripts/packages.el | 1 + layers/+misc/nlinum/packages.el | 1 - layers/+misc/parinfer/packages.el | 1 + layers/+os/nixos/packages.el | 6 ++-- layers/+os/osx/packages.el | 1 + layers/+pair-programming/floobits/packages.el | 1 + layers/+source-control/git/packages.el | 15 +++++++--- layers/+source-control/github/packages.el | 4 ++- .../version-control/packages.el | 4 +++ .../spacemacs-editing-visual/packages.el | 5 ++++ .../+spacemacs/spacemacs-editing/packages.el | 14 +++++++-- layers/+spacemacs/spacemacs-evil/packages.el | 12 ++++---- .../+spacemacs/spacemacs-language/packages.el | 1 + .../+spacemacs/spacemacs-layouts/packages.el | 1 + layers/+spacemacs/spacemacs-misc/packages.el | 1 + .../+spacemacs/spacemacs-modeline/packages.el | 4 ++- .../spacemacs-navigation/packages.el | 9 +++++- layers/+spacemacs/spacemacs-org/packages.el | 3 ++ .../+spacemacs/spacemacs-purpose/packages.el | 2 ++ .../+spacemacs/spacemacs-visual/packages.el | 4 ++- layers/+tags/cscope/packages.el | 1 + layers/+tags/gtags/packages.el | 3 ++ layers/+themes/colors/packages.el | 2 ++ layers/+tools/ansible/packages.el | 5 +++- layers/+tools/bm/packages.el | 1 + layers/+tools/cfengine/packages.el | 3 +- layers/+tools/chrome/packages.el | 2 ++ layers/+tools/cmake/packages.el | 8 ++--- layers/+tools/dash/packages.el | 4 +++ layers/+tools/deft/packages.el | 1 + layers/+tools/docker/packages.el | 4 ++- layers/+tools/finance/packages.el | 1 + layers/+tools/geolocation/packages.el | 2 ++ layers/+tools/imenu-list/packages.el | 1 + layers/+tools/lsp/packages.el | 1 + layers/+tools/nginx/packages.el | 2 +- layers/+tools/node/packages.el | 2 +- layers/+tools/pandoc/packages.el | 2 ++ layers/+tools/pass/packages.el | 1 + layers/+tools/pdf-tools/packages.el | 1 + layers/+tools/puppet/packages.el | 1 + layers/+tools/rebox/packages.el | 1 + layers/+tools/restclient/packages.el | 3 ++ layers/+tools/salt/packages.el | 1 + layers/+tools/shell/packages.el | 5 ++++ layers/+tools/systemd/packages.el | 1 + layers/+tools/terraform/packages.el | 2 ++ layers/+tools/tmux/local/tmux/tmux.el | 17 +++++++++++ layers/+tools/tmux/packages.el | 21 +------------ layers/+tools/transmission/packages.el | 1 + layers/+tools/vagrant/packages.el | 2 ++ layers/+tools/ycmd/packages.el | 3 ++ layers/+vim/vinegar/packages.el | 3 ++ layers/+web-services/confluence/packages.el | 1 + layers/+web-services/elfeed/packages.el | 3 ++ layers/+web-services/spotify/packages.el | 2 ++ layers/+web-services/twitter/packages.el | 1 + layers/+web-services/wakatime/packages.el | 1 + 144 files changed, 476 insertions(+), 153 deletions(-) diff --git a/doc/LAYERS.org b/doc/LAYERS.org index 5212b4e4f..8e5199790 100644 --- a/doc/LAYERS.org +++ b/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)) diff --git a/doc/VIMUSERS.org b/doc/VIMUSERS.org index efd0b5d6a..f0b27e8d9 100644 --- a/doc/VIMUSERS.org +++ b/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 diff --git a/layers/+chat/erc/packages.el b/layers/+chat/erc/packages.el index 0788881d8..39fa11a39 100644 --- a/layers/+chat/erc/packages.el +++ b/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)))) diff --git a/layers/+chat/jabber/packages.el b/layers/+chat/jabber/packages.el index 277cc6ddd..cbd61faaa 100644 --- a/layers/+chat/jabber/packages.el +++ b/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) diff --git a/layers/+chat/rcirc/packages.el b/layers/+chat/rcirc/packages.el index 1b48fec4e..2719a52aa 100644 --- a/layers/+chat/rcirc/packages.el +++ b/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)))) diff --git a/layers/+chat/slack/packages.el b/layers/+chat/slack/packages.el index 3df804f67..4a2a0916c 100644 --- a/layers/+chat/slack/packages.el +++ b/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 diff --git a/layers/+checkers/spell-checking/packages.el b/layers/+checkers/spell-checking/packages.el index 593237460..b858d9eb4 100644 --- a/layers/+checkers/spell-checking/packages.el +++ b/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) diff --git a/layers/+checkers/syntax-checking/packages.el b/layers/+checkers/syntax-checking/packages.el index 4a0368a5c..68ff597c7 100644 --- a/layers/+checkers/syntax-checking/packages.el +++ b/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)))) diff --git a/layers/+completion/auto-completion/README.org b/layers/+completion/auto-completion/README.org index 3ac9a924a..1162cb190 100644 --- a/layers/+completion/auto-completion/README.org +++ b/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 diff --git a/layers/+completion/auto-completion/packages.el b/layers/+completion/auto-completion/packages.el index e94eff8ef..fdb643c21 100644 --- a/layers/+completion/auto-completion/packages.el +++ b/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)))) diff --git a/layers/+completion/helm/packages.el b/layers/+completion/helm/packages.el index 9e68606e3..bc0bc01a6 100644 --- a/layers/+completion/helm/packages.el +++ b/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))) diff --git a/layers/+completion/ivy/packages.el b/layers/+completion/ivy/packages.el index 5ffb192dd..85c13f767 100644 --- a/layers/+completion/ivy/packages.el +++ b/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 diff --git a/layers/+distributions/spacemacs-base/packages.el b/layers/+distributions/spacemacs-base/packages.el index a666bdb1f..2b973fe10 100644 --- a/layers/+distributions/spacemacs-base/packages.el +++ b/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) diff --git a/layers/+distributions/spacemacs-bootstrap/packages.el b/layers/+distributions/spacemacs-bootstrap/packages.el index 0c24b69c3..d1f105631 100644 --- a/layers/+distributions/spacemacs-bootstrap/packages.el +++ b/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)) diff --git a/layers/+emacs/better-defaults/packages.el b/layers/+emacs/better-defaults/packages.el index ffc831492..0aae437b6 100644 --- a/layers/+emacs/better-defaults/packages.el +++ b/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))) diff --git a/layers/+emacs/ibuffer/packages.el b/layers/+emacs/ibuffer/packages.el index 70daac867..b3007b712 100644 --- a/layers/+emacs/ibuffer/packages.el +++ b/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 () diff --git a/layers/+emacs/org/packages.el b/layers/+emacs/org/packages.el index e22d0cb43..0788622ca 100644 --- a/layers/+emacs/org/packages.el +++ b/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 diff --git a/layers/+emacs/semantic/packages.el b/layers/+emacs/semantic/packages.el index bee9c9f16..8bc7c3e47 100644 --- a/layers/+emacs/semantic/packages.el +++ b/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)) diff --git a/layers/+emacs/smex/packages.el b/layers/+emacs/smex/packages.el index 2964456e1..b4c273af0 100644 --- a/layers/+emacs/smex/packages.el +++ b/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 diff --git a/layers/+emacs/typography/packages.el b/layers/+emacs/typography/packages.el index 79aaf7d3c..57b6be25d 100644 --- a/layers/+emacs/typography/packages.el +++ b/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 diff --git a/layers/+email/gnus/packages.el b/layers/+email/gnus/packages.el index bf08f0889..ad194f7f9 100644 --- a/layers/+email/gnus/packages.el +++ b/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) diff --git a/layers/+email/mu4e/packages.el b/layers/+email/mu4e/packages.el index 7bc41c466..a5b3e2bf5 100644 --- a/layers/+email/mu4e/packages.el +++ b/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 diff --git a/layers/+email/notmuch/packages.el b/layers/+email/notmuch/packages.el index 5b73dfc0a..0af1eaa00 100644 --- a/layers/+email/notmuch/packages.el +++ b/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 diff --git a/layers/+filetree/neotree/packages.el b/layers/+filetree/neotree/packages.el index b28d643ea..ea1df60e0 100644 --- a/layers/+filetree/neotree/packages.el +++ b/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 diff --git a/layers/+filetree/treemacs/packages.el b/layers/+filetree/treemacs/packages.el index 70853ba05..d09c5246f 100644 --- a/layers/+filetree/treemacs/packages.el +++ b/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 diff --git a/layers/+fonts/unicode-fonts/packages.el b/layers/+fonts/unicode-fonts/packages.el index ab9ad657c..d93ac8aef 100644 --- 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 diff --git a/layers/+frameworks/django/packages.el b/layers/+frameworks/django/packages.el index 6efe9fd17..de970e01b 100644 --- a/layers/+frameworks/django/packages.el +++ b/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") diff --git a/layers/+frameworks/react/packages.el b/layers/+frameworks/react/packages.el index 42dc5da95..9ef8c5450 100644 --- a/layers/+frameworks/react/packages.el +++ b/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) diff --git a/layers/+fun/emoji/packages.el b/layers/+fun/emoji/packages.el index 5339c7eb5..e7504751b 100644 --- a/layers/+fun/emoji/packages.el +++ b/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) diff --git a/layers/+fun/games/packages.el b/layers/+fun/games/packages.el index b78751950..7b98c63f3 100644 --- a/layers/+fun/games/packages.el +++ b/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)" . diff --git a/layers/+fun/xkcd/packages.el b/layers/+fun/xkcd/packages.el index ae8a975e2..6c16f39b6 100644 --- a/layers/+fun/xkcd/packages.el +++ b/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/")) diff --git a/layers/+intl/chinese/packages.el b/layers/+intl/chinese/packages.el index eaeba9b41..a4763f45c 100644 --- a/layers/+intl/chinese/packages.el +++ b/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. diff --git a/layers/+intl/japanese/packages.el b/layers/+intl/japanese/packages.el index 1e952e075..e3d5e8c78 100644 --- 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,6 +41,7 @@ (defun japanese/init-ddskk () (use-package ddskk + :defer t :bind (("C-x j" . skk-mode)))) (defun japanese/init-japanese-holidays () diff --git a/layers/+lang/agda/packages.el b/layers/+lang/agda/packages.el index de5d980c1..b359d02c0 100644 --- a/layers/+lang/agda/packages.el +++ b/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 diff --git a/layers/+lang/asciidoc/packages.el b/layers/+lang/asciidoc/packages.el index 3322d3c17..d2508af6e 100644 --- a/layers/+lang/asciidoc/packages.el +++ b/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. diff --git a/layers/+lang/autohotkey/packages.el b/layers/+lang/autohotkey/packages.el index 392e8e4b7..7d114d386 100644 --- a/layers/+lang/autohotkey/packages.el +++ b/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 diff --git a/layers/+lang/bibtex/packages.el b/layers/+lang/bibtex/packages.el index 2bdb2a18c..4a2c8ab00 100644 --- a/layers/+lang/bibtex/packages.el +++ b/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 diff --git a/layers/+lang/c-c++/packages.el b/layers/+lang/c-c++/packages.el index d60b4e6fb..261f71340 100644 --- a/layers/+lang/c-c++/packages.el +++ b/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 diff --git a/layers/+lang/clojure/packages.el b/layers/+lang/clojure/packages.el index 57c351193..1cd6bacdc 100644 --- a/layers/+lang/clojure/packages.el +++ b/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 diff --git a/layers/+lang/common-lisp/funcs.el b/layers/+lang/common-lisp/funcs.el index e87394f08..3cf82fe19 100644 --- a/layers/+lang/common-lisp/funcs.el +++ b/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)) diff --git a/layers/+lang/common-lisp/packages.el b/layers/+lang/common-lisp/packages.el index 307543da4..46c37f12b 100644 --- a/layers/+lang/common-lisp/packages.el +++ b/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 diff --git a/layers/+lang/coq/packages.el b/layers/+lang/coq/packages.el index a038e8639..13a7b66b2 100644 --- a/layers/+lang/coq/packages.el +++ b/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 diff --git a/layers/+lang/csharp/packages.el b/layers/+lang/csharp/packages.el index a79b82115..ae58c76f2 100644 --- a/layers/+lang/csharp/packages.el +++ b/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 diff --git a/layers/+lang/csv/packages.el b/layers/+lang/csv/packages.el index 71bdff507..d30fe874b 100644 --- a/layers/+lang/csv/packages.el +++ b/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") diff --git a/layers/+lang/d/packages.el b/layers/+lang/d/packages.el index cb4fe6453..8d356dec2 100644 --- a/layers/+lang/d/packages.el +++ b/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) diff --git a/layers/+lang/elixir/packages.el b/layers/+lang/elixir/packages.el index de43bdb18..5a4136491 100644 --- a/layers/+lang/elixir/packages.el +++ b/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)) diff --git a/layers/+lang/elm/packages.el b/layers/+lang/elm/packages.el index ba43f1e36..799f82105 100644 --- a/layers/+lang/elm/packages.el +++ b/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))) diff --git a/layers/+lang/emacs-lisp/packages.el b/layers/+lang/emacs-lisp/packages.el index 0e1d6672a..68414f6d3 100644 --- a/layers/+lang/emacs-lisp/packages.el +++ b/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 diff --git a/layers/+lang/erlang/packages.el b/layers/+lang/erlang/packages.el index 7f190d927..cfc2decac 100644 --- a/layers/+lang/erlang/packages.el +++ b/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 diff --git a/layers/+lang/ess/packages.el b/layers/+lang/ess/packages.el index 440c6e99e..ad728d22a 100644 --- a/layers/+lang/ess/packages.el +++ b/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) diff --git a/layers/+lang/faust/packages.el b/layers/+lang/faust/packages.el index 7f23f93a9..99097db2d 100644 --- a/layers/+lang/faust/packages.el +++ b/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 diff --git a/layers/+lang/forth/packages.el b/layers/+lang/forth/packages.el index 3d870ea84..21e7021d1 100644 --- a/layers/+lang/forth/packages.el +++ b/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 diff --git a/layers/+lang/fsharp/packages.el b/layers/+lang/fsharp/packages.el index 226c61af3..76cd4d94c 100644 --- a/layers/+lang/fsharp/packages.el +++ b/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) diff --git a/layers/+lang/go/packages.el b/layers/+lang/go/packages.el index ac495e523..534b1d073 100644 --- a/layers/+lang/go/packages.el +++ b/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))) diff --git a/layers/+lang/gpu/packages.el b/layers/+lang/gpu/packages.el index c7f5a4638..2f23adc50 100644 --- a/layers/+lang/gpu/packages.el +++ b/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)))) diff --git a/layers/+lang/groovy/packages.el b/layers/+lang/groovy/packages.el index 1abc05dfd..177a54d08 100644 --- a/layers/+lang/groovy/packages.el +++ b/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") diff --git a/layers/+lang/haskell/packages.el b/layers/+lang/haskell/packages.el index ea6b61b49..a8206ef4c 100644 --- a/layers/+lang/haskell/packages.el +++ b/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 diff --git a/layers/+lang/html/packages.el b/layers/+lang/html/packages.el index 22fd9b0f2..0cc54c282 100644 --- a/layers/+lang/html/packages.el +++ b/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") diff --git a/layers/+lang/idris/packages.el b/layers/+lang/idris/packages.el index dceb22deb..6f113539d 100644 --- a/layers/+lang/idris/packages.el +++ b/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 diff --git a/layers/+lang/ipython-notebook/packages.el b/layers/+lang/ipython-notebook/packages.el index 2fb3990b2..86ededd2a 100644 --- a/layers/+lang/ipython-notebook/packages.el +++ b/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 diff --git a/layers/+lang/java/packages.el b/layers/+lang/java/packages.el index 82c9fffdc..fc977bbec 100644 --- a/layers/+lang/java/packages.el +++ b/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") diff --git a/layers/+lang/javascript/packages.el b/layers/+lang/javascript/packages.el index f49666dbf..2536df594 100644 --- a/layers/+lang/javascript/packages.el +++ b/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 diff --git a/layers/+lang/kotlin/packages.el b/layers/+lang/kotlin/packages.el index 0bcbf31d4..bad1608f1 100644 --- a/layers/+lang/kotlin/packages.el +++ b/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)) diff --git a/layers/+lang/latex/packages.el b/layers/+lang/latex/packages.el index 5c346b68f..5743625c9 100644 --- a/layers/+lang/latex/packages.el +++ b/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) diff --git a/layers/+lang/lua/packages.el b/layers/+lang/lua/packages.el index f1ce0502b..fa364d023 100644 --- a/layers/+lang/lua/packages.el +++ b/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))) diff --git a/layers/+lang/major-modes/packages.el b/layers/+lang/major-modes/packages.el index 6e5a8c0a8..01e9047cf 100644 --- a/layers/+lang/major-modes/packages.el +++ b/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\\'")) diff --git a/layers/+lang/markdown/packages.el b/layers/+lang/markdown/packages.el index e8b85acdc..f929424c1 100644 --- a/layers/+lang/markdown/packages.el +++ b/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 diff --git a/layers/+lang/nim/packages.el b/layers/+lang/nim/packages.el index cc837ab50..e834a7f9e 100644 --- a/layers/+lang/nim/packages.el +++ b/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) diff --git a/layers/+lang/ocaml/packages.el b/layers/+lang/ocaml/packages.el index 7fec6a10c..14d86927b 100644 --- a/layers/+lang/ocaml/packages.el +++ b/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) diff --git a/layers/+lang/perl5/packages.el b/layers/+lang/perl5/packages.el index db98c4172..7df9b4065 100644 --- a/layers/+lang/perl5/packages.el +++ b/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" diff --git a/layers/+lang/perl6/packages.el b/layers/+lang/perl6/packages.el index 86d27e018..16c7b6346 100644 --- a/layers/+lang/perl6/packages.el +++ b/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)))) diff --git a/layers/+lang/php/packages.el b/layers/+lang/php/packages.el index 2b16e5b89..a3ace4f63 100644 --- 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,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) diff --git a/layers/+lang/plantuml/packages.el b/layers/+lang/plantuml/packages.el index 34beabb06..0df879d1f 100644 --- a/layers/+lang/plantuml/packages.el +++ b/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 diff --git a/layers/+lang/purescript/packages.el b/layers/+lang/purescript/packages.el index c09d4de59..b4e8b528a 100644 --- a/layers/+lang/purescript/packages.el +++ b/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) diff --git a/layers/+lang/python/packages.el b/layers/+lang/python/packages.el index b4d13641b..21a8e0a6b 100644 --- a/layers/+lang/python/packages.el +++ b/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 diff --git a/layers/+lang/racket/packages.el b/layers/+lang/racket/packages.el index ae528099d..918e557a6 100644 --- a/layers/+lang/racket/packages.el +++ b/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")) diff --git a/layers/+lang/restructuredtext/packages.el b/layers/+lang/restructuredtext/packages.el index 8d6f33bee..f92e888b9 100644 --- a/layers/+lang/restructuredtext/packages.el +++ b/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 () diff --git a/layers/+lang/ruby/packages.el b/layers/+lang/ruby/packages.el index 919826d3f..449ddeae6 100644 --- a/layers/+lang/ruby/packages.el +++ b/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 diff --git a/layers/+lang/rust/packages.el b/layers/+lang/rust/packages.el index 26959e74b..9438c5061 100644 --- a/layers/+lang/rust/packages.el +++ b/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)) diff --git a/layers/+lang/scala/packages.el b/layers/+lang/scala/packages.el index f4de1bbf2..4263b8ddf 100644 --- a/layers/+lang/scala/packages.el +++ b/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")) diff --git a/layers/+lang/shell-scripts/packages.el b/layers/+lang/shell-scripts/packages.el index 647c0e826..1a496ae60 100644 --- a/layers/+lang/shell-scripts/packages.el +++ b/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 diff --git a/layers/+lang/sml/packages.el b/layers/+lang/sml/packages.el index c1eafeb7c..52079d520 100644 --- a/layers/+lang/sml/packages.el +++ b/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 diff --git a/layers/+lang/sql/packages.el b/layers/+lang/sql/packages.el index 90b506860..bab4ead05 100644 --- a/layers/+lang/sql/packages.el +++ b/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) diff --git a/layers/+lang/swift/packages.el b/layers/+lang/swift/packages.el index 0b591c788..2b7daf882 100644 --- a/layers/+lang/swift/packages.el +++ b/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" diff --git a/layers/+lang/typescript/packages.el b/layers/+lang/typescript/packages.el index 1f3492055..02a397702 100644 --- a/layers/+lang/typescript/packages.el +++ b/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 diff --git a/layers/+lang/vimscript/packages.el b/layers/+lang/vimscript/packages.el index c4f4aecc8..fc2ca02d9 100644 --- a/layers/+lang/vimscript/packages.el +++ b/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)) diff --git a/layers/+lang/windows-scripts/packages.el b/layers/+lang/windows-scripts/packages.el index f73884290..6c3223a62 100644 --- a/layers/+lang/windows-scripts/packages.el +++ b/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 () diff --git a/layers/+misc/nlinum/packages.el b/layers/+misc/nlinum/packages.el index f640a65fe..810bde62d 100644 --- a/layers/+misc/nlinum/packages.el +++ b/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 diff --git a/layers/+misc/parinfer/packages.el b/layers/+misc/parinfer/packages.el index 70b14e4e6..661e8fbe8 100644 --- a/layers/+misc/parinfer/packages.el +++ b/layers/+misc/parinfer/packages.el @@ -14,6 +14,7 @@ (defun parinfer/init-parinfer () (use-package parinfer + :defer t :diminish parinfer-mode :init (progn diff --git a/layers/+os/nixos/packages.el b/layers/+os/nixos/packages.el index 9a8cc2911..8170319f0 100644 --- a/layers/+os/nixos/packages.el +++ b/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)) diff --git a/layers/+os/osx/packages.el b/layers/+os/osx/packages.el index 5642e8ec6..9436d8d9d 100644 --- a/layers/+os/osx/packages.el +++ b/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)) diff --git a/layers/+pair-programming/floobits/packages.el b/layers/+pair-programming/floobits/packages.el index 28d2ccf1d..652c478c3 100644 --- a/layers/+pair-programming/floobits/packages.el +++ b/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") diff --git a/layers/+source-control/git/packages.el b/layers/+source-control/git/packages.el index 025483e7c..505bfab76 100644 --- a/layers/+source-control/git/packages.el +++ b/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") diff --git a/layers/+source-control/github/packages.el b/layers/+source-control/github/packages.el index 66cdba840..755bf5e87 100644 --- a/layers/+source-control/github/packages.el +++ b/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/")) diff --git a/layers/+source-control/version-control/packages.el b/layers/+source-control/version-control/packages.el index 64fa8a875..f748b4149 100644 --- a/layers/+source-control/version-control/packages.el +++ b/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))) diff --git a/layers/+spacemacs/spacemacs-editing-visual/packages.el b/layers/+spacemacs/spacemacs-editing-visual/packages.el index 38ffc4d8c..2a35ca3f5 100644 --- a/layers/+spacemacs/spacemacs-editing-visual/packages.el +++ b/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) diff --git a/layers/+spacemacs/spacemacs-editing/packages.el b/layers/+spacemacs/spacemacs-editing/packages.el index 6c4dc4a65..8b1da673d 100644 --- a/layers/+spacemacs/spacemacs-editing/packages.el +++ b/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))) diff --git a/layers/+spacemacs/spacemacs-evil/packages.el b/layers/+spacemacs/spacemacs-evil/packages.el index 7a6a765bf..cd6d28ca9 100644 --- a/layers/+spacemacs/spacemacs-evil/packages.el +++ b/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 diff --git a/layers/+spacemacs/spacemacs-language/packages.el b/layers/+spacemacs/spacemacs-language/packages.el index ca2d47d16..e31a4dcde 100644 --- a/layers/+spacemacs/spacemacs-language/packages.el +++ b/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))) diff --git a/layers/+spacemacs/spacemacs-layouts/packages.el b/layers/+spacemacs/spacemacs-layouts/packages.el index 086832692..00d8e2533 100644 --- a/layers/+spacemacs/spacemacs-layouts/packages.el +++ b/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))) diff --git a/layers/+spacemacs/spacemacs-misc/packages.el b/layers/+spacemacs/spacemacs-misc/packages.el index 619e415bd..2fde2e214 100644 --- a/layers/+spacemacs/spacemacs-misc/packages.el +++ b/layers/+spacemacs/spacemacs-misc/packages.el @@ -17,6 +17,7 @@ (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 diff --git a/layers/+spacemacs/spacemacs-modeline/packages.el b/layers/+spacemacs/spacemacs-modeline/packages.el index 9ea83e183..1ffd321b7 100644 --- a/layers/+spacemacs/spacemacs-modeline/packages.el +++ b/layers/+spacemacs/spacemacs-modeline/packages.el @@ -33,6 +33,7 @@ (defun spacemacs-modeline/init-fancy-battery () (use-package fancy-battery + :defer t :init (progn (spacemacs|add-toggle mode-line-battery @@ -50,7 +51,6 @@ (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,6 +159,7 @@ (defun spacemacs-modeline/init-spaceline-all-the-icons () (use-package spaceline-all-the-icons + :defer t :init (progn (setq @@ -169,6 +170,7 @@ (defun spacemacs-modeline/init-symon () (use-package symon + :defer t :init (progn (setq symon-delay 0 diff --git a/layers/+spacemacs/spacemacs-navigation/packages.el b/layers/+spacemacs/spacemacs-navigation/packages.el index abb7ffb96..16aa7f5fd 100644 --- a/layers/+spacemacs/spacemacs-navigation/packages.el +++ b/layers/+spacemacs/spacemacs-navigation/packages.el @@ -41,6 +41,7 @@ (defun spacemacs-navigation/init-auto-highlight-symbol () (use-package auto-highlight-symbol + :defer t :init (progn (setq ahs-case-fold-search nil @@ -149,11 +150,13 @@ (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 @@ -190,6 +193,7 @@ (defun spacemacs-navigation/init-golden-ratio () (use-package golden-ratio + :defer t :init (progn (spacemacs/transient-state-register-add-bindings 'window-manipulation @@ -285,11 +289,13 @@ (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 @@ -298,6 +304,7 @@ (defun spacemacs-navigation/init-open-junk-file () (use-package open-junk-file + :defer t :commands (open-junk-file) :init (progn @@ -321,6 +328,7 @@ (defun spacemacs-navigation/init-restart-emacs () (use-package restart-emacs + :defer t :init (spacemacs/set-leader-keys "qd" 'spacemacs/restart-emacs-debug-init @@ -343,7 +351,6 @@ (defun spacemacs-navigation/init-winum () (use-package winum - :demand t :config (progn (setq winum-auto-assign-0-to-minibuffer nil diff --git a/layers/+spacemacs/spacemacs-org/packages.el b/layers/+spacemacs/spacemacs-org/packages.el index 8bd9a5909..d0e54749b 100644 --- a/layers/+spacemacs/spacemacs-org/packages.el +++ b/layers/+spacemacs/spacemacs-org/packages.el @@ -36,6 +36,7 @@ (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 @@ -63,10 +64,12 @@ (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) diff --git a/layers/+spacemacs/spacemacs-purpose/packages.el b/layers/+spacemacs/spacemacs-purpose/packages.el index 78c1df217..c7b646b73 100644 --- a/layers/+spacemacs/spacemacs-purpose/packages.el +++ b/layers/+spacemacs/spacemacs-purpose/packages.el @@ -29,6 +29,7 @@ (defun spacemacs-purpose/init-helm-purpose () (use-package helm-purpose + :defer t :init (progn (setq purpose-preferred-prompt 'helm) @@ -43,6 +44,7 @@ (defun spacemacs-purpose/init-ivy-purpose () ;; vanilla lets `ivy' take over (use-package ivy-purpose + :defer t :init (progn (setq purpose-preferred-prompt 'vanilla) diff --git a/layers/+spacemacs/spacemacs-visual/packages.el b/layers/+spacemacs/spacemacs-visual/packages.el index 8b21075c6..d7149692f 100644 --- a/layers/+spacemacs/spacemacs-visual/packages.el +++ b/layers/+spacemacs/spacemacs-visual/packages.el @@ -26,6 +26,7 @@ (defun spacemacs-visual/init-desktop () (use-package desktop + :defer t :init (setq desktop-dirname spacemacs-cache-directory) :config @@ -33,6 +34,7 @@ (defun spacemacs-visual/init-fill-column-indicator () (use-package fill-column-indicator + :defer t :init (progn (setq fci-rule-width 1) @@ -51,6 +53,7 @@ (defun spacemacs-visual/init-hl-todo () (use-package hl-todo + :defer t :init (spacemacs/add-to-hooks 'hl-todo-mode '(text-mode-hook prog-mode-hook)))) @@ -58,7 +61,6 @@ (defun spacemacs-visual/init-popwin () (use-package popwin - :demand t :config (progn (popwin-mode 1) diff --git a/layers/+tags/cscope/packages.el b/layers/+tags/cscope/packages.el index 1f92fcb1a..738bf9d59 100644 --- a/layers/+tags/cscope/packages.el +++ b/layers/+tags/cscope/packages.el @@ -42,6 +42,7 @@ (defun cscope/init-helm-cscope () (use-package helm-cscope + :defer t :init (defun spacemacs/setup-helm-cscope (mode) "Setup `helm-cscope' for MODE" diff --git a/layers/+tags/gtags/packages.el b/layers/+tags/gtags/packages.el index 9f12833d9..8c7f72f0d 100644 --- a/layers/+tags/gtags/packages.el +++ b/layers/+tags/gtags/packages.el @@ -19,6 +19,7 @@ (defun gtags/init-counsel-gtags () (use-package counsel-gtags + :defer t :init (progn (setq counsel-gtags-ignore-case t @@ -33,6 +34,7 @@ (defun gtags/init-ggtags () (use-package ggtags + :defer t :init (progn ;; modes that do not have a layer, add here. @@ -101,6 +103,7 @@ (defun gtags/init-helm-gtags () (use-package helm-gtags + :defer t :init (progn (setq helm-gtags-ignore-case t diff --git a/layers/+themes/colors/packages.el b/layers/+themes/colors/packages.el index c1679bfff..efc893b9b 100644 --- a/layers/+themes/colors/packages.el +++ b/layers/+themes/colors/packages.el @@ -45,6 +45,7 @@ (defun colors/init-color-identifiers-mode () (use-package color-identifiers-mode :commands color-identifiers-mode + :defer t :init (progn (when (eq 'variables colors-colorize-identifiers) @@ -120,5 +121,6 @@ (defun colors/init-rainbow-mode () (use-package rainbow-mode + :defer t :init (spacemacs/set-leader-keys "tCc" 'rainbow-mode) :config (spacemacs|hide-lighter rainbow-mode))) diff --git a/layers/+tools/ansible/packages.el b/layers/+tools/ansible/packages.el index a14204b21..f887a6368 100644 --- a/layers/+tools/ansible/packages.el +++ b/layers/+tools/ansible/packages.el @@ -18,6 +18,7 @@ (defun ansible/init-ansible () (use-package ansible + :defer t :commands ansible::auto-decrypt-encrypt :init (progn @@ -36,6 +37,7 @@ (defun ansible/init-ansible-doc () (use-package ansible-doc + :defer t :init (progn (add-hook 'yaml-mode-hook 'spacemacs/ansible-doc-maybe-enable) @@ -55,6 +57,7 @@ (defun ansible/init-company-ansible () (use-package company-ansible + :defer t :init ;; append this hook at the end to execute it last so `company-backends' ;; variable is buffer local @@ -63,7 +66,7 @@ (defun ansible/init-jinja2-mode () (use-package jinja2-mode :mode ("\\.j2\\'" . jinja2-mode) - )) + :defer t)) (defun ansible/post-init-yaml-mode () ;; maybe move it to the layer owning `yaml-mode' at some point diff --git a/layers/+tools/bm/packages.el b/layers/+tools/bm/packages.el index e9087c4ac..a62c407ca 100644 --- a/layers/+tools/bm/packages.el +++ b/layers/+tools/bm/packages.el @@ -14,6 +14,7 @@ (defun bm/init-bm () "initializes bm-emacs and adds a key binding to `SPC f z'" (use-package bm + :defer t :commands (bm-buffer-restore) :init (progn ;; Allow cross-buffer 'next' diff --git a/layers/+tools/cfengine/packages.el b/layers/+tools/cfengine/packages.el index c75500b24..faf0b5277 100644 --- a/layers/+tools/cfengine/packages.el +++ b/layers/+tools/cfengine/packages.el @@ -21,6 +21,7 @@ (defun cfengine/init-cfengine3-mode () (use-package cfengine3-mode + :defer t :mode ("\\.cf\\'" . cfengine3-mode) :init (spacemacs/set-leader-keys-for-major-mode 'cfengine3-mode "j" 'cfengine3-reformat-json-string))) @@ -36,7 +37,7 @@ (defun cfengine/init-ob-cfengine3 () (use-package ob-cfengine3 - )) + :defer t)) (defun cfengine/pre-init-org () (when (configuration-layer/package-used-p 'org) diff --git a/layers/+tools/chrome/packages.el b/layers/+tools/chrome/packages.el index 60cfb30f4..4bead8a0c 100644 --- a/layers/+tools/chrome/packages.el +++ b/layers/+tools/chrome/packages.el @@ -23,6 +23,7 @@ (defun chrome/init-gmail-message-mode () (use-package gmail-message-mode + :defer t :config (when (configuration-layer/layer-used-p 'markdown) (spacemacs/set-markdown-keybindings @@ -30,6 +31,7 @@ (defun chrome/init-flymd () (use-package flymd + :defer t :init (setq flymd-browser-open-function 'spacemacs//flymd-browser-function))) diff --git a/layers/+tools/cmake/packages.el b/layers/+tools/cmake/packages.el index d7c704362..49e4ec272 100644 --- a/layers/+tools/cmake/packages.el +++ b/layers/+tools/cmake/packages.el @@ -37,6 +37,7 @@ (defun cmake/init-cmake-mode () (use-package cmake-mode + :defer t :mode (("CMakeLists\\.txt\\'" . cmake-mode) ("\\.cmake\\'" . cmake-mode)))) (defun cmake/post-init-company () @@ -45,7 +46,6 @@ (defun cmake/init-helm-ctest () (use-package helm-ctest - :init - (dolist (mode cmake-modes) - (spacemacs/set-leader-keys-for-major-mode mode - "pt" 'helm-ctest)))) + :init (dolist (mode cmake-modes) + (spacemacs/set-leader-keys-for-major-mode mode + "pt" 'helm-ctest)))) diff --git a/layers/+tools/dash/packages.el b/layers/+tools/dash/packages.el index 0d12cf5ae..64433adeb 100644 --- a/layers/+tools/dash/packages.el +++ b/layers/+tools/dash/packages.el @@ -9,6 +9,7 @@ (defun dash/init-helm-dash () (use-package helm-dash + :defer t :init (spacemacs/set-leader-keys "dh" 'helm-dash-at-point "dH" 'helm-dash) @@ -16,6 +17,7 @@ (defun dash/init-counsel-dash () (use-package counsel-dash + :defer t :init (spacemacs/set-leader-keys "dh" 'counsel-dash-at-point "dH" 'counsel-dash) @@ -23,12 +25,14 @@ (defun dash/init-dash-at-point () (use-package dash-at-point + :defer t :init (spacemacs/set-leader-keys "dd" 'dash-at-point "dD" 'dash-at-point-with-docset))) (defun dash/init-zeal-at-point () (use-package zeal-at-point + :defer t :init (spacemacs/set-leader-keys "dd" 'zeal-at-point "dD" 'zeal-at-point-set-docset) diff --git a/layers/+tools/deft/packages.el b/layers/+tools/deft/packages.el index 581b4014c..f448813f7 100644 --- a/layers/+tools/deft/packages.el +++ b/layers/+tools/deft/packages.el @@ -14,6 +14,7 @@ (defun deft/init-deft () (use-package deft + :defer t :init (progn (setq deft-extensions '("org" "md" "txt") diff --git a/layers/+tools/docker/packages.el b/layers/+tools/docker/packages.el index b0a7610b3..6c24cc744 100644 --- a/layers/+tools/docker/packages.el +++ b/layers/+tools/docker/packages.el @@ -19,6 +19,7 @@ (defun docker/init-docker () (use-package docker + :defer t :init (progn (spacemacs/declare-prefix "aD" "Docker") @@ -43,10 +44,11 @@ (defun docker/init-docker-tramp () (use-package docker-tramp - )) + :defer t)) (defun docker/init-dockerfile-mode () (use-package dockerfile-mode + :defer t :config (progn (spacemacs/declare-prefix-for-mode 'dockerfile-mode diff --git a/layers/+tools/finance/packages.el b/layers/+tools/finance/packages.el index a04118a06..9adb7930d 100644 --- a/layers/+tools/finance/packages.el +++ b/layers/+tools/finance/packages.el @@ -28,6 +28,7 @@ (defun finance/init-ledger-mode () (use-package ledger-mode :mode ("\\.\\(ledger\\|ldg\\)\\'" . ledger-mode) + :defer t :init (progn (setq ledger-post-amount-alignment-column 62) diff --git a/layers/+tools/geolocation/packages.el b/layers/+tools/geolocation/packages.el index 904ea597a..b28e42c19 100644 --- a/layers/+tools/geolocation/packages.el +++ b/layers/+tools/geolocation/packages.el @@ -23,6 +23,7 @@ (defun geolocation/init-osx-location () "Initialize osx-location" (use-package osx-location + :defer t :init (progn (add-hook 'osx-location-changed-hook 'spacemacs//osx-location-changed) @@ -30,6 +31,7 @@ (defun geolocation/init-rase () (use-package rase + :defer t :init (progn (add-hook 'osx-location-changed-hook 'spacemacs//osx-location-changed-rase) diff --git a/layers/+tools/imenu-list/packages.el b/layers/+tools/imenu-list/packages.el index 5c370e099..35adb9434 100644 --- a/layers/+tools/imenu-list/packages.el +++ b/layers/+tools/imenu-list/packages.el @@ -22,6 +22,7 @@ (defun imenu-list/init-imenu-list () (use-package imenu-list + :defer t :init (progn (setq imenu-list-focus-after-activation t diff --git a/layers/+tools/lsp/packages.el b/layers/+tools/lsp/packages.el index e33a9e41a..83c365122 100644 --- a/layers/+tools/lsp/packages.el +++ b/layers/+tools/lsp/packages.el @@ -23,6 +23,7 @@ (defun lsp/init-company-lsp () (use-package company-lsp + :defer t :init ;; Language servers have better idea filtering and sorting, ;; don't filter results on the client side. diff --git a/layers/+tools/nginx/packages.el b/layers/+tools/nginx/packages.el index 1a92858ab..02318857d 100644 --- a/layers/+tools/nginx/packages.el +++ b/layers/+tools/nginx/packages.el @@ -12,4 +12,4 @@ (defconst nginx-packages '(nginx-mode)) (defun nginx/init-nginx-mode () - (use-package nginx-mode)) + (use-package nginx-mode :defer t)) diff --git a/layers/+tools/node/packages.el b/layers/+tools/node/packages.el index 05ce46802..a85c766ba 100644 --- a/layers/+tools/node/packages.el +++ b/layers/+tools/node/packages.el @@ -15,4 +15,4 @@ )) (defun node/init-add-node-modules-path () - (use-package add-node-modules-path)) + (use-package add-node-modules-path :defer t)) diff --git a/layers/+tools/pandoc/packages.el b/layers/+tools/pandoc/packages.el index 2dcf71804..f38213c7c 100644 --- a/layers/+tools/pandoc/packages.el +++ b/layers/+tools/pandoc/packages.el @@ -17,6 +17,7 @@ (defun pandoc/init-pandoc-mode () "Initialize my package" (use-package pandoc-mode + :defer t :commands spacemacs/run-pandoc :config (progn @@ -27,5 +28,6 @@ (defun pandoc/init-ox-pandoc () (use-package ox-pandoc + :defer t :init (with-eval-after-load 'org (require 'ox-pandoc)))) diff --git a/layers/+tools/pass/packages.el b/layers/+tools/pass/packages.el index d787f9632..28557d6f1 100644 --- a/layers/+tools/pass/packages.el +++ b/layers/+tools/pass/packages.el @@ -13,6 +13,7 @@ (defun pass/init-password-store () (use-package password-store + :defer t :init (progn (spacemacs/declare-prefix "Ap" "pass") diff --git a/layers/+tools/pdf-tools/packages.el b/layers/+tools/pdf-tools/packages.el index 005237eae..bc83df4e4 100644 --- a/layers/+tools/pdf-tools/packages.el +++ b/layers/+tools/pdf-tools/packages.el @@ -14,6 +14,7 @@ (defun pdf-tools/init-pdf-tools () (use-package pdf-tools + :defer t :mode (("\\.pdf\\'" . pdf-view-mode)) :config (progn diff --git a/layers/+tools/puppet/packages.el b/layers/+tools/puppet/packages.el index adc9d4ca5..0ab69c105 100644 --- a/layers/+tools/puppet/packages.el +++ b/layers/+tools/puppet/packages.el @@ -18,6 +18,7 @@ (defun puppet/init-puppet-mode () (use-package puppet-mode + :defer t :init (progn (spacemacs/set-leader-keys-for-major-mode 'puppet-mode diff --git a/layers/+tools/rebox/packages.el b/layers/+tools/rebox/packages.el index df1ac05d4..5374cc721 100644 --- a/layers/+tools/rebox/packages.el +++ b/layers/+tools/rebox/packages.el @@ -13,6 +13,7 @@ (defun rebox/init-rebox2 () (use-package rebox2 + :defer t :init (progn (when rebox-enable-in-text-mode diff --git a/layers/+tools/restclient/packages.el b/layers/+tools/restclient/packages.el index ac5aa66e1..d05554fe5 100644 --- a/layers/+tools/restclient/packages.el +++ b/layers/+tools/restclient/packages.el @@ -41,6 +41,7 @@ (defun restclient/init-restclient () (use-package restclient + :defer t :init (progn (unless restclient-use-org @@ -56,11 +57,13 @@ (defun restclient/init-company-restclient () (use-package company-restclient + :defer t :init (spacemacs|add-company-backends :backends company-restclient :modes restclient-mode))) (defun restclient/init-restclient-helm () (use-package restclient-helm + :defer t :init (spacemacs/set-leader-keys-for-major-mode 'restclient-mode "ji" 'helm-restclient))) diff --git a/layers/+tools/salt/packages.el b/layers/+tools/salt/packages.el index 8a9b1c89a..1315204ba 100644 --- a/layers/+tools/salt/packages.el +++ b/layers/+tools/salt/packages.el @@ -14,6 +14,7 @@ (defun salt/init-salt-mode () (use-package salt-mode + :defer t :config (spacemacs/set-leader-keys-for-major-mode 'salt-mode "pb" 'mmm-parse-buffer))) (defun salt/pre-init-smartparens () diff --git a/layers/+tools/shell/packages.el b/layers/+tools/shell/packages.el index 8ec63b603..832ec34ed 100644 --- a/layers/+tools/shell/packages.el +++ b/layers/+tools/shell/packages.el @@ -48,11 +48,13 @@ (defun shell/init-esh-help () (use-package esh-help + :defer t :init (add-hook 'eshell-mode-hook 'eldoc-mode) :config (setup-esh-help-eldoc))) (defun shell/init-eshell () (use-package eshell + :defer t :init (progn (spacemacs/register-repl 'eshell 'eshell) @@ -131,6 +133,7 @@ (defun shell/init-eshell-z () (use-package eshell-z + :defer t :init (with-eval-after-load 'eshell (require 'eshell-z)))) @@ -152,6 +155,7 @@ (defun shell/init-multi-term () (use-package multi-term + :defer t :init (progn (spacemacs/register-repl 'multi-term 'multi-term)) @@ -200,6 +204,7 @@ (defun shell/init-shell-pop () (use-package shell-pop + :defer t :init (progn (setq shell-pop-window-position shell-default-position diff --git a/layers/+tools/systemd/packages.el b/layers/+tools/systemd/packages.el index e1e3b3073..eb3e00f53 100644 --- a/layers/+tools/systemd/packages.el +++ b/layers/+tools/systemd/packages.el @@ -21,6 +21,7 @@ (defun systemd/init-systemd () (use-package systemd + :defer t :init (setq systemd-use-company-p (configuration-layer/package-used-p 'company)) :config (spacemacs/set-leader-keys-for-major-mode 'systemd-mode diff --git a/layers/+tools/terraform/packages.el b/layers/+tools/terraform/packages.el index 9f587a879..0ce35b1bf 100644 --- a/layers/+tools/terraform/packages.el +++ b/layers/+tools/terraform/packages.el @@ -17,6 +17,7 @@ (defun terraform/init-company-terraform () (use-package company-terraform + :defer t :init (spacemacs|add-company-backends :backends company-terraform @@ -24,6 +25,7 @@ (defun terraform/init-terraform-mode () (use-package terraform-mode + :defer t :config (when terraform-auto-format-on-save (add-hook 'terraform-mode-hook 'terraform-format-on-save-mode)))) diff --git a/layers/+tools/tmux/local/tmux/tmux.el b/layers/+tools/tmux/local/tmux/tmux.el index aa5542617..e10be77f1 100644 --- a/layers/+tools/tmux/local/tmux/tmux.el +++ b/layers/+tools/tmux/local/tmux/tmux.el @@ -62,6 +62,23 @@ (interactive) (tmux-navigate "down")) +(define-key evil-normal-state-map (kbd "C-h") #'tmux-nav-left) +(define-key evil-normal-state-map (kbd "C-j") #'tmux-nav-down) +(define-key evil-normal-state-map (kbd "C-k") #'tmux-nav-up) +(define-key evil-normal-state-map (kbd "C-l") #'tmux-nav-right) +(define-key evil-motion-state-map (kbd "C-h") #'tmux-nav-left) +(define-key evil-motion-state-map (kbd "C-j") #'tmux-nav-down) +(define-key evil-motion-state-map (kbd "C-k") #'tmux-nav-up) +(define-key evil-motion-state-map (kbd "C-l") #'tmux-nav-right) + +;; Modify `evil-evilified-state-map-original' because `evil-evilified-state-map' +;; is reset to this value each time the evilify macro is run. +(when (boundp 'evil-evilified-state-map-original) + (define-key evil-evilified-state-map-original (kbd "C-h") #'tmux-nav-left) + (define-key evil-evilified-state-map-original (kbd "C-j") #'tmux-nav-down) + (define-key evil-evilified-state-map-original (kbd "C-k") #'tmux-nav-up) + (define-key evil-evilified-state-map-original (kbd "C-l") #'tmux-nav-right)) + (provide 'tmux) ;;; tmux.el ends here diff --git a/layers/+tools/tmux/packages.el b/layers/+tools/tmux/packages.el index 4915a2543..a875434ee 100644 --- a/layers/+tools/tmux/packages.el +++ b/layers/+tools/tmux/packages.el @@ -23,23 +23,4 @@ (defun tmux/init-tmux () "Initialize tmux" - (use-package tmux - :bind ( - :map evil-normal-state-map - ("C-h" . tmux-nav-left) - ("C-j" . tmux-nav-down) - ("C-k" . tmux-nav-up) - ("C-l" . tmux-nav-right) - :map evil-motion-state-map - ("C-h" . tmux-nav-left) - ("C-j" . tmux-nav-down) - ("C-k" . tmux-nav-up) - ("C-l" . tmux-nav-right) - ;; Modify `evil-evilified-state-map-original' because - ;; `evil-evilified-state-map' is reset to this value each time the - ;; evilify macro is run. - :map evil-evilified-state-map-original - ("C-h" . tmux-nav-left) - ("C-j" . tmux-nav-down) - ("C-k" . tmux-nav-up) - ("C-l" . tmux-nav-right)))) + (use-package tmux)) diff --git a/layers/+tools/transmission/packages.el b/layers/+tools/transmission/packages.el index eced18729..0283bbb92 100644 --- a/layers/+tools/transmission/packages.el +++ b/layers/+tools/transmission/packages.el @@ -14,6 +14,7 @@ (defun transmission/init-transmission () (use-package transmission + :defer t :init (progn (spacemacs/set-leader-keys "at" 'transmission) (spacemacs/declare-prefix-for-mode 'transmission-mode "ma" "add") diff --git a/layers/+tools/vagrant/packages.el b/layers/+tools/vagrant/packages.el index 688437975..e010e0f27 100644 --- a/layers/+tools/vagrant/packages.el +++ b/layers/+tools/vagrant/packages.el @@ -13,6 +13,7 @@ (defun vagrant/init-vagrant () (use-package vagrant + :defer t :init (progn (spacemacs/declare-prefix "aV" "vagrant") @@ -29,6 +30,7 @@ (defun vagrant/init-vagrant-tramp () (use-package vagrant-tramp + :defer t :init (progn (defvar spacemacs--vagrant-tramp-loaded nil) diff --git a/layers/+tools/ycmd/packages.el b/layers/+tools/ycmd/packages.el index c9a58144f..88f38a4a2 100644 --- a/layers/+tools/ycmd/packages.el +++ b/layers/+tools/ycmd/packages.el @@ -19,10 +19,12 @@ (defun ycmd/init-company-ycmd () (use-package company-ycmd + :defer t :commands company-ycmd)) (defun ycmd/init-flycheck-ycmd () (use-package flycheck-ycmd + :defer t :init (add-hook 'ycmd-mode-hook 'flycheck-ycmd-setup))) (defun ycmd/post-init-eldoc () @@ -30,6 +32,7 @@ (defun ycmd/init-ycmd () (use-package ycmd + :defer t :init (progn (unless (boundp 'ycmd-global-config) diff --git a/layers/+vim/vinegar/packages.el b/layers/+vim/vinegar/packages.el index 7969e5201..4d63e4a0a 100644 --- a/layers/+vim/vinegar/packages.el +++ b/layers/+vim/vinegar/packages.el @@ -18,6 +18,7 @@ (defun vinegar/init-dired+ () (use-package dired+ + :defer t :init (progn (setq diredp-hide-details-initially-flag t) @@ -30,6 +31,7 @@ (defun vinegar/post-init-diff-hl () (use-package diff-hl + :defer t :init (progn (add-hook 'dired-mode-hook 'diff-hl-dired-mode) @@ -37,6 +39,7 @@ (defun vinegar/post-init-dired () (use-package dired + :defer t :config (evilified-state-evilify dired-mode dired-mode-map "j" 'vinegar/move-down diff --git a/layers/+web-services/confluence/packages.el b/layers/+web-services/confluence/packages.el index eab3bdd47..c92d7fede 100644 --- a/layers/+web-services/confluence/packages.el +++ b/layers/+web-services/confluence/packages.el @@ -16,6 +16,7 @@ (defun confluence/init-confluence () (use-package confluence + :defer t :config (progn ;; remove the hook on buffer save that automatically store the buffer diff --git a/layers/+web-services/elfeed/packages.el b/layers/+web-services/elfeed/packages.el index 1237c3e01..e949e64b1 100644 --- a/layers/+web-services/elfeed/packages.el +++ b/layers/+web-services/elfeed/packages.el @@ -18,6 +18,7 @@ (defun elfeed/init-elfeed () (use-package elfeed + :defer t :init (spacemacs/set-leader-keys "af" 'elfeed) :config (progn @@ -64,10 +65,12 @@ (defun elfeed/init-elfeed-org () (use-package elfeed-org + :defer t :if (boundp 'rmh-elfeed-org-files))) (defun elfeed/init-elfeed-web () (use-package elfeed-web + :defer t :commands elfeed-web-stop :init (when elfeed-enable-web-interface ;; TODO check if the port is already in use diff --git a/layers/+web-services/spotify/packages.el b/layers/+web-services/spotify/packages.el index 83c0d46b9..571cbcfa1 100644 --- a/layers/+web-services/spotify/packages.el +++ b/layers/+web-services/spotify/packages.el @@ -17,6 +17,7 @@ (defun spotify/init-spotify () (use-package spotify + :defer t :init (progn (spacemacs/declare-prefix "am" "music") @@ -29,4 +30,5 @@ (defun spotify/init-helm-spotify-plus () (use-package helm-spotify-plus + :defer t :init (spacemacs/set-leader-keys "amsg" 'helm-spotify-plus))) diff --git a/layers/+web-services/twitter/packages.el b/layers/+web-services/twitter/packages.el index e0a90527b..709cc271b 100644 --- a/layers/+web-services/twitter/packages.el +++ b/layers/+web-services/twitter/packages.el @@ -16,6 +16,7 @@ (defun twitter/init-twittering-mode () (use-package twittering-mode + :defer t :init (progn (spacemacs/set-leader-keys "at" 'twit) diff --git a/layers/+web-services/wakatime/packages.el b/layers/+web-services/wakatime/packages.el index 9df94cb43..09fd975ca 100644 --- a/layers/+web-services/wakatime/packages.el +++ b/layers/+web-services/wakatime/packages.el @@ -2,6 +2,7 @@ (defun wakatime/init-wakatime-mode () (use-package wakatime-mode + :defer t :init (add-hook 'prog-mode-hook 'wakatime-mode) :config