From c909ed9af85e50ecfbe64ec14d8bda0e9b03a35a Mon Sep 17 00:00:00 2001 From: Rodion Goritskov Date: Fri, 7 Jun 2024 23:24:09 +0400 Subject: baldeagle: Change layout --- baldeagle/.gitignore | 3 +-- baldeagle/publish.el | 12 +++++------- rodion/blogs.scm | 3 +-- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/baldeagle/.gitignore b/baldeagle/.gitignore index 14ecebd..d298be1 100644 --- a/baldeagle/.gitignore +++ b/baldeagle/.gitignore @@ -1,2 +1 @@ -baldeagle-public/ -baldeagle-gemini/ \ No newline at end of file +public/ \ No newline at end of file diff --git a/baldeagle/publish.el b/baldeagle/publish.el index 4f71c06..087bfad 100644 --- a/baldeagle/publish.el +++ b/baldeagle/publish.el @@ -5,15 +5,13 @@ (require 'ox-publish) (require 'ox-gemini) -(setq exclude-regex "baldeagle-\\(public\\|gemini\\)/") - -exclude-regex +(setq exclude-regex "public/") (setq org-publish-project-alist `(("baldeagle-content" :base-directory "." :base-extension "org" - :publishing-directory "baldeagle-public/" + :publishing-directory "public/baldeagle.me/" :recursive t :publishing-function org-html-publish-to-html :headline-levels 4 @@ -23,14 +21,14 @@ exclude-regex ("baldeagle-static" :base-directory "." :base-extension "css\\|js\\|png\\|jpg\\|gif\\|pdf\\|mp3\\|ogg\\|swf" - :publishing-directory "baldeagle-public/" + :publishing-directory "public/baldeagle.me/" :recursive t :exclude ,exclude-regex :publishing-function org-publish-attachment) ("baldeagle-gemini" :base-directory "." :base-extension "org" - :publishing-directory "baldeagle-gemini/" + :publishing-directory "public/gem.baldeagle.me/" :recursive t :publishing-function org-gemini-publish-to-gemini :headline-levels 4 @@ -40,7 +38,7 @@ exclude-regex ("baldeagle-gemini-media" :base-directory "." :base-extension "png\\|jpg\\|gif\\|pdf\\|mp3\\|ogg\\|swf" - :publishing-directory "baldeagle-gemini/" + :publishing-directory "public/gem.baldeagle.me/" :recursive t :exclude ,exclude-regex :publishing-function org-publish-attachment) diff --git a/rodion/blogs.scm b/rodion/blogs.scm index 18a4840..1b7c88f 100644 --- a/rodion/blogs.scm +++ b/rodion/blogs.scm @@ -37,8 +37,7 @@ (lambda* (#:key inputs #:allow-other-keys) (setenv "HOME" "/tmp") (invoke "emacs" "--quick" "--batch" "--script" "publish.el")))) - #:install-plan ''(("baldeagle-public/" "share/baldeagle/") - ("baldeagle-gemini/" "share/baldeagle-gemini/")))) + #:install-plan ''(("public/" "share/baldeagle/")))) (license license:expat) (description "Baldeagle.me blog") (synopsis "Baldeagle blog."))) -- cgit v1.2.3