Refactor lang/org

modules/lang/org/+present.el

@@ -1,7 +1,5 @@
 ;;; lang/org/+present.el -*- lexical-binding: t; -*-
 
-(add-hook 'org-load-hook #'+org|init-present)
-
 (defvar +org-present-text-scale 7
   "The `text-scale-amount' for `org-tree-slide-mode'.")
 
@@ -10,7 +8,7 @@
 ;; Packages
 
 (def-package! ox-reveal
-  :defer t
+  :after ox
   :init
   ;; Fix #1127, where ox-reveal adds an errant entry to
   ;; `org-structure-template-alist'
@@ -34,18 +32,10 @@
         :n [left]  #'org-tree-slide-move-previous-tree)
 
   (add-hook! 'org-tree-slide-mode-after-narrow-hook
-    #'(+org-present|detect-slide +org-present|add-overlays org-display-inline-images))
+    #'(+org-present|detect-slide
+       +org-present|add-overlays
+       org-display-inline-images))
 
   (add-hook 'org-tree-slide-mode-hook #'+org-present|init-org-tree-window)
   (advice-add #'org-tree-slide--display-tree-with-narrow
               :around #'+org-present*narrow-to-subtree))
-
-
-(def-package! centered-window :commands centered-window-mode)
-
-
-;;
-;; Bootstrap
-
-(defun +org|init-present ()
-  (require 'ox-reveal))