Update Hugo's configuration and usage of custom parameters

hugo.toml

@@ -41,21 +41,21 @@ title = "Ethan Yoo"
 
 # Parameters
 [params]
-  author = "Ethan Yoo"
-  authorEmail = "hello@ethanyoo.com"
-  authorGitLab = "https://framagit.org/ethan"
-  authorGitea = "https://git.eyoo.link/ethan"
-  authorLetterboxd = "https://letterboxd.com/ethanyoo/stats/"
-  authorLinkedIn = "https://www.linkedin.com/in/ethanyoo/"
-  authorMastodon = "https://todon.eu/@ethanyoo"
-  authorPronouns = "he/him/his"
-  authorWriteFreely = "https://ethan.writeas.com/"
   copyrightMessage = "Please support free culture by using Creative Commons licenses."
   dateFmt = "2006-01-02 15:04 MST"
-  description = "Ethan Yoo is a data analyst and researcher with a particular interest in topics related to disability, health equity, and social policy."
+  description = "Ethan Yoo is a data analyst and researcher with a particular interest in topics related to climate change, disability, and social policy."
   license = "https://creativecommons.org/licenses/by-sa/4.0/"
-  subtitle = "Pronouns: he/him/his"
+  subtitle = "Pronouns: he/him"
   webmentionService = "https://webmention.io/ethanyoo.com/webmention"
+  [params.author]
+    name = "Ethan Yoo"
+    email = "hello@ethanyoo.com"
+    Gitea = "https://git.eyoo.link/ethan"
+    GitLab = "https://framagit.org/ethan"
+    Letterboxd = "https://letterboxd.com/ethanyoo/stats/"
+    LinkedIn = "https://www.linkedin.com/in/ethanyoo/"
+    Mastodon = "https://todon.eu/@ethanyoo"
+    pronouns = "he/him"
 
 [menu]
 

layouts/index.html

@@ -13,7 +13,7 @@
         https://microformats.org/wiki/microformats2#authoring
       -->
       <a class="p-name fn u-url url link-000" href="/">
-        <h1>{{ .Site.Params.author }}</h1>
+        <h1>{{ .Site.Params.author.name }}</h1>
       </a>
       <!--
         New properties (including gender identity) listed at
@@ -21,7 +21,7 @@
       -->
       <h3>
         Pronouns:
-        <span class="p-gender-identity gender">{{ .Site.Params.authorPronouns }}</span>
+        <span class="p-gender-identity gender">{{ .Site.Params.author.pronouns }}</span>
       </h3>
       <p class="p-note">
         I am a data enthusiast skilled in data management, qualitative and
@@ -34,7 +34,7 @@
         class="u-photo photo"
         src="/me.jpg"
         alt="Photo of an East Asian man wearing a dark gray suit and a floral tie"
-        title="{{ .Site.Params.author }}"
+        title="{{ .Site.Params.author.name }}"
       />
       <p>
         My guiding principles draw from disability justice and the ethics of care;
@@ -59,10 +59,10 @@
         <a class="btn" href="/resources/">&#x1F4DA; You can browse my recommended resources.</a>
       </p>
       <h2>Elsewhere</h2>
-      <a class="link-linkedin" rel="me" href="{{ .Site.Params.authorLinkedIn }}">
+      <a class="link-linkedin" rel="me" href="{{ .Site.Params.author.LinkedIn }}">
         <img class="linkedin" src="icon/linkedin.svg"></img>LinkedIn
       </a>
-      <a class="link-letterboxd" rel="me" href="{{ .Site.Params.authorLetterboxd }}">
+      <a class="link-letterboxd" rel="me" href="{{ .Site.Params.author.Letterboxd }}">
         <img class="letterboxd" src="icon/letterboxd.svg"></img>Letterboxd
       </a>
     </div>
@@ -81,16 +81,16 @@
     <a class="link-000" href="{{ .Site.Params.license }}">
       <img
         src="/img/CC-BY-SA.svg"
