From e57c4aa4038c5ac0226717be6deea107bd24cbfa Mon Sep 17 00:00:00 2001 From: Daniel Kraus Date: Sun, 14 Jun 2026 23:16:20 +0200 Subject: [PATCH] Use modules, new layout, and hugo_cookie_consent. --- .devcontainer/docker-compose.yml | 1 - .gitea/workflows/build-and-deploy.yaml | 3 - .gitmodules | 4 - assets/scss/_userstyles.scss | 2 + config.toml | 145 ------------------ config/_default/hugo.yaml | 105 +++++++++++++ config/_default/module.yaml | 3 + config/_default/params.yaml | 5 + config/development/hugo.yaml | 2 + docker-compose.yml | 6 +- go.mod | 9 ++ go.sum | 4 + hugo.work | 4 + layouts/_partials/analytics.html | 1 + layouts/{partials => _partials}/comments.html | 0 layouts/_partials/extra-foot.html | 1 + .../{partials => _partials}/extra-head.html | 0 .../posts_single_info.html | 0 .../{partials => _partials}/social-share.html | 0 .../{shortcodes => _shortcodes}/figure.html | 0 .../{shortcodes => _shortcodes}/git-info.html | 0 .../{shortcodes => _shortcodes}/orcid.html | 0 layouts/partials/analytics.html | 16 -- pull-and-update.sh | 9 -- themes/hermit-v2 | 1 - update-blog.sh | 5 - 26 files changed, 138 insertions(+), 188 deletions(-) delete mode 100644 .gitmodules delete mode 100644 config.toml create mode 100644 config/_default/hugo.yaml create mode 100644 config/_default/module.yaml create mode 100644 config/_default/params.yaml create mode 100644 config/development/hugo.yaml create mode 100644 go.mod create mode 100644 go.sum create mode 100644 hugo.work create mode 100644 layouts/_partials/analytics.html rename layouts/{partials => _partials}/comments.html (100%) create mode 100644 layouts/_partials/extra-foot.html rename layouts/{partials => _partials}/extra-head.html (100%) rename layouts/{partials => _partials}/posts_single_info.html (100%) rename layouts/{partials => _partials}/social-share.html (100%) rename layouts/{shortcodes => _shortcodes}/figure.html (100%) rename layouts/{shortcodes => _shortcodes}/git-info.html (100%) rename layouts/{shortcodes => _shortcodes}/orcid.html (100%) delete mode 100644 layouts/partials/analytics.html delete mode 100755 pull-and-update.sh delete mode 160000 themes/hermit-v2 delete mode 100755 update-blog.sh diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index eeca08f..34d2e69 100644 --- a/.devcontainer/docker-compose.yml +++ b/.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: diff --git a/.gitea/workflows/build-and-deploy.yaml b/.gitea/workflows/build-and-deploy.yaml index fb2b5aa..d090245 100644 --- a/.gitea/workflows/build-and-deploy.yaml +++ b/.gitea/workflows/build-and-deploy.yaml @@ -4,9 +4,6 @@ on: push: branches: - main - # schedule: - # - cron: '0 0 * * *' - # timezone: 'Europe/Berlin' workflow_dispatch: jobs: diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 9aa6663..0000000 --- a/.gitmodules +++ /dev/null @@ -1,4 +0,0 @@ -[submodule "themes/hermit-v2"] - path = themes/hermit-v2 - url = https://github.com/1bl4z3r/hermit-V2 - branch = main diff --git a/assets/scss/_userstyles.scss b/assets/scss/_userstyles.scss index 8c603cf..f51d309 100644 --- a/assets/scss/_userstyles.scss +++ b/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"; diff --git a/config.toml b/config.toml deleted file mode 100644 index 002771b..0000000 --- a/config.toml +++ /dev/null @@ -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 diff --git a/config/_default/hugo.yaml b/config/_default/hugo.yaml new file mode 100644 index 0000000..2f2641e --- /dev/null +++ b/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 diff --git a/config/_default/module.yaml b/config/_default/module.yaml new file mode 100644 index 0000000..4f03f78 --- /dev/null +++ b/config/_default/module.yaml @@ -0,0 +1,3 @@ +imports: + - path: github.com/1bl4z3r/hermit-V2 + - path: git.bovender.de/daniel/hugo_cookie_consent diff --git a/config/_default/params.yaml b/config/_default/params.yaml new file mode 100644 index 0000000..ee5e666 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/config/development/hugo.yaml b/config/development/hugo.yaml new file mode 100644 index 0000000..338a618 --- /dev/null +++ b/config/development/hugo.yaml @@ -0,0 +1,2 @@ +baseURL: 'http://localhost:1313/' +workspace: hugo.work diff --git a/docker-compose.yml b/docker-compose.yml index 02c3095..3275ae4 100644 --- a/docker-compose.yml +++ b/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 diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..8398e1b --- /dev/null +++ b/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 diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..b929022 --- /dev/null +++ b/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= diff --git a/hugo.work b/hugo.work new file mode 100644 index 0000000..fa47db4 --- /dev/null +++ b/hugo.work @@ -0,0 +1,4 @@ +go 1.22 + +use . +use ../hugo_cookie_consent diff --git a/layouts/_partials/analytics.html b/layouts/_partials/analytics.html new file mode 100644 index 0000000..9f37a47 --- /dev/null +++ b/layouts/_partials/analytics.html @@ -0,0 +1 @@ +{{ partial "hugo_cookie_consent/scripts.html" . }} diff --git a/layouts/partials/comments.html b/layouts/_partials/comments.html similarity index 100% rename from layouts/partials/comments.html rename to layouts/_partials/comments.html diff --git a/layouts/_partials/extra-foot.html b/layouts/_partials/extra-foot.html new file mode 100644 index 0000000..0d0c7c2 --- /dev/null +++ b/layouts/_partials/extra-foot.html @@ -0,0 +1 @@ +{{ partial "hugo_cookie_consent/banner.html" . }} diff --git a/layouts/partials/extra-head.html b/layouts/_partials/extra-head.html similarity index 100% rename from layouts/partials/extra-head.html rename to layouts/_partials/extra-head.html diff --git a/layouts/partials/posts_single_info.html b/layouts/_partials/posts_single_info.html similarity index 100% rename from layouts/partials/posts_single_info.html rename to layouts/_partials/posts_single_info.html diff --git a/layouts/partials/social-share.html b/layouts/_partials/social-share.html similarity index 100% rename from layouts/partials/social-share.html rename to layouts/_partials/social-share.html diff --git a/layouts/shortcodes/figure.html b/layouts/_shortcodes/figure.html similarity index 100% rename from layouts/shortcodes/figure.html rename to layouts/_shortcodes/figure.html diff --git a/layouts/shortcodes/git-info.html b/layouts/_shortcodes/git-info.html similarity index 100% rename from layouts/shortcodes/git-info.html rename to layouts/_shortcodes/git-info.html diff --git a/layouts/shortcodes/orcid.html b/layouts/_shortcodes/orcid.html similarity index 100% rename from layouts/shortcodes/orcid.html rename to layouts/_shortcodes/orcid.html diff --git a/layouts/partials/analytics.html b/layouts/partials/analytics.html deleted file mode 100644 index c55406a..0000000 --- a/layouts/partials/analytics.html +++ /dev/null @@ -1,16 +0,0 @@ - - - - \ No newline at end of file diff --git a/pull-and-update.sh b/pull-and-update.sh deleted file mode 100755 index 6779853..0000000 --- a/pull-and-update.sh +++ /dev/null @@ -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 diff --git a/themes/hermit-v2 b/themes/hermit-v2 deleted file mode 160000 index 5aa603d..0000000 --- a/themes/hermit-v2 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5aa603d89709db8f09ec026fca2a1dfee1e29a8d diff --git a/update-blog.sh b/update-blog.sh deleted file mode 100755 index fd71350..0000000 --- a/update-blog.sh +++ /dev/null @@ -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 -