fixing gitignore

This commit is contained in:
2025-12-28 21:19:27 +00:00
parent fb120bc50a
commit 8f234a746d
221 changed files with 8064 additions and 11740 deletions

View File

@@ -11,6 +11,14 @@
;;; Code:
(require 'package)
(add-to-list 'load-path "~/master-folder/org_files/org_web/lisp/")
(require 'recently-updated)
(require 'tags)
(require 'sidenotes)
(require 'sitemaps)
(setq package-user-dir (expand-file-name "./.packages"))
(setq package-archives '(("melpa" . "https://melpa.org/packages/")
("elpa" . "https://elpa.gnu.org/packages/")))
@@ -21,23 +29,34 @@
(require 'ox)
(require 'ox-html)
;; Initialize the package system
(package-initialize)
(unless package-archive-contents
(package-refresh-contents))
;; Install dependencies
(package-install 'htmlize)
(add-to-list 'load-path "~/master-folder/org_files/org_web/")
(require 'htmlize)
(setq org-html-htmlize-output-type 'css)
(defvar z-shared-head
"
<link rel=\"stylesheet\" href=\"/assets/styles/style.css\" />
<script src=\"/assets/scripts/script.js\" defer></script> ")
<link rel=\"stylesheet\" href=\"/assets/styles/bigger-picture.min.css\" />
<link rel=\"stylesheet\" href=\"/assets/styles/comments.css\" />
<link rel=\"stylesheet\" href=\"/assets/styles/kanban.css\" />
<link rel=\"stylesheet\" href=\"/assets/styles/org-syntax.css\" />
<link rel=\"stylesheet\" href=\"/assets/styles/misc.css\" />
<link rel=\"stylesheet\" href=\"/assets/styles/toc.css\" />
<link rel=\"stylesheet\" href=\"/assets/styles/media.css\" />
<script src=\"/assets/scripts/script.js\" defer></script>
<script src=\"/assets/scripts/competency-status-board.js\" defer></script>
<script src=\"/assets/scripts/notes.js\" defer></script>
<script src=\"/assets/scripts/comments.js\" defer></script>
<script src=\"/assets/scripts/bigger-picture.min.js\" defer></script>
<script src=\"/assets/scripts/svg-pan-zoom.min.js\" defer></script>
<script src=\"/assets/scripts/gallery-init.js\" defer></script>
"
)
(setq org-export-global-macros
(append
@@ -49,6 +68,7 @@
("kbd" . "@@html:<kbd>$1</kbd>@@@@latex:\\texttt{$1}@@")
("margimg"
. "@@html:<aside class=\"marginnote\"><figure class=\"mn-fig\"><img src=\"$1\" alt=\"$2\" class=\"mn-img\" loading=\"lazy\" decoding=\"async\"/>$3</figure></aside>@@")
("countdown" . "@@html:<time class=\"countdown\" datetime=\"$1\" data-label=\"$2\"></time>@@")
org-export-global-macros)))
@@ -60,9 +80,10 @@
<a href=\"/\"> <img src=\"/assets/images/gr.png\" alt=\"Site Logo\" class=\"banner-logo\" /> </a>
<nav>
<a href=\"/\">Home | </a>
<a href=\"/posts/posts-list.html\">Posts | </a>
<a href=\"/blogs/2025/2025-list.html \">2025 | </a>
<a href=\"/blogs/blogs-list.html\">Blogs | </a>
<a href=\"/contact.html\">Contact</a>
<a href=\"/posts/career/career-list.html\">Career | </a>
<a href=\"/home/services.html\">Services</a>
</nav>
<button class=\"theme-toggle\" id=\"theme-toggle\" type=\"button\" aria-label=\"Toggle dark mode\">🌗 Theme</button>
</div>
@@ -82,199 +103,117 @@ Created with %c on <a href=\"https://www.archlinux.org/\">Arch</a> <a href=\"htt
</footer>")
(defun z/posts-sitemap (title list)
"sitemap that lists post links as bullet points with dates and tags."
(concat
"#+TITLE: " title "\n"
"#+OPTIONS: toc:nil num:nil \n\n"
"See the categories: @@html:<a href=\"../categories.html\">Categories</a>@@\n\n"
"* Posts:\n"
(mapconcat
(lambda (entry)
(let* ((link (car entry))
;; extract relative file name from the link
(filename (if (string-match "\\[\\[file:\\([^]]+\\)\\]" link)
(match-string 1 link)
link))
(full-path (expand-file-name filename "~/master-folder/org_files/org_web/posts/"))
(date-str "no date")
(tags-str ""))
;; Get publish date
(let ((date (org-publish-find-date full-path org-publish-project-alist)))
(when date
(setq date-str (format-time-string "%Y-%m-%d" date))))
;; Get FILETAGS from file buffer
(when (file-exists-p full-path)
(with-temp-buffer
(insert-file-contents full-path)
(org-mode)
(let* ((tags (cadr (assoc "FILETAGS" (org-collect-keywords '("FILETAGS"))))))
(when tags
(setq tags-str (mapconcat (lambda (tag)
(format "@@html:<a href=\"/tags/%s.html\"> <span class=\"post-tag\">%s</span> </a>@@" tag tag))
(split-string tags ":" t) ;; <- Splits by ":" and removes empty strings
" "))))))
;; Final line output
(format "- %s @@html:<span class=\"post-date\">%s</span>@@ %s" link date-str tags-str)))
(cdr list)
"\n")))
(defun z/comments-file-p (file)
"Return non-nil if FILE has comments enabled.
A file has comments if:
- It has a #+COMMENTS: keyword with value \"t\" (case-insensitive)."
(when (file-exists-p file)
(with-temp-buffer
(insert-file-contents file)
(org-mode)
(let* ((keywords (org-collect-keywords '("COMMENTS")))
(comments (cadr (assoc "COMMENTS" keywords))))
(print keywords)
(and comments
(string-match-p "^\\s-*t\\s-*$"
(downcase comments)))))))
(defun z/comments-file-slug (file)
"Return page slug from #+SLUG: or fallback to filename."
(with-temp-buffer
(insert-file-contents file)
(org-mode)
(let* ((keywords (org-collect-keywords '("SLUG")))
(slug (cadr (assoc "SLUG" keywords))))
(if (and slug (string-match-p "\\S-" slug))
slug
(file-name-base file)))))
(defun z/org-html-insert-comments-into-body (body backend info)
"Insert comments section at the end of the document body."
(when (org-export-derived-backend-p backend 'html)
(let ((input-file (plist-get info :input-file)))
(if (and input-file
(z/comments-file-p input-file))
(let* ((slug (z/comments-file-slug input-file))
(comments-html
(format
"
<section id=\"comments\" class=\"comments\" data-slug=\"%s\">
<h2>Comments</h2>
<div id=\"comments-list\" class=\"comments-list\">
<noscript>Please enable JavaScript to view comments.</noscript>
</div>
<form id=\"comment-form\" class=\"comment-form\">
<label class=\"comment-author\">
<span>Name (optional)</span>
<input type=\"text\" name=\"author\"/>
</label>
<label class=\"comment-content\">
<span>Your comment</span>
<textarea name=\"content\" required></textarea>
</label>
<button type=\"submit\">Post comment</button>
</form>
</section>
"
slug)))
(concat body comments-html))
body))))
(defun z/blogs-sitemap (title list)
"sitemap that lists blog links as bullet points with dates and tags."
(concat
"#+TITLE: " title "\n"
"#+OPTIONS: toc:nil num:nil \n\n"
"See the categories: @@html:<a href=\"../categories.html\">Categories</a>@@\n\n"
"* Blogs:\n"
(mapconcat
(lambda (entry)
(let* ((link (car entry))
;; extract relative file name from the link
(filename (if (string-match "\\[\\[file:\\([^]]+\\)\\]" link)
(match-string 1 link)
link))
(full-path (expand-file-name filename "~/master-folder/org_files/org_web/blogs/"))
(date-str "no date")
(tags-str ""))
;; Get publish date
(let ((date (org-publish-find-date full-path org-publish-project-alist)))
(when date
(setq date-str (format-time-string "%Y-%m-%d" date))))
;; Get FILETAGS from file buffer
(when (file-exists-p full-path)
(with-temp-buffer
(insert-file-contents full-path)
(org-mode)
(let* ((tags (cadr (assoc "FILETAGS" (org-collect-keywords '("FILETAGS"))))))
(when tags
(setq tags-str (mapconcat (lambda (tag)
(format "@@html:<a href=\"/tags/%s.html\"> <span class=\"post-tag\">%s</span> </a>@@" tag tag))
(split-string tags ":" t) ;; <- Splits by ":" and removes empty strings
" "))))))
;; Final line output
(format "- %s @@html:<span class=\"post-date\">%s</span>@@ %s" link date-str tags-str)))
(cdr list)
"\n")))
(defun z/org-html-add-body-classes (output backend info)
"Add layout-related classes to <body> based on file metadata."
(when (org-export-derived-backend-p backend 'html)
(let* ((input-file (plist-get info :input-file))
(classes
(delq nil
(list
(when (and input-file
(z/wip-file-p input-file))
"wip")
(when (and input-file
(z/no-sidenotes-file-p input-file))
"no-sidenotes")))))
(if classes
(replace-regexp-in-string
"<body\\([^>]*\\)>"
(format "<body\\1 class=\"%s\">"
(string-join classes " "))
output)
output))))
(add-to-list 'org-export-filter-final-output-functions
#'z/org-html-add-body-classes)
(add-to-list 'org-export-filter-body-functions
#'z/org-html-insert-comments-into-body)
(defun z/categories-sitemap (title _list)
"Generate a categories page by scanning tags across org-posts and org-blogs."
(let* ((expanded (org-publish-expand-projects org-publish-project-alist))
(posts (assoc "org-posts" expanded))
(blogs (assoc "org-blogs" expanded))
;; DO NOT set :exclude to "" — it excludes everything
(files (cl-remove-duplicates
(append (and posts (org-publish-get-base-files posts))
(and blogs (org-publish-get-base-files blogs)))
:test #'file-equal-p))
;; optional: drop the generated sitemaps
(files (cl-remove-if
(lambda (f)
(member (file-name-nondirectory f)
'("posts-list.org" "blogs-list.org" "sitemap.org" "categories.org")))
files))
(counts (make-hash-table :test 'equal)))
;;(message "files I will scan: %S" files)
(dolist (f files)
(when (file-readable-p f)
(with-temp-buffer
(insert-file-contents f)
(org-mode)
(let* ((kw (org-collect-keywords '("FILETAGS" "TAGS")))
(raw (car (or (cdr (assoc "FILETAGS" kw))
(cdr (assoc "TAGS" kw))))))
(when raw
(dolist (tag (split-string raw ":" t))
(puthash tag (1+ (gethash tag counts 0)) counts)))))))
(setq org-html-htmlize-output-type 'css)
(let (tags)
(maphash (lambda (k _) (push k tags)) counts)
(setq tags (sort tags #'string-lessp))
(concat
"#+TITLE: " title "\n#+OPTIONS: toc:nil num:nil title:nil\n\n* Categories (Includes both blogs and posts)\n"
(if tags
(mapconcat
(lambda (tag)
(format "- [[file:tags/%s.org][@@html:<span class=\"post-tag\">%s</span>@@]] (%d)"
(z/tag-slug tag) tag (gethash tag counts))
)
tags
"\n")
"_No tags found yet._")))))
(org-export-define-derived-backend 'z-html 'html
:filters-alist '((:filter-final-output . z/insert-filetags-after-title)))
(defun z/org-main-prep (_project)
(z/generate-recently-updated-org 26))
(defun z/tag-slug (s)
"Turn a tag into a safe filename."
(let ((down (downcase s)))
(replace-regexp-in-string "[^a-z0-9]+" "-" down)))
(defun z/collect-post-files ()
"Return all .org files from org-posts and org-blogs."
(let* ((expanded (org-publish-expand-projects org-publish-project-alist))
(posts (assoc "org-posts" expanded))
(blogs (assoc "org-blogs" expanded)))
(cl-remove-duplicates
(append (and posts (org-publish-get-base-files posts))
(and blogs (org-publish-get-base-files blogs)))
:test #'file-equal-p)))
(defun z/gather-tag-index ()
"Return hash: tag -> list of (FILE TITLE DATE-ISO)."
(let ((idx (make-hash-table :test 'equal)))
(dolist (f (z/collect-post-files))
(when (and (string-match-p "\\.org\\'" f)
(file-readable-p f)
;; ignore generated lists
(not (member (file-name-nondirectory f)
'("posts-list.org" "blogs-list.org" "sitemap.org" "categories.org"))))
(with-temp-buffer
(insert-file-contents f)
(org-mode)
(let* ((kw (org-collect-keywords '("TITLE" "FILETAGS" "TAGS" "DATE")))
(title (or (car (cdr (assoc "TITLE" kw)))
(file-name-base f)))
(date (or (car (cdr (assoc "DATE" kw))) "")) ;; optional
(raw (car (or (cdr (assoc "FILETAGS" kw))
(cdr (assoc "TAGS" kw))))))
(when raw
(dolist (tag (split-string raw ":" t))
(push (list f title date) (gethash tag idx))))))))
idx))
(defun z/write-tag-pages ()
"Generate tags/*.org pages listing posts for each tag."
(let* ((site-root (expand-file-name "~/master-folder/org_files/org_web/"))
(tags-dir (expand-file-name "tags" site-root)))
(unless (file-directory-p tags-dir)
(make-directory tags-dir t))
(let ((idx (z/gather-tag-index)))
(maphash
(lambda (tag items)
(let* ((slug (z/tag-slug tag))
(outfile (expand-file-name (format "%s.org" slug) tags-dir)))
(with-temp-file outfile
(insert (format "#+TITLE: Tag: %s\n#+OPTIONS: toc:nil num:nil title:nil \n\n* Posts tagged %s\n"
tag tag))
;; sort newest first if DATE present
(setq items (sort items (lambda (a b) (string> (nth 2 a) (nth 2 b)))))
(dolist (it items)
(let* ((file (nth 0 it))
(title (nth 1 it))
(rel (file-relative-name file tags-dir)))
;; link to the source .org; org-publish will rewrite to the .html
(insert (format "- [[file:%s][%s]]\n" rel title)))))))
idx)
)))
(defun z/z-publish-to-html (plist filename pub-dir)
"Publish FILENAME to HTML using the z-html backend."
(org-publish-org-to 'z-html filename ".html" plist pub-dir))
;; Define the publishing project
(setq org-publish-project-alist
`(("org-main"
:recursive t
:base-directory "~/master-folder/org_files/org_web/"
:publishing-function org-html-publish-to-html
:publishing-function z/z-publish-to-html
:publishing-directory "~/master-folder/org_files/org_web/output"
:base-extension "org"
:auto-sitemap t
@@ -283,25 +222,29 @@ Created with %c on <a href=\"https://www.archlinux.org/\">Arch</a> <a href=\"htt
:sitemap-sort-files chronologically
:html-preamble ,z-preamble
:html-postamble ,z-postamble
:html-head ,z-shared-head)
:html-head ,z-shared-head
:preparation-function z/org-main-prep
)
("org-categories-sitemap"
:recursive t
:base-directory "~/master-folder/org_files/org_web/"
:publishing-directory "~/master-folder/org_files/org_web/output"
:base-directory "~/master-folder/org_files/org_web/home"
:publishing-directory "~/master-folder/org_files/org_web/output/home"
:base-extension "org"
:auto-sitemap t
:sitemap-filename "categories.org"
:sitemap-title "Categories"
:sitemap-function z/categories-sitemap
:html-preamble ,z-preamble
:html-preamble ,z-preamble
:html-postamble ,z-postamble
:html-head ,z-shared-head)
:html-head ,z-shared-head
)
("org-posts"
:base-directory "~/master-folder/org_files/org_web/posts"
:publishing-directory "~/master-folder/org_files/org_web/output/posts/"
:recursive t
:base-extension "org"
:publishing-function org-html-publish-to-html
:publishing-function z/z-publish-to-html
:with-author nil
:with-creator nil
:html-validation-link nil
@@ -314,13 +257,15 @@ Created with %c on <a href=\"https://www.archlinux.org/\">Arch</a> <a href=\"htt
:sitemap-title "Posts List"
:sitemap-style list
:sitemap-function z/posts-sitemap
:html-head ,z-shared-head)
:sitemap-sort-files anti-chronologically
:html-head ,z-shared-head
)
("org-blogs"
:base-directory "~/master-folder/org_files/org_web/blogs"
:publishing-directory "~/master-folder/org_files/org_web/output/blogs/"
:recursive t
:base-extension "org"
:publishing-function org-html-publish-to-html
:publishing-function z/z-publish-to-html
:with-author nil
:with-creator nil
:html-validation-link nil
@@ -331,7 +276,85 @@ Created with %c on <a href=\"https://www.archlinux.org/\">Arch</a> <a href=\"htt
:sitemap-title "Blogs List"
:sitemap-style list
:sitemap-function z/blogs-sitemap
:html-head ,z-shared-head)
:sitemap-sort-files anti-chronologically
:html-head ,z-shared-head
)
("org-books"
:base-directory "~/master-folder/org_files/org_web/books/"
:publishing-directory "~/master-folder/org_files/org_web/output/books/"
:recursive t
:base-extension "org"
:publishing-function z/z-publish-to-html
:with-author nil
:with-creator nil
:html-validation-link nil
:html-preamble ,z-preamble
:html-postamble ,z-postamble
:auto-sitemap t
:sitemap-filename "books-list.org"
:sitemap-title "Books List"
:sitemap-style list
:sitemap-function z/books-sitemap
:sitemap-sort-files anti-chronologically
:html-head ,z-shared-head
)
("org-2025"
:base-directory "~/master-folder/org_files/org_web/blogs/2025/"
:publishing-directory "~/master-folder/org_files/org_web/output/blogs/2025/"
:recursive t
:base-extension "org"
:publishing-function z/z-publish-to-html
:with-author nil
:with-creator nil
:html-validation-link nil
:html-preamble ,z-preamble
:html-postamble ,z-postamble
:auto-sitemap t
:sitemap-filename "2025-list.org"
:sitemap-title "2025 List"
:sitemap-style list
:sitemap-function z/2025-sitemap
:sitemap-sort-files anti-chronologically
:html-head ,z-shared-head
)
("org-career"
:base-directory "~/master-folder/org_files/org_web/posts/career/"
:publishing-directory "~/master-folder/org_files/org_web/output/posts/career/"
:recursive t
:base-extension "org"
:publishing-function z/z-publish-to-html
:with-author nil
:with-creator nil
:html-validation-link nil
:html-preamble ,z-preamble
:html-postamble ,z-postamble
:auto-sitemap t
:sitemap-filename "career-list.org"
:sitemap-title "Career List"
:sitemap-style list
:sitemap-function z/career-sitemap
:sitemap-sort-files anti-chronologically
:html-head ,z-shared-head
)
("wip-pages"
:base-directory "~/master-folder/org_files/org_web/"
:publishing-directory "~/master-folder/org_files/org_web/output/"
:recursive t
:base-extension "org"
:publishing-function z/z-publish-to-html
:with-author nil
:with-creator nil
:html-validation-link nil
:html-preamble ,z-preamble
:html-postamble ,z-postamble
:auto-sitemap t
:sitemap-filename "wip.org"
:sitemap-title "Work in progress"
:sitemap-style list
:sitemap-function z/wip-sitemap
:sitemap-sort-files anti-chronologically
:html-head ,z-shared-head
)
("org-tags"
:base-directory "~/master-folder/org_files/org_web/tags"
:publishing-directory "~/master-folder/org_files/org_web/output/tags"
@@ -351,14 +374,13 @@ Created with %c on <a href=\"https://www.archlinux.org/\">Arch</a> <a href=\"htt
:publishing-function org-publish-attachment)
))
(delete-directory "~/master-folder/org_files/org_web/output/" t)
(delete-directory "~/master-folder/org_files/org_web/tags/" t)
(message "Directory deleted")
;; Generate the site output
(z/write-tag-pages)
(org-publish-all t)
(message "Build complete!")
;;; build-site.el ends here