Update esy.org

diff --git a/esy-publish.el b/esy-publish.el
index 0ac71a2dbf4da6a42151dfbdc9f57a62e5f86895..cb103b78b7dd2f8d0f5260883b61bf651d0650f5 100644 (file)
--- a/esy-publish.el
+++ b/esy-publish.el
@@ -447,107 +447,59 @@
 
 (defun esy-publish--sweep-texinfo (plist)
   (make-directory esy-publish-local-man-directory t)
-  (let ((no-split (expand-file-name "sweep.html" esy-publish-local-directory))
-        (out (expand-file-name "sweep" esy-publish-local-man-directory)))
-    (call-process "texi2any"
-                  nil nil nil
-                  "--html"
-                  "--css-ref" "../../style.css"
-                  "-c" "TREE_TRANSFORMATIONS=regenerate_master_menu"
-                  "-c" (concat "AFTER_BODY_OPEN="
-                               (esy-publish--dom-to-string
-                                '(div ((id . "preamble")
-                                       (class . "status"))
-                                      (nav ((id . "icon-links")
-                                            (class . "icon-links"))
-                                           (div ((class . "home-link"))
-                                                (a ((href . "/"))
-                                                   (img ((src . "/home.svg")
-                                                         (height . "35")
-                                                         (width . "35")
-                                                         (alt . "Home")))))
-                                           (div ((class . "other-links"))
-                                                (a ((href . "mailto:me@eshelyaron.com"))
-                                                   (img ((src . "/mail.svg")
-                                                         (height . "30")
-                                                         (width . "30")
-                                                         (alt . "Mail"))))
-                                                " "
-                                                (a ((href . "https://emacs.ch/@eshel")
-                                                    (rel . "me"))
-                                                   (img ((src . "/mastodon.svg")
-                                                         (height . "28")
-                                                         (width . "28")
-                                                         (alt . "Mastodon"))))
-                                                " "
-                                                (a ((href . "/rss.xml"))
-                                                   (img ((src . "/rss.svg")
-                                                         (height . "30")
-                                                         (width . "30")
-                                                         (alt . "RSS Feed")))))))
-                                '(hr nil)))
-                  "-c" (concat "PRE_BODY_CLOSE="
-                               (esy-publish--dom-to-string
-                                '(div ((id . "postamble")
-                                       (class . "status"))
-                                      (footer ((id . "footer")
-                                               (class . "footer"))
-                                              (hr nil)
-                                              "© "
-                                              (time ((class . "copyright-year")) "2023")
-                                              " Eshel Yaron"))))
-                  "--output" out
-                  (expand-file-name "sweep/sweep.texi" esy-publish-root-directory))
-    (call-process "texi2any"
-                  nil nil nil
-                  "--html"
-                  "--no-split"
-                  "--css-ref" "../style.css"
-                  "-c" "TREE_TRANSFORMATIONS=regenerate_master_menu"
-                  "-c" (concat "AFTER_BODY_OPEN="
-                               (esy-publish--dom-to-string
-                                '(div ((id . "preamble")
-                                       (class . "status"))
-                                      (nav ((id . "icon-links")
-                                            (class . "icon-links"))
-                                           (div ((class . "home-link"))
-                                                (a ((href . "/"))
-                                                   (img ((src . "/home.svg")
-                                                         (height . "35")
-                                                         (width . "35")
-                                                         (alt . "Home")))))
-                                           (div ((class . "other-links"))
-                                                (a ((href . "mailto:me@eshelyaron.com"))
-                                                   (img ((src . "/mail.svg")
-                                                         (height . "30")
-                                                         (width . "30")
-                                                         (alt . "Mail"))))
-                                                " "
-                                                (a ((href . "https://emacs.ch/@eshel")
-                                                    (rel . "me"))
-                                                   (img ((src . "/mastodon.svg")
-                                                         (height . "28")
-                                                         (width . "28")
-                                                         (alt . "Mastodon"))))
-                                                " "
-                                                (a ((href . "/rss.xml"))
-                                                   (img ((src . "/rss.svg")
-                                                         (height . "30")
-                                                         (width . "30")
-                                                         (alt . "RSS Feed")))))))
-                                '(hr nil)))
-                  "-c" (concat "PRE_BODY_CLOSE="
-                               (esy-publish--dom-to-string
-                                '(div ((id . "postamble")
-                                       (class . "status"))
-                                      (footer ((id . "footer")
-                                               (class . "footer"))
-                                              (hr nil)
-                                              "© "
-                                              (time ((class . "copyright-year")) "2023")
-                                              " Eshel Yaron"))))
-                  "--output" no-split
-                  (expand-file-name "sweep/sweep.texi" esy-publish-root-directory))
+  (let* ((in       (expand-file-name "sweep/sweep.texi" esy-publish-root-directory))
+         (no-split (expand-file-name "sweep.html"       esy-publish-local-directory))
+         (out      (expand-file-name "sweep"            esy-publish-local-man-directory))
+         (args (list "--html"
+                     "--css-ref" "../../style.css"
+                     "-c" "TREE_TRANSFORMATIONS=regenerate_master_menu"
+                     "-c" (concat "AFTER_BODY_OPEN="
+                                  (esy-publish--dom-to-string
+                                   '(div ((id . "preamble")
+                                          (class . "status"))
+                                         (nav ((id . "icon-links")
+                                               (class . "icon-links"))
+                                              (div ((class . "home-link"))
+                                                   (a ((href . "/"))
+                                                      (img ((src . "/home.svg")
+                                                            (height . "35")
+                                                            (width . "35")
+                                                            (alt . "Home")))))
+                                              (div ((class . "other-links"))
+                                                   (a ((href . "mailto:me@eshelyaron.com"))
+                                                      (img ((src . "/mail.svg")
+                                                            (height . "30")
+                                                            (width . "30")
+                                                            (alt . "Mail"))))
+                                                   " "
+                                                   (a ((href . "https://emacs.ch/@eshel")
+                                                       (rel . "me"))
+                                                      (img ((src . "/mastodon.svg")
+                                                            (height . "28")
+                                                            (width . "28")
+                                                            (alt . "Mastodon"))))
+                                                   " "
+                                                   (a ((href . "/rss.xml"))
+                                                      (img ((src . "/rss.svg")
+                                                            (height . "30")
+                                                            (width . "30")
+                                                            (alt . "RSS Feed")))))))
+                                   '(hr nil)))
+                     "-c" (concat "PRE_BODY_CLOSE="
+                                  (esy-publish--dom-to-string
+                                   '(div ((id . "postamble")
+                                          (class . "status"))
+                                         (footer ((id . "footer")
+                                                  (class . "footer"))
+                                                 (hr nil)
+                                                 "© "
+                                                 (time ((class . "copyright-year")) "2023")
+                                                 " Eshel Yaron"))))
+                     "--output")))
+    (apply #'call-process "texi2any" nil nil nil
+           (append args (list out in)))
+    (apply #'call-process "texi2any" nil nil nil
+           (cons "--no-split" (append args (list no-split in))))
     (dolist (file (cons no-split (directory-files out t (rx ".html" eos))))
       (esy-publish-fontify-examples file))))
 

diff --git a/source/esy.org b/source/esy.org
index b177321d5c4236ab824134317d182e147d14ee88..9a24db1b2b8a18f3fa6e0604716fe4773b6ebc29 100644 (file)
--- a/source/esy.org
+++ b/source/esy.org
@@ -6,4 +6,20 @@
 I've recently moved from a literate Emacs configuration based on Org
 mode to a simpler =init.el= file, reproduced below:
 
+* Main configuration
+
 #+transclude: [[file:~/checkouts/esy-publish/dotfiles/.emacs.d/init.el]] :src emacs-lisp
+
+* Mail and other communication settings
+
+#+transclude: [[file:~/checkouts/esy-publish/dotfiles/.emacs.d/lisp/esy-comm.el]] :src emacs-lisp
+
+* Custom libraries
+
+** Refresh OAuth 2.0 access token JIT for connecting to my university mail
+
+#+transclude: [[file:~/checkouts/esy-publish/dotfiles/.emacs.d/lisp/esy-o365.el]] :src emacs-lisp
+
+** Jump to any button in the current buffer
+
+#+transclude: [[file:~/checkouts/esy-publish/dotfiles/.emacs.d/lisp/some-button.el]] :src emacs-lisp