Updating dotfiles.

.emacs.d/modules/lang/org/README.org

@@ -69,7 +69,7 @@ https://www.mfoot.com/blog/2015/11/22/literate-emacs-configuration-with-org-mode
 + =+pandoc= Enables pandoc integration into the Org exporter.
 + =+pomodoro= Enables a pomodoro timer for clocking time on tasks.
 + =+present= Enables integration with reveal.js, beamer and org-tree-slide, so
-  Emacs can be used for presentations.
+  Emacs can be used for presentations. It automatically downloads [[https://github.com/hakimel/reveal.js][reveal.js]].
 + =+pretty= Enables pretty unicode symbols for bullets and priorities, and
   better syntax highlighting for latex. Keep in mind: this can be expensive. If
   org becomes too slow, it'd be wise to disable this flag.

.emacs.d/modules/lang/org/autoload/org.el

@@ -186,8 +186,7 @@ If on a:
                  'done))))
        ;; Update any metadata or inline previews in this subtree
        (org-update-checkbox-count)
-       (let (org-hierarchical-todo-statistics)
-         (org-update-parent-todo-statistics))
+       (org-update-parent-todo-statistics)
        (when (and (fboundp 'toc-org-insert-toc)
                   (member "TOC" (org-get-tags)))
          (toc-org-insert-toc)
@@ -411,13 +410,6 @@ Made for `org-tab-first-hook' in evil-mode."
          (call-interactively #'tab-to-tab-stop)
          t)))
 
-;;;###autoload
-(defun +org-update-cookies-h ()
-  "Update statistics cookies/todo statistics in headlines."
-  (when (and buffer-file-name (file-exists-p buffer-file-name))
-    (let (org-hierarchical-todo-statistics)
-      (org-update-parent-todo-statistics))))
-
 ;;;###autoload
 (defun +org-yas-expand-maybe-h ()
   "Expand a yasnippet snippet, if trigger exists at point or region is active.
@@ -492,5 +484,5 @@ All my (performant) foldings needs are met between this and `org-show-subtree'
 (defun +org-enable-auto-update-cookies-h ()
   "Update statistics cookies when saving or exiting insert mode (`evil-mode')."
   (when (bound-and-true-p evil-local-mode)
-    (add-hook 'evil-insert-state-exit-hook #'+org-update-cookies-h nil t))
-  (add-hook 'before-save-hook #'+org-update-cookies-h nil t))
+    (add-hook 'evil-insert-state-exit-hook #'org-update-parent-todo-statistics nil t))
+  (add-hook 'before-save-hook #'org-update-parent-todo-statistics nil t))

.emacs.d/modules/lang/org/config.el

@@ -109,6 +109,8 @@ Is relative to `org-directory', unless it is absolute. Is used in Doom's default
         org-hide-leading-stars t
         org-image-actual-width nil
         org-imenu-depth 8
+        ;; Sub-lists should have different bullets
+        org-list-demote-modify-bullet '(("+" . "-") ("-" . "+") ("*" . "+") ("1." . "a."))
         org-priority-faces
         '((?A . error)
           (?B . warning)
@@ -181,7 +183,7 @@ This forces it to read the background before rendering."
   ;; Automatic indent detection in org files is meaningless
   (add-to-list 'doom-detect-indentation-excluded-modes 'org-mode)
 
-  (set-pretty-symbols! 'org-mode
+  (set-ligatures! 'org-mode
     :name "#+NAME:"
     :name "#+name:"
     :src_block "#+BEGIN_SRC"
@@ -224,11 +226,13 @@ This forces it to read the background before rendering."
            (if (and (eq org-src-window-setup 'switch-invisibly)
                     (functionp initialize))
                ;; org-babel-do-in-edit-buffer is used to execute quick, one-off
-               ;; logic in the context of another major mode. Initializing this
-               ;; major mode can be terribly expensive (particular its mode
-               ;; hooks), so we inhibit them.
+               ;; logic in the context of another major mode, but initializing a
+               ;; major mode with expensive hooks can be terribly expensive.
+               ;; Since Doom adds its most expensive hooks to
+               ;; MAJOR-MODE-local-vars-hook, we can savely inhibit those.
                (lambda ()
-                 (quiet! (delay-mode-hooks (funcall initialize))))
+                 (let ((doom-inhibit-local-var-hooks t))
+                   (funcall initialize)))
              initialize)
            args))
 
@@ -560,6 +564,7 @@ eldoc string."
     ;;      'python' src blocks.
     ;; TODO Should be reported upstream!
     (puthash "org" #'ignore org-eldoc-local-functions-cache)
+    (puthash "plantuml" #'ignore org-eldoc-local-functions-cache)
     (puthash "python" #'python-eldoc-function org-eldoc-local-functions-cache))
 
   (defun +org--restart-mode-h ()
@@ -594,7 +599,10 @@ buffers."
   (defadvice! +org--exclude-agenda-buffers-from-recentf-a (orig-fn file)
     "Prevent temporarily opened agenda buffers from polluting recentf."
     :around #'org-get-agenda-file-buffer
-    (let ((recentf-exclude (list (lambda (_file) t))))
+    (let ((recentf-exclude (list (lambda (_file) t)))
+          (doom-large-file-p t)
+          find-file-hook
+          org-mode-hook)
       (funcall orig-fn file)))
 
   ;; HACK With https://code.orgmode.org/bzg/org-mode/commit/48da60f4, inline
@@ -680,6 +688,7 @@ between the two."
         "q" #'org-set-tags-command
         "t" #'org-todo
         "T" #'org-todo-list
+        "x" #'org-toggle-checkbox
         (:prefix ("a" . "attachments")
          "a" #'org-attach
          "d" #'org-attach-delete-one
@@ -696,7 +705,8 @@ between the two."
          "S" #'org-attach-sync
          (:when (featurep! +dragndrop)
           "c" #'org-download-screenshot
-          "y" #'org-download-yank))
+          "p" #'org-download-clipboard
+          "P" #'org-download-yank))
         (:prefix ("b" . "tables")
          "-" #'org-table-insert-hline
          "a" #'org-table-align
@@ -953,6 +963,7 @@ compelling reason, so..."
   (defvar evil-org-special-o/O '(table-row))
   (defvar evil-org-use-additional-insert t)
   :config
+  (add-hook 'evil-org-mode-hook #'evil-normalize-keymaps)
   (evil-org-set-key-theme)
   (add-hook! 'org-tab-first-hook :append
              ;; Only fold the current tree, rather than recursively

.emacs.d/modules/lang/org/contrib/dragndrop.el

@@ -6,6 +6,7 @@
   org-download-dnd
   org-download-yank
   org-download-screenshot
+  org-download-clipboard
   org-download-dnd-base64
   :init
   ;; HACK We add these manually so that org-download is truly lazy-loaded

.emacs.d/modules/lang/org/contrib/journal.el

@@ -12,11 +12,11 @@
   (add-to-list 'magic-mode-alist '(+org-journal-p . org-journal-mode))
 
   (defun +org-journal-p ()
+    "Wrapper around `org-journal-is-journal' to lazy load `org-journal'."
     (when-let (buffer-file-name (buffer-file-name (buffer-base-buffer)))
       (if (or (featurep 'org-journal)
               (and (file-in-directory-p
                     buffer-file-name (expand-file-name org-journal-dir org-directory))
-                   (delq! '+org-journal-p magic-mode-alist 'assq)
                    (require 'org-journal nil t)))
           (org-journal-is-journal))))
 

.emacs.d/modules/lang/org/contrib/present.el

@@ -13,9 +13,9 @@
 
 (use-package! org-re-reveal
   :after ox
-  :init
-  (setq org-re-reveal-root "https://cdnjs.cloudflare.com/ajax/libs/reveal.js/3.9.2"
-        org-re-reveal-revealjs-version "3.8"))
+  :config
+  (setq org-re-reveal-root (expand-file-name "../../" (locate-library "dist/reveal.js" t))
+        org-re-reveal-revealjs-version "4"))
 
 
 (use-package! org-tree-slide

.emacs.d/modules/lang/org/packages.el

@@ -1,12 +1,6 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; lang/org/packages.el
 
-;; Prevent built-in Org from playing into the byte-compilation of
-;; `org-plus-contrib'.
-(when-let (orglib (locate-library "org" nil doom--initial-load-path))
-  (setq load-path (delete (substring (file-name-directory orglib) 0 -1)
-                          load-path)))
-
 ;; HACK A necessary hack because org requires a compilation step after being
 ;;      cloned, and during that compilation a org-version.el is generated with
 ;;      these two functions, which return the output of a 'git describe ...'
@@ -27,13 +21,14 @@
   :recipe (:host github
            :repo "emacs-straight/org-mode"
            :files ("*.el" "lisp/*.el" "contrib/lisp/*.el"))
-  :pin "a1e5bee5cb9c34ceb8226597605a49638bee7cec")
-;; ...And prevent other packages from pulling org; org-plus-contrib satisfies
-;; the dependency already: https://github.com/raxod502/straight.el/issues/352
-(package! org :recipe (:local-repo nil))
+  :pin "220f2b0d93a6927eb673978c0042a1d4673e86aa"
+  ;; Prevents built-in Org from sneaking into the byte-compilation of
+  ;; `org-plus-contrib', and inform other packages that `org-mode' satisfies the
+  ;; `org' dependency: https://github.com/raxod502/straight.el/issues/352
+  :shadow 'org)
 
 (package! avy)
-(package! htmlize :pin "86f22f211e9230857197c42a9823d3f05381deed")
+(package! htmlize :pin "49205105898ba8993b5253beec55d8bddd820a70")
 (package! org-yt
   :recipe (:host github :repo "TobiasZawada/org-yt")
   :pin "40cc1ac76d741055cbefa13860d9f070a7ade001")
@@ -52,33 +47,37 @@
 (when (featurep! +brain)
   (package! org-brain :pin "671db0e08b91c7d2637d765a7afca8b2561275c8"))
 (when (featurep! +dragndrop)
-  (package! org-download :pin "768716b6fcc814b06360b99ad70bce44c0eb4a32"))
+  (package! org-download :pin "67b3c744f94cf0bf50f7052ce428e95af5a6ff3f"))
 (when (featurep! +gnuplot)
   (package! gnuplot :pin "f0001c30010b2899e36d7d89046322467e923088")
   (package! gnuplot-mode :pin "601f6392986f0cba332c87678d31ae0d0a496ce7"))
 (when (featurep! +ipython) ; DEPRECATED
   (package! ob-ipython :pin "7147455230841744fb5b95dcbe03320313a77124"))
 (when (featurep! +jupyter)
-  (package! jupyter :pin "785edbbff65abb0c929dc2fbd8b8305c77fd529e"))
+  (package! jupyter :pin "360cae2c70ab28c7a7848c0c56473d984f0243e5"))
 (when (featurep! +journal)
-  (package! org-journal :pin "a6378dc484ed8df7d2d2f05ac70bd9196aa6f4c0"))
+  (package! org-journal :pin "a2728e25b854af21cea8e8d313714c993eb1c848"))
 (when (featurep! +noter)
   (package! org-noter :pin "9ead81d42dd4dd5074782d239b2efddf9b8b7b3d"))
 (when (featurep! +pomodoro)
   (package! org-pomodoro :pin "aa07c11318f91219336197e62c47bc7a3d090479"))
 (when (featurep! +pretty)
-  (package! org-superstar :pin "17481852c1bd09afea877635a3185261fc19fd64")
+  (package! org-superstar :pin "94f35c20f8b84a63defa145e3e6ae735fa33dd5d")
   (package! org-fancy-priorities :pin "819bb993b71e7253cefef7047306ab4e0f9d0a86"))
 (when (featurep! +present)
   (package! centered-window
     :recipe (:host github :repo "anler/centered-window-mode")
     :pin "f50859941ab5c7cbeaee410f2d38716252b552ac")
   (package! org-tree-slide :pin "7126a4365072a32898f169ead8fb59265dabc605")
-  (package! org-re-reveal :pin "c548e239898e97e700f7c1d3f34a148ccbedb820"))
+  (package! org-re-reveal :pin "7fe39d5d03ccc75d2811445d25cbbb473b53de76")
+  (package! revealjs
+    :recipe (:host github :repo "hakimel/reveal.js"
+             :files ("css" "dist" "js" "plugin"))
+    :pin "15815efe05ca69c35ce66cfdbf93316e1db66ecb"))
 (when (featurep! +roam)
-  (package! org-roam :pin "0aa0a7c05a78e9b29881570604c24381b658fe2a")
+  (package! org-roam :pin "c33867e6bc282ff0a69d4ef4a020db82604039bb")
   (when (featurep! :completion company)
-    (package! company-org-roam :pin "5d7ccd944519ae1d03f5e17ddfe33dcd8a0cc71e")))
+    (package! company-org-roam :pin "1132663bd68022aa7ea005ff53c7c7571890769d")))
 
 ;;; Babel
 (package! ob-async :pin "80a30b96a007d419ece12c976a81804ede340311")
@@ -107,4 +106,4 @@
     :recipe (:host github :repo "kaushalmodi/ox-hugo" :nonrecursive t)
     :pin "75b849e9561c4a6022babf6eaf0e037310ded7c1"))
 (when (featurep! :lang rst)
-  (package! ox-rst :pin "9158bfd18096c559e0a225ae62ab683f1c98a547"))
+  (package! ox-rst :pin "99fa790da55b57a3f2e9aa187493ba434a64250e"))