Make a lot more of the site configurable

config.toml

@@ -1,93 +0,0 @@
-baseURL = 'https://redstrate.com/'
-languageCode = 'en-us'
-title = '~redstrate'
-theme = 'red'
-enableGitInfo = true
-enableRobotsTXT = true
-
-[params]
-    description = "My personal corner of the Internet!"
-
-copyright = 'This content is licensed under a Creative Commons Attribution-NonCommercial-ShareAlike 3.0.'
-[author]
-    name = 'redstrate'
-
-[permalinks]
-  blog = 'blog/:year/:month/:title/'
-  art = 'art/:year/:month/:slugorfilename'
-  arttags = 'art/tags/:title'
-  characters = 'art/characters/:title'
-  characters_listpath = "art/characters/"
-  tags = 'blog/tags/:title'
-
-[taxonomies]
-  series = 'series'
-  tag = 'tags'
-  arttag = 'arttags'
-  character = 'characters'
-
-[menu]
-    [[menu.main]]
-    identifier = 'home'
-    name = 'Home'
-    url = '/'
-    weight = -1
-
-    [[menu.main]]
-    identifier = 'blog'
-    name = 'Blog'
-    url = '/blog'
-    weight = 1
-
-    [[menu.main]]
-    identifier = 'art'
-    name = 'Art'
-    url = '/art'
-    weight = 2
-
-    #[[menu.main]]
-    #identifier = 'photos'
-    #name = 'Photos'
-    #url = '/photos'
-    #weight = 3
-
-    [[menu.main]]
-    identifier = 'music'
-    name = 'Music'
-    url = '/music'
-    weight = 4
-
-    [[menu.main]]
-    identifier = 'software'
-    name = 'Software'
-    url = '/software'
-    weight = 6
-
-    [[menu.main]]
-    identifier = 'videos'
-    name = 'Videos'
-    url = 'https://tube.ryne.moe/@redchannel'
-    weight = 7
-
-    [[menu.main]]
-    identifier = 'downloads'
-    name = 'Downloads'
-    url = '/downloads'
-    weight = 8
-
-    [[menu.main]]
-    identifier = 'links'
-    name = 'Links'
-    url = '/Links'
-    weight = 9
-
-    [[menu.main]]
-    identifier = 'about'
-    name = 'About'
-    url = '/about'
-    weight = 10
-
-[outputs]
-    home = ["HTML"]
-    page = ["HTML"]
-    section = ["HTML", "RSS"]

config.yaml

@@ -0,0 +1,96 @@
+baseURL: 'https://redstrate.com/'
+copyright: 'This content is licensed under a Creative Commons Attribution-NonCommercial-ShareAlike 3.0.'
+defaultContentLanguage: 'en'
+disableHugoGeneratorInject: true
+enableGitInfo: true
+enableRobotsTXT: true
+languageCode: 'en-us'
+title: '~redstrate'
+theme: 'red'
+
+params:
+  description: "My personal corner of the Internet!"
+  github_username: "redstrate"
+  invent_username: "redstrate"
+  isso_url: "comments.redstrate.com"
+  geekring_site_id: 227
+
+author:
+  name: 'redstrate'
+
+permalinks:
+  blog: 'blog/:year/:month/:title/'
+  art: 'art/:year/:month/:slugorfilename'
+  arttags: 'art/tags/:title'
+  characters: 'art/characters/:title'
+  characters_listpath: "art/characters/"
+  tags: 'blog/tags/:title'
+
+taxonomies:
+  series: 'series'
+  tag: 'tags'
+  arttag: 'arttags'
+  character: 'characters'
+
+menu:
+  main:
+  - name: 'Home'
+    url: '/'
+    weight: -1
+  - name: 'Blog'
+    url: '/blog'
+    weight: 1
+  - name: 'Art'
+    url: '/art'
+    weight: 2
+  - name: 'Music'
+    url: '/music'
+    weight: 3
+  - name: 'Software'
+    url: '/software'
+    weight: 4
+  - name: 'Videos'
+    url: 'https://tube.ryne.moe/@redchannel'
+    weight: 5
+  - name: 'Downloads'
+    url: '/downloads'
+    weight: 6
+  - name: 'Links'
+    url: '/links'
+    weight: 7
+  - name: 'About'
+    url: '/about'
+    weight: 8
+  footer:
+  - name: 'Blog Feed'
+    url: '/blog/index.xml'
+    weight: -1
+  - name: 'Art Feed'
+    url: '/art/index.xml'
+    weight: 1
+  - name: 'Imprint'
+    url: '/imprint'
+    weight: 2
+  badges:
+  - name: 'CC NC SA'
+    url: 'by-nc-sa.webp'
+    weight: -1
+  - name: 'RSS Feed'
+    url: 'rssbanner.webp'
+    weight: 1
+  - name: 'Powered by Gentoo'
+    url: 'gentoo-badge2.webp'
+    weight: 2
+  - name: 'Evangelion'
+    url: 'nerv_button.webp'
+    weight: 3
+
+outputs:
+  home:
+  - HTML
+  page:
+  - HTML
+  section:
+  - HTML
+  - RSS
+

