jan/website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Swap prettier for djlint

Browse source
This commit is contained in:
Jan Kremer 2026-02-26 07:35:56 +01:00
parent e2fd2a13e8
commit 212ca46616
No known key found for this signature in database
12 changed files with 150 additions and 178 deletions
Download patch file Download diff file Expand all files Collapse all files

48
layouts/_partials/footer.html
View file

@ -1,27 +1,25 @@
<ul> <ul>
<li> <li>
<a <a href="https://creativecommons.org/publicdomain/zero/1.0/"
href="https://creativecommons.org/publicdomain/zero/1.0/" target="_blank"
target="_blank" rel="noopener noreferrer"
rel="noopener noreferrer" aria-label="CC0: This work has been marked as dedicated to the public domain.">
aria-label="CC0: This work has been marked as dedicated to the public domain." {{ partial "cc.svg" . }}
> {{ partial "zero.svg" . }}
{{ partial "cc.svg" . }} </a>
{{ partial "zero.svg" . }} </li>
</a> <li>
</li> <a href="/about" id="title">
<li> {{ partial "logo.svg" . }}
<a href="/about" id="title"> {{ site.Title }}
{{ partial "logo.svg" . }} </a>
{{ site.Title }} </li>
</a> <!-- <li>
</li> {{ with .GitInfo }}
<!-- <li> <a href="https://github.com/jukremer/jukremer.github.io/commit/{{ .Hash }}">
{{ with .GitInfo }} {{ partial "git.svg" }} {{ .Subject }} ({{ .AbbreviatedHash }})
<a href="https://github.com/jukremer/jukremer.github.io/commit/{{ .Hash }}"> </a>
{{ partial "git.svg" }} {{ .Subject }} ({{ .AbbreviatedHash }}) {{ end }}
</a> </li> -->
{{ end }} <li>2021–{{ now.Year }}</li>
</li> -->
<li>2021–{{ now.Year }}</li>
</ul> </ul>

12
layouts/_partials/head.html
View file

@ -10,18 +10,18 @@
<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png" /> <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png" />
<link rel="manifest" href="/site.webmanifest" /> <link rel="manifest" href="/site.webmanifest" />
<title> <title>
{{ if .IsHome }} {{ if .IsHome }}
{{ site.Title }} {{ site.Title }}
{{ else }} {{ else }}
{{ printf "%s – %s" .Title {{ printf "%s – %s" .Title
site.Title site.Title
}} }}
{{ end }} {{ end }}
</title> </title>
{{ partialCached "head/css.html" . }} {{ partialCached "head/css.html" . }}
{{ partialCached "head/js.html" . }} {{ partialCached "head/js.html" . }}
{{ with .OutputFormats.Get "rss" }} {{ with .OutputFormats.Get "rss" }}
{{ printf `<link rel=%q type=%q href=%q title=%q>` .Rel .MediaType.Type .Permalink site.Title | safeHTML }} {{ printf `<link rel=%q type=%q href=%q title=%q>` .Rel .MediaType.Type .Permalink site.Title | safeHTML }}
{{ end }}{{ with .OutputFormats.Get "atom" }} {{ end }}{{ with .OutputFormats.Get "atom" }}
{{ printf `<link rel=%q type=%q href=%q title=%q>` .Rel .MediaType.Type .Permalink site.Title | safeHTML }} {{ printf `<link rel=%q type=%q href=%q title=%q>` .Rel .MediaType.Type .Permalink site.Title | safeHTML }}
{{ end }} {{ end }}

26
layouts/_partials/head/css.html
View file

