Use modules, new layout, and hugo_cookie_consent.

.devcontainer/docker-compose.yml

@@ -1,4 +1,3 @@
-version: '3.8'
 services:
   # Update this to the name of the service you want to work with in your docker-compose.yml file
   server:

.gitea/workflows/build-and-deploy.yaml

@@ -4,9 +4,6 @@ on:
   push:
     branches:
       - main
-  # schedule:
-  #   - cron: '0 0 * * *'
-  #     timezone: 'Europe/Berlin'
   workflow_dispatch:
 
 jobs:

.gitmodules

@@ -1,4 +0,0 @@
-[submodule "themes/hermit-v2"]
-	path = themes/hermit-v2
-	url = https://github.com/1bl4z3r/hermit-V2
-	branch = main

assets/scss/_userstyles.scss

@@ -7,3 +7,5 @@ $line-height: 2;                     // Line height multiplier for optimal reada
 $width-desktop: 50vw;                // Container width for desktop screens (60% viewport width)
 $width-tablet: 70vw;                 // Container width for tablet screens (70% viewport width)
 $width-mobile: 80vw;                 // Container width for mobile screens (80% viewport width)
+
+@import "hugo_cookie_consent/style";

config.toml

@@ -1,145 +0,0 @@
-baseURL = 'https://www.bovender.de/'
-languageCode = 'en-us'
-timeZone = 'Europe/Berlin'
-defaultContentLanguage = 'en'
-title = 'bovender'
-theme = "hermit-v2"
-
-enableGitInfo = true
-
-pygmentsCodefences  = true
-pygmentsUseClasses  = true
-#hasCJKLanguage = true
-
-rssLimit = 10
-
-copyright = "2024-2025 Daniel Kraus"
-enableEmoji = true
-
-[permalinks]
-  [permalinks.page]
-    posts = '/posts/:year/:month/:slug/'
-
-#[services]
-#  [services.disqus]
-#    shortname = ''
-#  [services.googleAnalytics]
-#    id = ''
-
-[frontmatter]
-date = ["date", "publishDate", "lastmod"]
-lastmod = ["lastmod", ":git", "date", "publishDate"]
-publishDate = ["publishDate", "date"]
-expiryDate = ["expiryDate"]
-
-[params.author]
-  name = "Daniel Kraus"
-  about = "/about"
-
-[blackfriday]
-  hrefTargetBlank = true
-  # noreferrerLinks = true
-  # nofollowLinks = true
-
-[taxonomies]
-  tag = "tags"    
-  # Categories are disabled by default.
-  # category = "categories"
-
-[markup.goldmark.renderer]
-  unsafe = true
-
-# Enable to get proper Mathjax support
-#[markup]
-#  [markup.goldmark]
-#    [markup.goldmark.extensions]
-#      [markup.goldmark.extensions.passthrough]
-#        enable = true
-#        [markup.goldmark.extensions.passthrough.delimiters]
-#          block = [['\[', '\]'], ['$$', '$$']]
-#          inline = [['\(', '\)']]
-
-
-[params]
-  LongDate = "2 Jan 2006"
-  ShortDate = "2 Jan"
-  NumDateShort = "2006-01-02"
-  NumDateLong = "2006-01-02 15:04 -0700"
-
-  description = "Daniel Kraus' personal homepage"
-  # images = [""]
-  themeColor = "#292e32"
-
-  homeSubtitle = "Daniel Kraus"
-  footerCopyright = "all rights reserved"
-  # bgImg = ""
-
-  ShowLastmod = true
-  gitUrl = "https://git.bovender.de/daniel/blog/commit/"
-
-  justifyContent = false
-
-  relatedPosts = true
-  code_copy_button = true
-
-  homeSubtitlePrinter = true
-  scrollToTop = true 
-  global_mathjax = false
-  readTime = false
-  readTimeSeparator = "~"
-  # legacyLayout = false
-  shareSocial = true
-  # googleTagManager = "GTM-XXXXXXXX"
-  # tagSymbol = "#"
-  # categorySymbol = "⊲"
-  # pinned = "Pinned Posts"
-  # pinnedSVGname = "pin"
-  # descriptionInPosts= true
-  initialPublish = "Initally Posted on: "
-  human = ["single","posts"]
-  
-  [[params.socialLinks]]
-    name = "bluesky"
-    url = "https://bsky.app/profile/bovender.bsky.social"
-
-  [[params.socialLinks]]
-    name = "mastodon"
-    url = "https://neph.social/@daniel_kraus"
-
-  # [[params.socialLinks]]
-  #   name = "x"
-  #   url = "https://twitter.com/bovender_de"
-
-  [[params.socialLinks]]
-    name = "github"
-    url = "https://github.com/bovender"
-
-  [[params.socialLinks]]
-    name = "stackoverflow"
-    url = "https://stackoverflow.com/users/270712/bovender"
-
-  [[params.socialLinks]]
-    name = "linkedin"
-    url = "https://www.linkedin.com/in/bovender"
-
-[menu]
-
-  [[menu.main]]
-    name = "Blog"
-    url = "posts/"
-    weight = 10
-
-  [[menu.main]]
-    name = "About bovender"
-    url = "about/"
-    weight = 20
-
-  [[menu.main]]
-    name = "Impressum"
-    url = "impressum/"
-    weight = 30
-
-  [[menu.main]]
-    name = "Cheat sheet"
-    url = "cheatsheet/"
-    weight = 15

