Create configDir for journal generation

This gets rid of the ugly dependency on Python scripts. By using
configDir, two different configs can be specified. One for Gemini and
one for the Web. This keeps everything separate, tidy, and much more
maintainable.

6 files changed, 31 insertions, 23 deletions

diff --git a/.build.yml b/.build.yml
index 98ecf89..12c8207 100644
--- a/.build.yml
+++ b/.build.yml
@@ -6,14 +6,16 @@ packages:
 environment:
   site: nicholasjohnson.srht.site
 tasks:
-- generate: |
-    python3 $site/themes/hugo-theme-nicksphere/scripts/generate.py
+- generate_journal: |
+    cd $site
+    hugo -e gemini
+    hugo -e web
 - package_website: |
-    cd $site/website
-    tar -cvz . > ../../site.tar.gz
+    cd $site/public/website
+    tar -cvz . > ../../../site.tar.gz
 - package_capsule: |
-    cd $site/capsule
-    tar -cvz . > ../../capsule.tar.gz
+    cd $site/public/capsule
+    tar -cvz . > ../../../capsule.tar.gz
 - upload_website: |
     hut pages publish -d $site site.tar.gz
 - upload_capsule: |
diff --git a/.gitignore b/.gitignore
index cb2f626..c7ce793 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-public/
-capsule/
-website/
+public/capsule
+public/website
 .hugo_build.lock
diff --git a/config.toml b/config/_default/config.toml
index cb2aa75..3d4b20b 100644
--- a/config.toml
+++ b/config/_default/config.toml
@@ -4,9 +4,8 @@ title = "Nicholas Johnson"
 copyright = "CC BY-SA 4.0"
 languageCode = "en-us"
 disablePathToLower = true
-enableRobotsTXT = true
-disableKinds = ['taxonomy', 'term', 'RSS', 'section']
 rssLimit = 20
+ignoreFiles = ['content/templates/logo\.txt$']
 
 [author]
   name = "Nicholas Johnson"
@@ -40,6 +39,13 @@ rssLimit = 20
     url = "/atom.xml"
     weight = 4
 
+[markup]
+  [markup.goldmark]
+    [markup.goldmark.renderer]
+      hardWraps = true
+    [markup.goldmark.extensions]
+      linkify = false
+
 [mediaTypes]
   [mediaTypes."application/atom"]
     suffixes = ["xml"]
@@ -55,15 +61,3 @@ rssLimit = 20
   [outputFormats.Gemini_Atom]
     mediaType = "application/atom"
     baseName = "atom"
-    path = "gemini_atom"
-
-[markup]
-  [markup.goldmark]
-    [markup.goldmark.renderer]
-      hardWraps = true
-    [markup.goldmark.extensions]
-      linkify = false
-
-[outputs]
-  home = ["HTML", "Gemini", "Atom", "Gemini_Atom"]
-  page = ["HTML", "Gemini"]
diff --git a/config/gemini/config.toml b/config/gemini/config.toml
new file mode 100644
index 0000000..417a9bd
--- /dev/null
+++ b/config/gemini/config.toml
@@ -0,0 +1,6 @@
+disableKinds = ['taxonomy', 'term', 'RSS', 'section', 'sitemap']
+publishDir = "public/capsule"
+
+[outputs]
+  home = ["Gemini", "Gemini_Atom"]
+  page = ["Gemini"]
diff --git a/config/web/config.toml b/config/web/config.toml
new file mode 100644
index 0000000..f34177b
--- /dev/null
+++ b/config/web/config.toml
@@ -0,0 +1,7 @@
+disableKinds = ['taxonomy', 'term', 'RSS', 'section']
+enableRobotsTXT = true
+publishDir = "public/website"
+
+[outputs]
+  home = ["HTML", "Atom"]
+  page = ["HTML"]
diff --git a/themes/journal b/themes/journal
-Subproject d2df941fdaa188ece3f43fd8c47b9234e10bbcd
+Subproject 90f6e85f8689f09644b3a060541d0d5b3defa2e