Add some defers and remove some packages

6 files changed, 15 insertions, 23 deletions

diff --git a/.emacs.d/lisp/init-lsp.el b/.emacs.d/lisp/init-lsp.el
index 4fc51a3..7d8b91b 100644
--- a/.emacs.d/lisp/init-lsp.el
+++ b/.emacs.d/lisp/init-lsp.el
@@ -3,6 +3,7 @@
 ;;; Code:
 
 (use-package lsp-ui
+  :defer t
   :config
   (require 'lsp-ui-imenu)
   (setq lsp-ui-sideline-enable t
@@ -16,7 +17,8 @@
         lsp-ui-sideline-show-code-actions nil
         lsp-ui-doc-position 'at-point))
 
-(use-package lsp-treemacs)
+(use-package lsp-treemacs
+  :defer t)
 
 (use-package lsp-mode
   :diminish
diff --git a/.emacs.d/lisp/init-org.el b/.emacs.d/lisp/init-org.el
index f6c238b..7a3715d 100644
--- a/.emacs.d/lisp/init-org.el
+++ b/.emacs.d/lisp/init-org.el
@@ -5,6 +5,7 @@
 
 (use-package org
   :ensure nil
+  :defer t
   :init
   ;; TODO - can we do this with sp-wrap-with-pair?
   (defmacro define-org-wrap (name char)
@@ -53,9 +54,13 @@
   ;("C-c c" . org-capture)
   )
 
-(use-package ob-restclient)
+(use-package ob-restclient
+  :after org
+  :defer t)
 
-(use-package ob-async)
+(use-package ob-async
+  :after org
+  :defer t)
 
 (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 a7db5d8..ca66e63 100644
--- a/.emacs.d/lisp/init-packages.el
+++ b/.emacs.d/lisp/init-packages.el
@@ -27,10 +27,6 @@
 
 (use-package diminish)
 
-(use-package paradox
-  :config
-  (paradox-enable))
-
 (use-package epl
   :config
   ;; TODO make a copy of the built-in check for system packages work instead
diff --git a/.emacs.d/lisp/init-ui.el b/.emacs.d/lisp/init-ui.el
index ec68494..327d09a 100644
--- a/.emacs.d/lisp/init-ui.el
+++ b/.emacs.d/lisp/init-ui.el
@@ -110,17 +110,6 @@
   (vterm-mode . (lambda () (whitespace-mode -1)))
   (eshell-mode . (lambda () (whitespace-mode -1))))
 
-(use-package hi-lock
-  :diminish
-  :config
-  (when (eq system-type 'darwin)
-    (defun my/toggle-highlight-symbol-at-point ()
-      (interactive)
-      (if hi-lock-interactive-patterns
-          (unhighlight-regexp (car (car hi-lock-interactive-patterns)))
-        (highlight-symbol-at-point)))
-    (global-set-key (kbd "s-.") 'my/toggle-highlight-symbol-at-point)))
-
 (use-package volatile-highlights
   :diminish
   :config
@@ -200,9 +189,5 @@
   :init
   (pulsar-global-mode 1))
 
-(use-package lin
-  :init
-  (lin-global-mode 1))
-
 (provide 'init-ui)
 ;;; init-ui.el ends here
diff --git a/.emacs.d/lisp/init-web.el b/.emacs.d/lisp/init-web.el
index f6eb515..772b96f 100644
--- a/.emacs.d/lisp/init-web.el
+++ b/.emacs.d/lisp/init-web.el
@@ -4,6 +4,7 @@
 ;;; Code:
 
 (use-package web-mode
+  :defer t
   :custom
   (web-mode-enable-auto-pairing nil)
   :config
@@ -29,6 +30,7 @@
   (add-to-list 'auto-mode-alist '("/\\(views\\|html\\|theme\\|templates\\)/.*\\.php\\'" . web-mode)))
 
 (use-package css-mode
+  :defer t
   :custom
   (css-indent-offset 2)
   :config
@@ -40,7 +42,8 @@
   :custom
   (scss-compile-at-save nil))
 
-(use-package sass-mode)
+(use-package sass-mode
+  :defer t)
 
 (use-package tagedit
   :diminish
diff --git a/.emacs.d/lisp/init-xml.el b/.emacs.d/lisp/init-xml.el
index 5a3d162..ceb5d52 100644
--- a/.emacs.d/lisp/init-xml.el
+++ b/.emacs.d/lisp/init-xml.el
@@ -5,6 +5,7 @@
 
 (use-package nxml-mode
   :ensure nil
+  :defer t
   :config
   (push '("<\\?xml" . nxml-mode) magic-mode-alist)
   ;; pom files should be treated as xml files