14 files changed, 31 insertions, 18 deletions
diff --git a/.emacs.d/lisp/init-editor.el b/.emacs.d/lisp/init-editor.el
index 627ff38..b9ffaa5 100644
--- a/.emacs.d/lisp/init-editor.el
+++ b/.emacs.d/lisp/init-editor.el
@@ -83,6 +83,7 @@
   (add-to-list 'super-save-hook-triggers 'find-file-hook))
 
 (use-package recentf
+  :defer 10
   :config
   (recentf-mode +1)
   (add-to-list 'recentf-exclude (expand-file-name "elpa" user-emacs-directory))
@@ -115,6 +116,7 @@
 (use-package midnight)
 
 (use-package undo-tree
+  :defer 5
   :diminish
   :config
   (global-undo-tree-mode)
@@ -123,6 +125,7 @@
   (undo-tree-auto-save-history t))
 
 (use-package abbrev
+  :defer 5
   :ensure nil
   :diminish
   :hook (text-mode . abbrev-mode))
diff --git a/.emacs.d/lisp/init-git.el b/.emacs.d/lisp/init-git.el
index c1e8fd6..f8cbf0a 100644
--- a/.emacs.d/lisp/init-git.el
+++ b/.emacs.d/lisp/init-git.el
@@ -13,10 +13,14 @@
   (dired-mode . diff-hl-dired-mode)
   (magit-post-refresh . diff-hl-magit-post-refresh))
 
-(use-package gitconfig)
-(use-package git-modes)
-(use-package gist)
+(use-package gitconfig
+  :defer 5)
+
+(use-package git-modes
+  :defer 5)
+
 (use-package git-timemachine
+  :defer 5
   :bind
   ("C-x v t" . git-timemachine-toggle))
 
diff --git a/.emacs.d/lisp/init-kill.el b/.emacs.d/lisp/init-kill.el
index 2cc5ac7..324f5f8 100644
--- a/.emacs.d/lisp/init-kill.el
+++ b/.emacs.d/lisp/init-kill.el
@@ -4,6 +4,7 @@
 ;;; Code:
 
 (use-package browse-kill-ring
+  :defer 5
   :config
   (browse-kill-ring-default-keybindings))
 
diff --git a/.emacs.d/lisp/init-latex.el b/.emacs.d/lisp/init-latex.el
index 8aa243d..90305a0 100644
--- a/.emacs.d/lisp/init-latex.el
+++ b/.emacs.d/lisp/init-latex.el
@@ -4,7 +4,6 @@
 ;;; Code:
 
 ;; (use-package auctex
-;;   :defer t
 ;;   :config
 ;;   (require 'smartparens-latex)
 ;;   (setq-default TeX-master nil)
diff --git a/.emacs.d/lisp/init-lsp.el b/.emacs.d/lisp/init-lsp.el
index 7d8b91b..614a94f 100644
--- a/.emacs.d/lisp/init-lsp.el
+++ b/.emacs.d/lisp/init-lsp.el
@@ -3,7 +3,7 @@
 ;;; Code:
 
 (use-package lsp-ui
-  :defer t
+  :defer 5
   :config
   (require 'lsp-ui-imenu)
   (setq lsp-ui-sideline-enable t
@@ -18,9 +18,10 @@
         lsp-ui-doc-position 'at-point))
 
 (use-package lsp-treemacs
-  :defer t)
+  :defer 5)
 
 (use-package lsp-mode
+  :defer 5
   :diminish
   :hook
   (clojure-mode . lsp)
diff --git a/.emacs.d/lisp/init-misc.el b/.emacs.d/lisp/init-misc.el
index d10908c..9a42f85 100644
--- a/.emacs.d/lisp/init-misc.el
+++ b/.emacs.d/lisp/init-misc.el
@@ -28,7 +28,9 @@
 
 (use-package json-mode)
 (use-package csv-mode)
+
 (use-package yaml-mode
+  :defer 5
   :diminish
   :hook
   (yaml-mode . whitespace-mode)
diff --git a/.emacs.d/lisp/init-org.el b/.emacs.d/lisp/init-org.el
index 7a3715d..cfab6ca 100644
--- a/.emacs.d/lisp/init-org.el
+++ b/.emacs.d/lisp/init-org.el
@@ -5,7 +5,6 @@
 
 (use-package org
   :ensure nil
-  :defer t
   :init
   ;; TODO - can we do this with sp-wrap-with-pair?
   (defmacro define-org-wrap (name char)
@@ -43,7 +42,6 @@
      (elasticsearch . t)
      (clojure . t)
      (restclient . t)
-     (verb . t)
      (sql . t)))
   :bind
   ("C-c l" . org-store-link)
@@ -55,12 +53,10 @@
   )
 
 (use-package ob-restclient
-  :after org
-  :defer t)
+  :after org)
 
 (use-package ob-async
-  :after org
-  :defer t)
+  :after org)
 
 (provide 'init-org)
 ;;; init-org.el ends here
diff --git a/.emacs.d/lisp/init-packages.el b/.emacs.d/lisp/init-packages.el
index ca66e63..4898af5 100644
--- a/.emacs.d/lisp/init-packages.el
+++ b/.emacs.d/lisp/init-packages.el
@@ -23,7 +23,8 @@
    (package-install 'use-package))
 (require 'use-package)
 
-(setq use-package-always-ensure t)
+(setq use-package-always-ensure t
+      use-package-always-defer t)
 
 (use-package diminish)
 
diff --git a/.emacs.d/lisp/init-shell.el b/.emacs.d/lisp/init-shell.el
index 651ad61..ef15d72 100644
--- a/.emacs.d/lisp/init-shell.el
+++ b/.emacs.d/lisp/init-shell.el
@@ -13,7 +13,6 @@
   (setenv "PAGER" "cat"))
 
 (use-package eshell-z
-  :defer t
   :hook (eshell-mode . (lambda () (require 'eshell-z))))
 
 (use-package eshell-syntax-highlighting
diff --git a/.emacs.d/lisp/init-tramp.el b/.emacs.d/lisp/init-tramp.el
index 326344d..d70042f 100644
--- a/.emacs.d/lisp/init-tramp.el
+++ b/.emacs.d/lisp/init-tramp.el
@@ -3,6 +3,7 @@
 ;;; Code:
 
 (use-package tramp
+  :defer 5
   :ensure nil
   :custom
   (tramp-default-method "ssh")
diff --git a/.emacs.d/lisp/init-ui.el b/.emacs.d/lisp/init-ui.el
index 393689b..c40d4c6 100644
--- a/.emacs.d/lisp/init-ui.el
+++ b/.emacs.d/lisp/init-ui.el
@@ -121,6 +121,7 @@
   (show-paren-mode +1))
 
 (use-package which-key
+  :defer 5
   :diminish
   :config (which-key-mode +1))
 
diff --git a/.emacs.d/lisp/init-web.el b/.emacs.d/lisp/init-web.el
index 772b96f..9e4a7f2 100644
--- a/.emacs.d/lisp/init-web.el
+++ b/.emacs.d/lisp/init-web.el
@@ -4,7 +4,7 @@
 ;;; Code:
 
 (use-package web-mode
-  :defer t
+  :defer 5
   :custom
   (web-mode-enable-auto-pairing nil)
   :config
@@ -30,27 +30,30 @@
   (add-to-list 'auto-mode-alist '("/\\(views\\|html\\|theme\\|templates\\)/.*\\.php\\'" . web-mode)))
 
 (use-package css-mode
-  :defer t
+  :defer 5
   :custom
   (css-indent-offset 2)
   :config
   (rainbow-mode +1))
 
 (use-package scss-mode
+  :defer 5
   :config
   (add-to-list 'auto-mode-alist '("\\.scss\\'" . scss-mode))
   :custom
   (scss-compile-at-save nil))
 
 (use-package sass-mode
-  :defer t)
+  :defer 5)
 
 (use-package tagedit
+  :defer 5
   :diminish
   :config (tagedit-add-paredit-like-keybindings)
   :hook (html-mode . (lambda () (tagedit-mode 1))))
 
 (use-package js2-mode
+  :defer 5
   :config
   (add-to-list 'auto-mode-alist '("\\.js\\'" . js2-mode))
   :custom
@@ -62,6 +65,7 @@
                       (subword-mode +1))))
 
 (use-package mustache-mode
+  :defer 5
   :config
   (add-to-list 'auto-mode-alist '("\\.mustache\\'" . mustache-mode)))
 
diff --git a/.emacs.d/lisp/init-windows.el b/.emacs.d/lisp/init-windows.el
index aa9a4d7..290befe 100644
--- a/.emacs.d/lisp/init-windows.el
+++ b/.emacs.d/lisp/init-windows.el
@@ -39,6 +39,7 @@
   (define-key ctl-x-4-map "t" 'toggle-window-split))
 
 (use-package winner
+  :defer 5
   :config
   (winner-mode +1)
   (defvar winner-repeat-map
diff --git a/.emacs.d/lisp/init-xml.el b/.emacs.d/lisp/init-xml.el
index ceb5d52..4d80c3a 100644
--- a/.emacs.d/lisp/init-xml.el
+++ b/.emacs.d/lisp/init-xml.el
@@ -5,7 +5,7 @@
 
 (use-package nxml-mode
   :ensure nil
-  :defer t
+  :defer 5
   :config
   (push '("<\\?xml" . nxml-mode) magic-mode-alist)
   ;; pom files should be treated as xml files