config/_default/hugo.yaml

@@ -0,0 +1,105 @@
+baseURL: 'https://www.bovender.de/'
+title: 'bovender'
+language:
+  locale: 'en-us'
+timeZone: 'Europe/Berlin'
+copyright: "2024-2026 Daniel Kraus"
+
+params:
+  LongDate: "2 Jan 2006"
+  ShortDate: "2 Jan"
+  NumDateShort: "2006-01-02"
+  NumDateLong: "2006-01-02 15:04 -0700"
+
+  description: "Daniel Kraus' personal homepage"
+  themeColor: "#292e32"
+
+  homeSubtitle: "Daniel Kraus' personal homepage"
+  footerCopyright: "all rights reserved"
+
+  ShowLastmod: true
+  gitUrl: "https://git.bovender.de/daniel/blog/commit/"
+
+  justifyContent: false
+
+  relatedPosts: true
+  code_copy_button: true
+
+  homeSubtitlePrinter: true
+  scrollToTop: true
+  global_mathjax: false
+  readTime: false
+  readTimeSeparator: "~"
+  shareSocial: true
+  initialPublish: "Initally Posted on: "
+  human:
+    - single
+    - posts
+
+  socialLinks:
+    - name: "bluesky"
+      url: "https://bsky.app/profile/bovender.bsky.social"
+    - name: "mastodon"
+      url: "https://neph.social/@daniel_kraus"
+    - name: "github"
+      url: "https://github.com/bovender"
+    - name: "stackoverflow"
+      url: "https://stackoverflow.com/users/270712/bovender"
+    - name: "linkedin"
+      url: "https://www.linkedin.com/in/bovender"
+
+menu:
+  main:
+    - name: "Blog"
+      url: "posts/"
+      weight: 10
+    - name: "About bovender"
+      url: "about/"
+      weight: 20
+    - name: "Impressum"
+      url: "impressum/"
+      weight: 30
+    - name: "Cheat sheet"
+      url: "cheatsheet/"
+      weight: 15
+
+enableGitInfo: true
+pygmentsCodefences: true
+pygmentsUseClasses: true
+hasCJKLanguage: false
+rssLimit: 10
+
+enableEmoji: true
+
+permalinks:
+  page:
+    posts: '/posts/:year/:month/:slug/'
+
+frontmatter:
+  date:
+    - date
+    - publishDate
+    - lastmod
+  lastmod:
+    - lastmod
+    - ':git'
+    - date
+    - publishDate
+  publishDate:
+    - publishDate
+    - date
+  expiryDate:
+    - expiryDate
+
+blackfriday:
+  hrefTargetBlank: true
+  # noreferrerLinks: true
+  # nofollowLinks: true
+
+taxonomies:
+  tag: "tags"
+
+markup:
+  goldmark:
+    renderer:
+      unsafe: true