@ -1,16 +1,14 @@
{{- with resources.Get "css/main.css" }} {{- with resources.Get "css/main.css" }}
{{- if eq hugo.Environment {{- if eq hugo.Environment
"development" "development"
}} }}
<link rel="stylesheet" href="{{ .RelPermalink }}" /> <link rel="stylesheet" href="{{ .RelPermalink }}" />
{{- else }} {{- else }}
{{- with . | minify | fingerprint }} {{- with . | minify | fingerprint }}
<link <link rel="stylesheet"
rel="stylesheet" href="{{ .RelPermalink }}"
href="{{ .RelPermalink }}" integrity="{{ .Data.Integrity }}"
integrity="{{ .Data.Integrity }}" crossorigin="anonymous" />
crossorigin="anonymous" {{- end }}
/> {{- end }}
{{- end }}
{{- end }}
{{- end }} {{- end }}

30
layouts/_partials/head/js.html
View file

@ -1,18 +1,16 @@
{{- with resources.Get "js/main.js" }} {{- with resources.Get "js/main.js" }}
{{- if eq hugo.Environment "development" }} {{- if eq hugo.Environment "development" }}
{{- with . | js.Build }} {{- with . | js.Build }}
<script src="{{ .RelPermalink }}"></script> <script src="{{ .RelPermalink }}"></script>
{{- end }} {{- end }}
{{- else }} {{- else }}
{{- $opts := dict "minify" true }} {{- $opts := dict "minify" true }}
{{- with . | js.Build {{- with . | js.Build
$opts | fingerprint $opts | fingerprint
}} }}
<script <script src="{{ .RelPermalink }}"
src="{{ .RelPermalink }}" integrity="{{- .Data.Integrity }}"
integrity="{{- .Data.Integrity }}" crossorigin="anonymous"></script>
crossorigin="anonymous" {{- end }}
></script> {{- end }}
{{- end }}
{{- end }}
{{- end }} {{- end }}

4
layouts/_partials/header.html
View file

@ -1,4 +1,2 @@
<a href="/" class="title"> <a href="/" class="title">{{ partial "logo.svg" . }}{{ site.Title }}</a>
{{ partial "logo.svg" . }}{{ site.Title }}
</a>
{{ partial "menu.html" (dict "menuID" "main" "page" .) }} {{ partial "menu.html" (dict "menuID" "main" "page" .) }}

65
layouts/_partials/menu.html
View file

@ -9,44 +9,39 @@
*/}} */}}
{{- $page := .page }} {{- $page := .page }}
{{- $menuID := .menuID }} {{- $menuID := .menuID }}
{{- with index site.Menus $menuID }} {{- with index site.Menus $menuID }}
<nav> <nav>
<ul> <ul>
{{- partial "inline/menu/walk.html" (dict "page" $page "menuEntries" .) }} {{- partial "inline/menu/walk.html" (dict "page" $page "menuEntries" .) }}
</ul> </ul>
</nav> </nav>
{{- end }} {{- end }}
{{- define "partials/inline/menu/walk.html" }} {{- define "partials/inline/menu/walk.html" }}
{{- $page := .page }} {{- $page := .page }}
{{- range .menuEntries }} {{- range .menuEntries }}
{{- $attrs := dict "href" .URL }} {{- $attrs := dict "href" .URL }}
{{- if $page.IsMenuCurrent .Menu . }} {{- if $page.IsMenuCurrent .Menu . }}
{{- $attrs = merge $attrs (dict "class" "active" "aria-current" "page") }} {{- $attrs = merge $attrs (dict "class" "active" "aria-current" "page") }}
{{- else if $page.HasMenuCurrent .Menu . }} {{- else if $page.HasMenuCurrent .Menu . }}
{{- $attrs = merge $attrs (dict "class" "ancestor" "aria-current" "true") }} {{- $attrs = merge $attrs (dict "class" "ancestor" "aria-current" "true") }}
{{- end }} {{- end }}
{{- $name := .Name }} {{- $name := .Name }}
{{- with .Identifier }} {{- with .Identifier }}
{{- with T . }} {{- with T . }}
{{- $name = . }} {{- $name = . }}
{{- end }} {{- end }}
{{- end }} {{- end }}
<li> <li>
<a <a {{- range $k, $v := $attrs }}
{{- range $k, $v := $attrs }} {{- with $v }}
{{- with $v }} {{- printf " %s=%q" $k $v | safeHTMLAttr }}
{{- printf " %s=%q" $k $v | safeHTMLAttr }} {{- end }}
{{- end }} {{- end -}}>{{ $name }}</a>
{{- end -}} {{- with .Children }}
>{{ $name }}</a <ul>
> {{- partial "inline/menu/walk.html" (dict "page" $page "menuEntries" .) }}
{{- with .Children }} </ul>
<ul> {{- end }}
{{- partial "inline/menu/walk.html" (dict "page" $page "menuEntries" .) }} </li>
</ul> {{- end }}
{{- end }}
</li>
{{- end }}
{{- end }} {{- end }}

