Optimize org-mode loading (not really)

lisp/mitch-packages.el

@@ -419,29 +419,28 @@ targets."
   :mode (("\\.org$" . org-mode))
   :diminish org-indent-mode
   :custom
-  (org-ellipsis " ▾")
   (org-hide-leading-stars t)
   (org-startup-indented t)
   :config
-  ;; (org-indent-mode)
-  ;; (add-hook 'org-mode-hook
-  ;; 	    #'(lambda ()
-  ;; 		(add-hook 'after-save-hook
-  ;; 			  #'(lambda ()
-  ;; 			      (org-babel-tangle)))))
+  (defun local-disable-whitespace ()
+    "Disable whitespace-mode in the current buffer."
+    (setq-local whitespace-style nil))
   (add-hook 'after-save-hook
             #'(lambda () (if (equal major-mode 'org-mode)
                              (org-babel-tangle))))
   (add-hook 'org-mode-hook
-            #'(lambda () (setq-local whitespace-style nil)))
-  (with-eval-after-load 'org
-    ;; This is needed as of Org 9.2
-    (require 'org-tempo)
+            (local-disable-whitespace))
+  :hook (org-mode . turn-off-line-numbers))
+(use-package org-tempo
+  :straight (:type built-in)
+  :after org
+  :config
   (add-to-list 'org-structure-template-alist '("sh" . "src shell"))
   (add-to-list 'org-structure-template-alist '("el" . "src elisp"))
-    (add-to-list 'org-structure-template-alist '("ps1" . "src powershell")))
-  :hook (org-mode . turn-off-line-numbers))
+  (add-to-list 'org-structure-template-alist '("ps1" . "src powershell"))
+  (add-to-list 'org-structure-template-alist '("html" . "src html")))
 (use-package org-variable-pitch
+  :if (display-graphic-p)
   :diminish (buffer-face-mode org-variable-pitch-minor-mode)
   :config
   (set-face-attribute 'org-meta-line nil :inherit '(font-lock-comment-delimiter-face fixed-pitch))