-        alt="Original content by {{ .Site.Params.author }} is licensed under {{ .Site.Copyright }}"
+        alt="Original content by {{ .Site.Params.author.name }} is licensed under {{ .Site.Copyright }}"
         title="{{ .Site.Params.copyrightMessage }}"
       />
     </a>
     <p>
       <b>
-        <a class="u-email email" rel="me" href="mailto:{{ .Site.Params.authorEmail }}">Contact me</a>.
+        <a class="u-email email" rel="me" href="mailto:{{ .Site.Params.author.email }}">Contact me</a>.
         <a href="/privacy/" >Privacy</a>.
         <a rel="pgpkey" href="/ethan.asc.txt">Public key</a>
-        <a href="https://keyoxide.org/{{ .Site.Params.authorEmail }}">(Keyoxide)</a>.
+        <a href="https://keyoxide.org/{{ .Site.Params.author.email }}">(Keyoxide)</a>.
       </b>
     </p>
     <a class="link-nextcloud" href="https://nextcloud.com/sharing#eyoo@share.mayfirst.org">
@@ -107,7 +107,7 @@
 </footer>
 
 {{ "<!-- For more content -->" | safeHTML }}
-<link rel="me" href="{{ .Site.Params.authorGitea }}" />
+<link rel="me" href="{{ .Site.Params.author.Gitea }}" />
-<link rel="me" href="{{ .Site.Params.authorGitLab }}" />
+<link rel="me" href="{{ .Site.Params.author.GitLab }}" />
-<link rel="me" href="{{ .Site.Params.authorWriteFreely }}" />
+<link rel="me" href="{{ .Site.Params.author.Mastodon }}" />
 {{- end }}

themes/geronimo/layouts/_default/baseof.html

@@ -1,9 +1,11 @@
 <!DOCTYPE html>
 <html lang="{{ .Site.LanguageCode | default "en-us" }}">
-<head><meta charset="UTF-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width, initial-scale=1"><title itemprop="name">{{ .Title }} | {{ .Site.Title }}</title><meta property="og:title" content="{{ .Title }} | {{ .Site.Title }}"/>
+<head><meta charset="UTF-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width, initial-scale=1">
-{{ with .Site.Params.author }}<meta name="author" content="{{ . }}">{{ end }}
+<title itemprop="name">{{ if eq  .Title  .Site.Title }}{{ .Site.Title }}{{ else }}{{ with .Title }}{{.}} from {{ end }}{{ .Site.Title }}{{ end }}</title>
+<meta property="og:title" content="{{ if eq  .Title  .Site.Title }}{{ .Site.Title }}{{ else }}{{ with .Title }}{{.}} from {{ end }}{{ .Site.Title }}{{ end }}"/>
+{{ with .Site.Params.author.name }}<meta name="author" content="{{ . }}">{{ end }}
 {{ with .Params.date }}<meta name="og:type" content="article"/>{{ else }}<meta name="og:type" content="website"/>{{end}}
-{{- with .Description }}<meta name="description" content="{{ . }}"><meta property="og:description" content="{{ . }}"/>{{ else }}<meta name="description" content="{{ .Site.Params.Description }}"><meta property="og:description" content="{{ .Site.Params.Description }}"/>{{- end }}
+{{- with .Description }}<meta name="description" content="{{ . }}"><meta property="og:description" content="{{ . }}"/>{{ else }}<meta name="description" content="{{ .Site.Params.description }}"><meta property="og:description" content="{{ .Site.Params.description }}"/>{{- end }}
 <link rel="shortcut icon" type="image/png" href="/favicon.png"/>
 {{- with .RelPermalink }}<meta name="url" content="{{ . }}"/><meta property="og:url" content="{{ . }}"/>{{- end }}
 <link rel="openid.delegate" href="https://ethanyoo.com/"/><link rel="openid.server" href="https://openid.indieauth.com/openid"/><link rel="webmention" href="https://webmention.io/ethanyoo.com/webmention"/>