config/_default/module.yaml

@@ -0,0 +1,3 @@
+imports:
+  - path: github.com/1bl4z3r/hermit-V2
+  - path: git.bovender.de/daniel/hugo_cookie_consent

config/_default/params.yaml

@@ -0,0 +1,5 @@
+hugo_cookie_consent:
+  privacy_policy_url: /privacy
+  enable_tracking: true
+  matomo_host: https://matomo.bovender.de
+  matomo_site_id: 1

config/development/hugo.yaml

@@ -0,0 +1,2 @@
+baseURL: 'http://localhost:1313/'
+workspace: hugo.work

docker-compose.yml

@@ -1,18 +1,16 @@
 services:
   build:
-    # image: hugomods/hugo:ci
     image: ghcr.io/gohugoio/hugo
     command: build 
     volumes:
       - ".:/project"
     user: 1000:1000
   server:
-    # image: hugomods/hugo:exts
     image: ghcr.io/gohugoio/hugo
-    command: server --bind 0.0.0.0 --buildDrafts --buildFuture
+    command: server --bind 0.0.0.0 --buildDrafts --buildFuture --environment development
     volumes:
-      # - ".:/src"
       - ".:/project"
+      - "../hugo_cookie_consent:/hugo_cookie_consent"
     ports:
       - "127.0.0.1:1313:1313"
     user: 1000:1000

go.mod

@@ -0,0 +1,9 @@
+module git.bovender.de/daniel/blog
+
+go 1.26.4
+
+require git.bovender.de/daniel/hugo_cookie_consent v0.0.1
+
+require github.com/1bl4z3r/hermit-V2 v1.1.33 // indirect
+
+replace git.bovender.de/daniel/hugo_cookie_consent => ../hugo_cookie_consent

go.sum

@@ -0,0 +1,4 @@
+git.bovender.de/daniel/hugo_cookie_consent v0.0.1 h1:rVSt6vFwFR1dpFyD7BFqII91XtKPrq7ToiKtvbDxBS4=
+git.bovender.de/daniel/hugo_cookie_consent v0.0.1/go.mod h1:XTLK60q7Zlhjtw84Toe0l8C1tgPaVKcWRluceaig0o0=
+github.com/1bl4z3r/hermit-V2 v1.1.33 h1:AjYWuPMkyF5/B7KXHQyyerHb4cm/ftiH1Fdd1kvCuXY=
+github.com/1bl4z3r/hermit-V2 v1.1.33/go.mod h1:jzBra4Jey2XWE2vYCkCqttBP3KxwFXpQMK0cBcsbO04=

hugo.work

@@ -0,0 +1,4 @@
+go 1.22
+
+use .
+use ../hugo_cookie_consent

layouts/_partials/analytics.html

@@ -0,0 +1 @@
+{{ partial "hugo_cookie_consent/scripts.html" . }}

layouts/_partials/extra-foot.html

@@ -0,0 +1 @@
+{{ partial "hugo_cookie_consent/banner.html" . }}

layouts/partials/analytics.html

@@ -1,16 +0,0 @@
-<!-- Matomo -->
-<script>
-    var _paq = window._paq = window._paq || [];
-    /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
-    _paq.push(['trackPageView']);
-    _paq.push(['enableLinkTracking']);
-    (function() {
-      var u="https://matomo.bovender.de/";
-      _paq.push(['setTrackerUrl', u+'matomo.php']);
-      _paq.push(['setSiteId', '1']);
-      var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-      g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
-    })();
-  </script>
-  <!-- End Matomo Code -->
-  

pull-and-update.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-set -e
-
-# https://stackoverflow.com/a/1482133/270712
-MYDIR=`dirname -- "$( readlink -f -- "$0"; )";`
-pushd "$MYDIR"
-git pull --recurse-submodules
-docker compose -f docker-compose.yml up build
-popd

update-blog.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-pushd /home/daniel/local/Code/blog
-docker compose up build && rsync -e "ssh -i /home/daniel/.ssh/id_rsa" -av --delete public/* bovender.de:/var/docker-data/nginx/www/bovender/
-popd
-