chore(startup): Make various modules more lazy-loaded

This should improve startup speed a little bit.

core/siren-core-modules.el

@@ -125,11 +125,12 @@
 (require 'siren-helm-make)
 (require 'siren-kubernetes)
 
-;; Writing
+;; ;; Writing
 (require 'siren-writeroom)
 
 ;; Languages
 (require 'siren-prog-mode)
+(require 'siren-applescript)
 (require 'siren-coffee)
 (require 'siren-conf)
 (require 'siren-css)
@@ -146,6 +147,7 @@
 (require 'siren-js)
 (require 'siren-json)
 (require 'siren-jsx)
+(require 'siren-lisp)
 (require 'siren-lua)
 (require 'siren-makefile)
 (require 'siren-markdown)

modules/editor/siren-folding.el

@@ -8,7 +8,6 @@
 
 (use-package hideshow
   :straight (:type built-in)
-  :demand
 
   :bind
   ("C-=" . siren-folding-toggle-selective-display)
@@ -19,8 +18,7 @@
     "Activate or deactivate code folding.
 Optional ARG is passed directly to mode toggle function."
     (hs-minor-mode (or arg t))
-    (hideshowvis-minor-mode (or arg t)))
-
+    (if window-system (hideshowvis-minor-mode (or arg t))))
 
   (defun siren-folding-toggle (column)
     "Toggle hiding/showing blocks via hs-mode.
@@ -43,8 +41,7 @@ Borrowed from: http://www.emacswiki.org/emacs/HideShow"
            (1+ (current-column)))))))
 
 (use-package hideshowvis
-  :demand
-  :after hideshow)
+  :defer t)
 
 (provide 'siren-folding)
 ;;; siren-folding.el ends here

modules/languages/siren-golang.el

@@ -37,6 +37,8 @@
 
     (setq tab-width 4)
 
+    (add-hook 'before-save-hook #'gofmt-before-save 0 t)
+
     (highlight-symbol-mode -1)
     (company-mode +1)
     (lsp)
@@ -46,8 +48,6 @@
   :config
   (message "loading go-mode")
 
-  (add-hook 'before-save-hook #'gofmt-before-save)
-
   (when (memq window-system '(mac ns))
     (exec-path-from-shell-copy-env "GOPATH"))
 
@@ -57,10 +57,11 @@
   (add-to-list 'completion-ignored-extensions ".test"))
 
 (use-package go-dlv
-  :commands dlv dlv-current-func)
+  :defer t)
 
 (use-package gotest
-  :after go-mode
+  :defer t
+  :after (go-mode)
   :bind (:map go-mode-map
               ("C-c , a" . go-test-current-project)
               ("C-c , v" . go-test-current-file)
@@ -74,7 +75,8 @@
   (go-test-verbose t))
 
 (use-package go-projectile
-  :after go-mode
+  :defer t
+  :after (go-mode)
   :hook (go-mode . siren-go-projectile-setup)
 
   :init
@@ -87,7 +89,7 @@
   (go-mode . flycheck-golangci-lint-setup))
 
 (use-package go-playground
-  :commands go-playground)
+  :defer t)
 
 (provide 'siren-golang)
 ;;; siren-golang.el ends here

modules/languages/siren-groovy.el

@@ -7,6 +7,7 @@
 ;;; Code:
 
 (use-package groovy-mode
+  :mode "\\.groovy\\'"
   :hook
   (groovy-mode . siren-groovy-mode-setup)
 

modules/languages/siren-ruby.el

@@ -103,8 +103,8 @@
   :hook (ruby-mode . robe-mode)
 
   :init
-  (eval-after-load 'company
-    '(push 'company-robe company-backends))
+  (with-eval-after-load 'company
+    (push 'company-robe company-backends))
 
   :config
   ;; Unbind keys used by siren-expand-region module.
@@ -140,7 +140,7 @@
               ("C-c . D" . rubocop-autocorrect-directory)))
 
 (use-package rubocopfmt
-  :commands (rubocopfmt rubocopfmt-mode)
+  :defer t
   :bind (:map ruby-mode-map
               ("C-c C-f" . rubocopfmt))
   :hook

modules/languages/siren-text-mode.el

@@ -8,6 +8,7 @@
 
 (use-package text-mode
   :straight (:type built-in)
+  :defer t
   :hook (text-mode . siren-text-mode-setup)
   :init
   (defun siren-text-mode-setup ()

modules/languages/siren-typescript.el

@@ -14,6 +14,8 @@
 (require 'siren-web-mode)
 
 (use-package typescript-mode
+  :defer t
+  :mode "\\.ts\\'"
   :hook
   (typescript-mode . siren-typescript-mode-setup)
 
@@ -40,9 +42,8 @@
 
   :init
   (add-to-list 'auto-mode-alist '("\\.tsx\\'" . web-mode))
-  (eval-after-load 'flycheck
-    '(progn
-       (flycheck-add-mode 'typescript-tslint 'web-mode)))
+  (with-eval-after-load 'flycheck
+    (flycheck-add-mode 'typescript-tslint 'web-mode))
 
   (defun siren-tide-web-mode-setup ()
     (when (string-equal "tsx" (file-name-extension buffer-file-name))
@@ -59,11 +60,7 @@
     (flycheck-mode +1)
     (eldoc-mode +1)
     (tide-hl-identifier-mode +1)
-    (company-mode +1))
-
-  :config
-  ;; (add-hook 'before-save-hook #'tide-format-before-save)
-  )
+    (company-mode +1)))
 
 (provide 'siren-typescript)
 ;;; siren-typescript.el ends here

modules/languages/siren-xml.el

@@ -11,6 +11,7 @@
 
 (use-package nxml-mode
   :straight (:type built-in)
+  :defer t
   :hook (nxml-mode . siren-xml-setup)
 
   :custom

modules/linting/siren-prettier-js.el

@@ -7,6 +7,7 @@
 ;;; Code:
 
 (use-package prettier-js
+  :defer t
   :hook (prettier-js-mode . siren-prettier-js-mode-setup)
 
   :init

modules/lsp/siren-company-lsp.el

@@ -10,7 +10,7 @@
 (require 'siren-lsp)
 
 (use-package company-lsp
-  :commands company-lsp)
+  :defer t)
 
 (provide 'siren-company-lsp)
 ;;; siren-company-lsp.el ends here

modules/lsp/siren-helm-lsp.el

@@ -10,9 +10,6 @@
 (require 'siren-lsp)
 
 (use-package helm-lsp
-  :commands
-  helm-lsp-workspace-symbol
-  helm-lsp-global-workspace-symbol
   :bind
   ("C-c C-'" . helm-lsp-workspace-symbol))
 

modules/lsp/siren-lsp-ui.el

@@ -9,8 +9,7 @@
 (require 'siren-lsp)
 
 (use-package lsp-ui
-  :commands lsp-ui-mode
-
+  :defer t
   :bind (:map lsp-ui-mode-map
               ("C-c C-d" . lsp-ui-doc-show)
               ("M-?" . lsp-ui-peek-find-references)

modules/lsp/siren-lsp.el

@@ -7,8 +7,7 @@
 ;;; Code:
 
 (use-package lsp-mode
-  :commands lsp
-
+  :defer t
   :bind (:map lsp-mode-map
               ("C-c C-." . lsp-rename))
 

modules/org-mode/siren-htmlize.el

@@ -6,7 +6,8 @@
 
 ;;; Code:
 
-(use-package htmlize)
+(use-package htmlize
+  :defer t)
 
 (provide 'siren-htmlize)
 ;;; siren-htmlize.el ends here

modules/projects/siren-treemacs.el

@@ -6,15 +6,12 @@
 
 ;;; Code:
 
-(require 'siren-dired)
 (require 'siren-lsp)
 (require 'siren-magit)
 (require 'siren-persp-mode)
 (require 'siren-projectile)
 
 (use-package treemacs
-  :demand
-
   :bind
   ("C-x C-p" . treemacs)
   ("C-x p" . treemacs-select-window)
@@ -34,6 +31,15 @@
   (treemacs-width 40)
 
   :config
+  (with-eval-after-load 'projectile
+    (require 'treemacs-projectile))
+  (with-eval-after-load 'persp-mode
+    (require 'treemacs-persp))
+  (with-eval-after-load 'magit
+    (require 'treemacs-magit))
+  (with-eval-after-load 'lsp-mode
+    (require 'lsp-treemacs))
+
   (treemacs-follow-mode t)
   (treemacs-filewatch-mode t)
 
@@ -47,20 +53,18 @@
    'file-node-closed #'treemacs-visit-node-in-most-recently-used-window))
 
 (use-package treemacs-projectile
-  :demand
-  :after (treemacs projectile)
+  :defer t
   :custom
   (treemacs-header-function #'treemacs-projectile-create-header))
 
 (use-package treemacs-persp
-  :demand
-  :after treemacs persp-mode)
+  :defer t)
 
 (use-package treemacs-magit
-  :demand
-  :after treemacs magit)
+  :defer t)
 
 (use-package lsp-treemacs
+  :defer t
   :config
   (lsp-treemacs-sync-mode 1)
   (setq lsp-metals-treeview-show-when-views-received t))

modules/text-editing/siren-string-edit.el

@@ -7,7 +7,7 @@
 ;;; Code:
 
 (use-package string-edit
-  :commands (string-edit-at-point))
+  :defer t)
 
 (provide 'siren-string-edit)
 ;;; siren-string-edit.el ends here

modules/text-editing/siren-toggle-quotes.el

@@ -7,7 +7,8 @@
 ;;; Code:
 
 (use-package toggle-quotes
-  :bind (("C-'" . toggle-quotes)))
+  :bind
+  ("C-'" . toggle-quotes))
 
 (provide 'siren-toggle-quotes)
 ;;; siren-toggle-quotes.el ends here

modules/text-editing/siren-yasnippet.el

@@ -6,7 +6,8 @@
 
 ;;; Code:
 
-(use-package yasnippet-snippets)
+(use-package yasnippet-snippets
+  :defer t)
 
 (use-package yasnippet
   :hook (emacs-startup . yas-global-mode)

modules/tools/siren-helm-make.el

@@ -9,6 +9,7 @@
 (require 'siren-helm)
 
 (use-package helm-make
+  :defer t
   :bind
   (:map helm-command-map
         ("m" . helm-make-projectile))

modules/version-control/siren-forge.el

@@ -9,6 +9,7 @@
 (require 'siren-magit)
 
 (use-package forge
+  :defer t
   :after magit)
 
 (provide 'siren-forge)

modules/windows/siren-resize-window.el

@@ -7,7 +7,6 @@
 ;;; Code:
 
 (use-package resize-window
-  :commands resize-window
   :bind
   ("C-;" . resize-window))
 

modules/writing/siren-writeroom.el

@@ -7,10 +7,7 @@
 ;;; Code:
 
 (use-package writeroom-mode
-  :commands
-  writeroom-mode
-  global-writeroom-mode
-
+  :defer t
   :bind
   (:map writeroom-mode-map
         ("C-M-<" . writeroom-decrease-width)