themes/geronimo/layouts/_default/index.json

@@ -4,8 +4,8 @@
 	{{ if .Params.dateCreated }}
 			{{ $.Scratch.Set "date" (.Params.dateCreated) }}
 	{{ else }}
-			{{- if isset site.Params "date_format" -}}
+			{{- if isset site.Params "dateFmt" -}}
-				{{- $.Scratch.Set "date" (.Date.Format site.Params.date_format) -}}
+				{{- $.Scratch.Set "date" (.Date.Format .Site.Params.dateFmt) -}}
 			{{- else -}}
 				{{- $.Scratch.Set "date" (.Date.Format "2006-01-02") -}}
 			{{- end -}}

themes/geronimo/layouts/_default/rss.xml

@@ -17,10 +17,8 @@
     <link>{{ .Permalink }}</link>
     <description>Recent content {{ if ne  .Title  .Site.Title }}{{ with .Title }}in {{.}} {{ end }}{{ end }}on {{ .Site.Title }}</description>
     <generator>Hugo -- gohugo.io</generator>{{ with .Site.LanguageCode }}
-    <language>{{.}}</language>{{end}}{{ with .Site.Author.email }}
+    <language>{{.}}</language>{{end}}
-    <managingEditor>{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}</managingEditor>{{end}}{{ with .Site.Author.email }}
+    {{ with .Site.Copyright }}<copyright>{{.}}</copyright>{{end}}{{ if not .Date.IsZero }}
-    <webMaster>{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}</webMaster>{{end}}{{ with .Site.Copyright }}
-    <copyright>{{.}}</copyright>{{end}}{{ if not .Date.IsZero }}
     <lastBuildDate>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 MST" | safeHTML }}</lastBuildDate>{{ end }}
     {{- with .OutputFormats.Get "RSS" -}}
     {{ printf "<atom:link href=%q rel=\"self\" type=%q />" .Permalink .MediaType | safeHTML }}
@@ -29,8 +27,8 @@
     <item>
       <title>{{ .Title }}</title>
       <link>{{ .Permalink }}</link>
-      <pubDate>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 MST" | safeHTML }}</pubDate>
+      <pubDate>{{ .Date.Format "Monday, January 2, 2006 15:04:05 MST" | safeHTML }}</pubDate>
-      {{ with .Site.Author.email }}<author>{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}</author>{{end}}
+      <author>{{ .Site.Params.author.email }}</author>
       <guid>{{ .Permalink }}</guid>
       <description>{{ .Content | html }}</description>
     </item>

themes/geronimo/layouts/partials/footer.html

@@ -5,5 +5,5 @@
 {{- end }}
 	</p>
 	<a class="link-000" href="https://ForTheBadge.com/"><img src="/img/built-with-love.svg" alt="This site was built with love, using Git and Hugo." title="I also used Git and Hugo." /></a>
-	<a class="link-000" href="{{ .Site.Params.license }}"><img src="/img/CC-BY-SA.svg" alt="Original content by {{ .Site.Params.author }} is licensed under {{ .Site.Copyright }}" title="{{ .Site.Params.copyrightMessage }}" /></a>
+	<a class="link-000" href="{{ .Site.Params.license }}"><img src="/img/CC-BY-SA.svg" alt="Original content by {{ .Site.Params.author.name }} is licensed under {{ .Site.Copyright }}" title="{{ .Site.Params.copyrightMessage }}" /></a>
 </footer>

themes/geronimo/theme.toml

@@ -5,7 +5,7 @@ description = "Hugo theme based on smol"
 homepage = "https://git.eyoo.link/ethan/geronimo"
 tags = []
 features = []
-min_version = "0.41.0"
+min_version = "0.134.0"
 
 [author]
   name = "Ethan Yoo"