22
layouts/_partials/terms.html
View file

@ -6,17 +6,19 @@
{{- $page := .page }} {{- $page := .page }}
{{- $taxonomy := .taxonomy }} {{- $taxonomy := .taxonomy }}
{{- with $page.GetTerms {{- with $page.GetTerms
$taxonomy $taxonomy
}} }}
{{- $label := (index . 0).Parent.LinkTitle }} {{- $label := (index . 0).Parent.LinkTitle }}
<div class="tags"> <div class="tags">
<ul> <ul>
<li>Tags:</li> <li>Tags:</li>
<ul> <ul>
{{- range . }} {{- range . }}
<li><a href="{{ .RelPermalink }}">{{ .LinkTitle }}</a></li> <li>
{{- end }} <a href="{{ .RelPermalink }}">{{ .LinkTitle }}</a>
</ul> </li>
{{- end }}
</ul>
</ul> </ul>
</div> </div>
{{- end }} {{- end }}

29
layouts/baseof.html
View file

@ -1,15 +1,16 @@
<!doctype html> <!DOCTYPE html>
<html <html lang="{{ or site.Language.LanguageCode site.Language.Lang }}"
lang="{{ or site.Language.LanguageCode site.Language.Lang }}" dir="{{ or site.Language.LanguageDirection `ltr` }}">
dir="{{ or site.Language.LanguageDirection `ltr` }}" <head>{{ partial "head.html" . }}</head>
> <body>
<head> <header>
{{ partial "head.html" . }} {{ partial "header.html" . }}
</head> </header>
<main>
<body> {{ block "main" . }}{{ end }}
<header>{{ partial "header.html" . }}</header> </main>
<main>{{ block "main" . }}{{ end }}</main> <footer>
<footer>{{ partial "footer.html" . }}</footer> {{ partial "footer.html" . }}
</body> </footer>
</body>
</html> </html>

30
layouts/home.html
View file

@ -1,21 +1,21 @@
{{ define "main" }} {{ define "main" }}
{{ .Content }} {{ .Content }}
{{ $pages := .Paginate (where {{ $pages := .Paginate (where
.Site.RegularPages "Type" "ne" "page") .Site.RegularPages "Type" "ne" "page")
}} }}
<div class="list"> <div class="list">
<ul> <ul>
{{ range $pages.Pages }} {{ range $pages.Pages }}
<li> <li>
<a href="{{ .RelPermalink }}" style="display: block"> <a href="{{ .RelPermalink }}" style="display: block">
<h2>{{ .Title }}</h2> <h2>{{ .Title }}</h2>
<p class="lead">{{ .Description }}</p> <p class="lead">{{ .Description }}</p>
{{ $dateMachine := .Date | time.Format "2006-01-02T15:04:05-07:00" }} {{ $dateMachine := .Date | time.Format "2006-01-02T15:04:05-07:00" }}
{{ $dateHuman := .Date | time.Format ":date_long" }} {{ $dateHuman := .Date | time.Format ":date_long" }}
<time datetime="{{ $dateMachine }}">{{ $dateHuman }}</time> <time datetime="{{ $dateMachine }}">{{ $dateHuman }}</time>
</a> </a>
</li> </li>
{{ end }} {{ end }}
</ul> </ul>
</div> </div>
{{ end }} {{ end }}