content/legacy-guestbook.md

@@ -1,5 +1,10 @@
-My old guestbook was hosted by [123Guestbook](https://123guestbook.com/). They have a separate [Terms of Service](https://www.123guestbook.com/tos) and [Privacy Policy](https://www.123guestbook.com/privacy-policy).
+---
+title: "Legacy Guestbook"
+---
 
 **Please do not submit new entries to this guestbook. I enabled the moderation queue to prevent new submissions.**
 
 **123Guestbook doesn't have CORS set up, so you must travel there manually :-(**
+
+My old guestbook can be [accessed here](https://redstrate.123Guestbook.com/).
+

themes/red/assets/css/site.css

@@ -223,11 +223,6 @@ table {
     text-align: center;
 }
 
-#f-list * {
-    display: inline;
-    margin-left: 1em;
-    margin-right: 1em;
-}
 
 h2 {
     margin-top: 0.2em;
@@ -267,7 +262,7 @@ pre {
     margin: .5em;
 }
 
-.blurb ul {
+.nice-list {
     display: inline;
     list-style: none;
     padding-left: 0;
@@ -275,12 +270,16 @@ pre {
     margin-top: 0;
 }
 
-.blurb ul li {
+.nice-list li {
     display: inline-block;
+}
+
+.nice-list li:not(:last-child) {
     margin-left: 0;
     margin-right: 0;
 }
 
-.blurb ul li:not(:last-child):not(:only-child)::after {
+
+.nice-list li:not(:last-child):not(:only-child)::after {
     content: "·";
 }

themes/red/layouts/404.html

@@ -1,3 +1,5 @@
 {{ define "main" }}
-    Page not found!
+    <h2>404</h2>
+
+    <p>Page not found!</p>
 {{ end }}

themes/red/layouts/_default/software.html

@@ -14,7 +14,7 @@
 
             <p>{{ .Summary }}</p>
 
-            <ul>
+            <ul class="nice-list">
                 <li>
                     <a href="{{ .RelPermalink }}">About</a>
                 </li>
@@ -42,14 +42,22 @@
 
                 <p>{{ .description }}</p>
 
-                <ul>
+                <ul class="nice-list">
                 {{ if eq .type "kde" }}
-                        <li><a href="https://invent.kde.org/{{ .id }}/-/commits/master?author=redstrate">Commits</a></li>
+                        <li>
-                        <li><a href="https://invent.kde.org/{{ .id }}/merge_requests?scope=all&utf8=%E2%9C%93&state=all&author_username=redstrate">MRs</a></li>
+                            <a href="https://invent.kde.org/{{ .id }}/-/commits/master?author={{ $.Site.Params.invent_username }}">Commits</a>
+                        </li>
+                        <li>
+                            <a href="https://invent.kde.org/{{ .id }}/merge_requests?scope=all&utf8=%E2%9C%93&state=all&author_username={{ $.Site.Params.invent_username }}">MRs</a>
+                        </li>
                 {{ else }}
                         {{ if eq .type "github" }}
-                                <li><a href="https://github.com/{{ .id }}/commits?author=redstrate">Commits</a></li>
+                                <li>
-                                <li><a href="https://github.com/{{ .id }}/pulls/pulls?q=is%3Apr+author%3Aredstrate+">PRs</a></li>
+                                    <a href="https://github.com/{{ .id }}/commits?author={{ $.Site.Params.github_username }}">Commits</a>
+                                </li>
+                                <li>
+                                    <a href="https://github.com/{{ .id }}/pulls?q=is%3Apr+author%3A{{ $.Site.Params.github_username }}+">PRs</a>
+                                </li>
                         {{ end }}
                 {{ end }}
                 </ul>

themes/red/layouts/index.html

@@ -1,7 +1,5 @@
 {{ define "main" }}
     <h2>{{ .Title }}</h2>
 
-    <div>
     {{ .Content }}
-    </div>
 {{ end }}

themes/red/layouts/partials/comments.html

@@ -2,12 +2,12 @@
 
 {{ if hugo.IsProduction }}
 <script
-    data-isso="//comments.redstrate.com/"
+    data-isso="//{{ $.Site.Params.isso_url }}/"
     data-isso-title=""
     data-isso-avatar="false"
     data-isso-vote="false"
     data-isso-reveal-on-click="5"
-    src="//comments.redstrate.com/js/embed.min.js" async crossorigin></script>
+    src="//{{ $.Site.Params.isso_url }}/js/embed.min.js" async crossorigin></script>
 
 <section id="isso-thread" data-title="{{ .Title }}" data-isso-id="{{ .File.ContentBaseName }}">
     <noscript>Javascript needs to be activated to view comments.</noscript>

themes/red/layouts/partials/footer.html

@@ -1,41 +1,30 @@
 <div id="f-badges">
-    {{ with resources.Get "by-nc-sa.webp" }}
+    {{ range $.Site.Menus.badges }}
-        <img height="15" width="80" src="{{ .Permalink }}" alt="CC NC SA">
+        {{ $badgeScope := . }}
+        {{ with resources.Get .URL }}
+            <img width="{{ .Width }}" height="{{ .Height }}" src="{{ .Permalink }}" alt="{{ $badgeScope.Name }}">
         {{ end }}
-
-    {{ with resources.Get "rssbanner.webp" }}
-        <img height="15" width="80" src="{{ .Permalink }}" alt="RSS Feed">
-    {{ end }}
-
-    {{ with resources.Get "gentoo-badge2.webp" }}
-    <img height="15" width="80" src="{{ .Permalink }}" alt="Powered by Gentoo">
-    {{ end }}
-
-    {{ with resources.Get "nerv_button.webp" }}
-    <img height="15" width="80" src="{{ .Permalink }}" alt="Evangelion">
     {{ end }}
 </div>
 
 <div id="f-list">
-    <a href="/blog/index.xml">Blog Feed</a>
+    <ul class="nice-list">
-
+        {{ range $.Site.Menus.footer }}
-    <a href="/art/index.xml">Art Feed</a>
+            <li>
-
+                <a href="{{ .URL }}">{{ .Name }}</a>
-    <a href="/license">License</a>
+            </li>
-
-    <a href="/imprint">Imprint</a>
-
-    {{ with .File }}
-    <a href="https://git.sr.ht/~redstrate/redstrate.com/tree/master/item/content/{{ .Path }}?view-source">Source</a>
         {{ end }}
+    </ul>
 </div>
 
-<hr>
+{{ with .Site.Params.geekring_site_id }}
+    <hr>
 
-<div id="f-list">
+    <div id="f-list">
         <b>This site is a proud member of the geekring! Check some other geeky websites here!</b><br>
-    <a href="http://geekring.net/site/227/previous">Previous site</a> --
+        <a href="http://geekring.net/site/{{ . }}/previous">Previous site</a> --
-    <a href="http://geekring.net/site/227/random">Random site</a> --
+        <a href="http://geekring.net/site/{{ . }}/random">Random site</a> --
-    <a href="http://geekring.net/site/227/next">Next site</a>
+        <a href="http://geekring.net/site/{{ . }}/next">Next site</a>
-</div>
+    </div>
+{{ end }}
 

themes/red/layouts/shortcodes/guestbook.html

@@ -1,10 +1,10 @@
 {{ if hugo.IsProduction }}
 <script
-    data-isso="//comments.redstrate.com/"
+    data-isso="//{{ $.Site.Params.isso_url }}/"
     data-isso-title=""
     data-isso-avatar="false"
     data-isso-vote="false"
-    src="//comments.redstrate.com/js/embed.min.js" crossorigin async></script>
+    src="//{{ $.Site.Params.isso_url }}/js/embed.min.js" crossorigin async></script>
 
 <section id="isso-thread" data-title="Guestbook" data-isso-id="/guestbook">
     <noscript>Javascript needs to be activated to view comments.</noscript>

themes/red/layouts/shortcodes/legacy-guestbook.html

@@ -1,2 +0,0 @@
-<iframe style="width:100%" height="500px" src="https://redstrate.123Guestbook.com/">
-</iframe>