From 45d4d05ff0531b37dae509c95b075a3baf6eec15 Mon Sep 17 00:00:00 2001
From: jao <jao@gnu.org>
Date: Thu, 2 Oct 2025 23:30:13 +0100
Subject: more flexible publication dir org-static-blog

---
 custom/jao-custom-blog.el | 59 +++++++++++++++++++++++------------------------
 1 file changed, 29 insertions(+), 30 deletions(-)

diff --git a/custom/jao-custom-blog.el b/custom/jao-custom-blog.el
index 8d193bd..56f2378 100644
--- a/custom/jao-custom-blog.el
+++ b/custom/jao-custom-blog.el
@@ -3,32 +3,35 @@
 ;;; Vars and setup
 (use-package htmlize :ensure t)
 
-(defvar jao-blog-base-dir (expand-file-name "jao.io" jao-doc-dir))
+(defvar jao-blog-base-dir (expand-file-name "www" jao-doc-dir))
+(defvar jao-blog-publish-dir (expand-file-name "jao.io" jao-blog-base-dir))
 (defun jao-blog-dir (p) (expand-file-name p jao-blog-base-dir))
+(defun jao-blog-publish-dir (p) (expand-file-name p jao-blog-publish-dir))
 
-(setq jao-org-blog-tag-files
-      (seq-difference (directory-files (jao-blog-dir "blog") nil "tag-.*")
-                      "tag-norss.html")
-
-      jao-org-blog-tags
-      (mapcar (lambda (f)
-                (string-match "tag-\\(.+\\)\\.html" f)
-                (format "<a href=\"/blog/%s\">%s</a>"
-                        f (match-string 1 f)))
-              jao-org-blog-tag-files)
-
-      jao-org-blog-tag-rss
-      (mapcar (lambda (f)
-                (string-match "\\(.+\\)-rss\\.xml" f)
-                (format "<a href=\"/blog/%s\">%s</a>"
-                        f (match-string 1 f)))
-              (directory-files (jao-blog-dir "blog") nil ".*-rss.xml"))
-
-      jao-org-blog-tag-names
-      (mapcar (lambda (f)
-                (string-match "tag-\\(.+\\)\\.html" f)
-                (match-string 1 f))
-              jao-org-blog-tag-files))
+
+(defvar jao-org-blog-tag-files
+  (seq-difference (directory-files (jao-blog-publish-dir "blog") nil "tag-.*")
+                  "tag-norss.html"))
+
+(defvar jao-org-blog-tags
+  (mapcar (lambda (f)
+            (string-match "tag-\\(.+\\)\\.html" f)
+            (format "<a href=\"/blog/%s\">%s</a>"
+                    f (match-string 1 f)))
+          jao-org-blog-tag-files))
+
+(defvar jao-org-blog-tag-rss
+  (mapcar (lambda (f)
+            (string-match "\\(.+\\)-rss\\.xml" f)
+            (format "<a href=\"/blog/%s\">%s</a>"
+                    f (match-string 1 f)))
+          (directory-files (jao-blog-publish-dir "blog") nil ".*-rss.xml")))
+
+(defvar jao-org-blog-tag-names
+  (mapcar (lambda (f)
+            (string-match "tag-\\(.+\\)\\.html" f)
+            (match-string 1 f))
+          jao-org-blog-tag-files))
 
 ;;; Header
 (setq org-static-blog-page-header
@@ -94,7 +97,7 @@
         org-static-blog-publish-title "programming (and other) musings"
         org-static-blog-posts-directory (jao-blog-dir "posts/")
         org-static-blog-drafts-directory (jao-blog-dir "pages/")
-        org-static-blog-publish-directory (jao-blog-dir "blog/")
+        org-static-blog-publish-directory (jao-blog-publish-dir "blog/")
         org-static-blog-rss-extra "" ; "<author>mail@jao.io</author>\n"
         org-static-blog-rss-max-entries 30
         org-static-blog-rss-excluded-tag "norss"
@@ -117,11 +120,7 @@
 
 ;;; New entries
 (defun jao-org-blog-publish-file (fname)
-  (interactive (list (read-file-name "Publish: "
-                                     nil
-                                     (buffer-file-name)
-                                     t
-                                     (buffer-file-name))))
+  (interactive (list (read-file-name "Publish: " nil (buffer-file-name) t)))
   (let ((geiser-active-implementations '(guile))
         (geiser-default-implementation 'guile)
         (whitespace-style nil))
-- 
cgit v1.2.3