26
layouts/list.html
View file

@ -1,20 +1,18 @@
{{ define "main" }} {{ define "main" }}
{{ .Content }} {{ .Content }}
<div class="list"> <div class="list">
<ul> <ul>
{{ range .Pages }} {{ range .Pages }}
<li> <li>
<a href="{{ .RelPermalink }}" style="display: block"> <a href="{{ .RelPermalink }}" style="display: block">
<h2>{{ .Title }}</h2> <h2>{{ .Title }}</h2>
<p class="lead">{{ .Description }}</p>
<p class="lead">{{ .Description }}</p> {{ $dateMachine := .Date | time.Format "2006-01-02T15:04:05-07:00" }}
{{ $dateHuman := .Date | time.Format ":date_long" }}
{{ $dateMachine := .Date | time.Format "2006-01-02T15:04:05-07:00" }} <time datetime="{{ $dateMachine }}">{{ $dateHuman }}</time>
{{ $dateHuman := .Date | time.Format ":date_long" }} </a>
<time datetime="{{ $dateMachine }}">{{ $dateHuman }}</time>
</a>
</li> </li>
{{ end }} {{ end }}
</ul> </ul>
</div> </div>
{{ end }} {{ end }}

18
layouts/single.html
View file

@ -1,20 +1,20 @@
{{ define "main" }} {{ define "main" }}
<article> <article>
{{ $dateHuman := .Date | time.Format ":date_long" }} {{ $dateHuman := .Date | time.Format ":date_long" }}
{{ $dateMachine := .Date | time.Format "2006-01-02T15:04:05-07:00" }} {{ $dateMachine := .Date | time.Format "2006-01-02T15:04:05-07:00" }}
{{ $lastmodDateHuman := .Lastmod | time.Format ":date_long" }} {{ $lastmodDateHuman := .Lastmod | time.Format ":date_long" }}
{{ $lastmodDateMachine := .Lastmod | time.Format "2006-01-02T15:04:05-07:00" }} {{ $lastmodDateMachine := .Lastmod | time.Format "2006-01-02T15:04:05-07:00" }}
<div class="dates"> <div class="dates">
<p> <p>
Editiert: Editiert:
<time datetime="{{ $lastmodDateMachine }}" <time datetime="{{ $lastmodDateMachine }}">{{ $lastmodDateHuman }}</time>
>{{ $lastmodDateHuman }}</time </p>
> <p>
</p> <time datetime="{{ $dateMachine }}">{{ $dateHuman }}</time>
<p><time datetime="{{ $dateMachine }}">{{ $dateHuman }}</time></p> </p>
</div> </div>
<h1>{{ .Title }}</h1> <h1>{{ .Title }}</h1>
<p class="lead">{{ .Description }}</p> <p class="lead">{{ .Description }}</p>
{{ .Content }} {{ .Content }}
</article> </article>
{{ end }} {{ end }}

18
treefmt.nix
View file

@ -1,26 +1,10 @@
{ pkgs, ... }:
{ {
programs = { programs = {
nixfmt.enable = true; nixfmt.enable = true;
gofmt.enable = true;
taplo.enable = true; taplo.enable = true;
prettier = { djlint.enable = true;
enable = true;
settings = {
plugins = [
"${pkgs.prettier-plugin-go-template}/lib/node_modules/prettier-plugin-go-template/lib/index.js"
];
overrides = [
{
files = [ "*.html" ];
options.parser = "go-template";
}
];
};
};
}; };
settings.global.excludes = [ settings.global.excludes = [
"archetypes/**"
"public/**" "public/**"
"static/**" "static/**"
".envrc" ".envrc"