feat: change Mastodon account

This reverts commit d58c5b4895.

.drone.yml

@@ -2,12 +2,6 @@ kind: pipeline
 name: default
 
 steps:
-# - name: prepare
-#   image: alpine
-#   commands:
-#     - apk add git
-#     - git submodule update --init --recursive
-
 - name: build
   image: silex/emacs:27-alpine
   commands:
@@ -38,3 +32,20 @@ steps:
     event:
       exclude:
       - pull_request
+
+- name: purge cache
+  image: jetrails/drone-cloudflare-caching
+  settings:
+    api_token:
+      from_secret: cloudflare_cache_api
+    zone_identifier:
+      from_secret: phundrak_com_zone_id
+    action: purge_files
+    list:
+    - https://blog.phundrak.com
+  when:
+    branch:
+    - master
+    event:
+      exclude:
+      - pull_request

.gitattributes

@@ -0,0 +1,2 @@
+*.org linguist-detectable
+docs/* -linguist-documentation

.gitignore

@@ -2,3 +2,5 @@
 /public/
 /resources/
 /content/*.md
+/.hugo_build.lock
+/build/

config.toml

@@ -3,7 +3,7 @@ languageCode = "en-us"
 copyright = "This work is licensed under a Creative Commons Attribution-ShareAlike 4.0 International License."
 title = "Phundrak’s rambling"
 theme = "m10c"
-paginate = 5
+paginate = 10
 enableInlineShortcodes = true
 staticDir = ["static"]
 
@@ -16,7 +16,7 @@ enableEmoji = true
 [params]
   author = "Lucien Cartier-Tilet"
   description = "Some random rambling by a linguistics nerd about Emacs, Linux, and conlanging"
-  avatar = "mahakala.png"
+  avatar = "leon.png"
 
   [[params.social]]
     name = "github"
@@ -32,19 +32,15 @@ enableEmoji = true
 
   [[params.social]]
     name = "flag"
-    url = "https://langue.phundrak.com"
+    url = "https://conlang.phundrak.com"
 
   [[params.social]]
     name = "twitter"
-    url = "https://github.com/phundrak"
+    url = "https://twitter.com/phundrak"
 
   [[params.social]]
     name = "youtube"
-    url = "https://youtube.com/phundrak"
+    url = "https://www.youtube.com/@phundrak"
-
-  [[params.social]]
-    name = "instagram"
-    url = "https://instagram.com/phundrak"
 
   [[params.social]]
     name = "mail"
@@ -60,3 +56,8 @@ enableEmoji = true
    primaryColor = "#8fbcbb"
    lightColor = "#d8dee9"
    lightestColor = "#eceff4"
+
+[markup]
+  [markup.goldmark]
+    [markup.goldmark.renderer]
+      unsafe = true

layouts/_default/baseof.html

@@ -7,6 +7,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="author" content="{{ .Site.Params.author | default "John Doe" }}" />
     <meta name="description" content="{{ if .IsHome }}{{ .Site.Params.description }}{{ else }}{{ .Description }}{{ end }}" />
+    <meta name="fediverse:creator" content="@phundrak@mastodon.phundrak.com" />
     {{ $style := resources.Get "css/main.scss" | resources.ExecuteAsTemplate "css/main.scss" . | resources.ToCSS | resources.Minify | resources.Fingerprint -}}
     <link rel="stylesheet" href="{{ $style.Permalink }}" />
 
@@ -14,31 +15,40 @@
     {{ template "_internal/twitter_cards.html" . }}
     {{ template "_internal/opengraph.html" . }}
 
-    <!-- Matomo -->
-    <script type="text/javascript">
-     var _paq = window._paq || [];
-     /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
-     _paq.push(['trackPageView']);
-     _paq.push(['enableLinkTracking']);
-     (function() {
-         var u="//matomo.phundrak.com/";
-         _paq.push(['setTrackerUrl', u+'matomo.php']);
-         _paq.push(['setSiteId', '3']);
-         var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-         g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
-     })();
-    </script>
-    <!-- End Matomo Code -->
-
     <style>
     .commento-root .commento-anonymous-checkbox-container input[type="checkbox"] + label,
     .commento-root .commento-mod-tools button,
     .commento-root-font * {
-         color: #eee !important;
+      color: #eceff4 !important;
     }
     .commento-root .commento-footer .commento-logo-container .commento-logo-text {
       color: #34495e !important;
     }
+    .commento-root .commento-dark-card {
+      background-color: #d08770 !important;
+    }
+    .commento-root input[type="text"], .commento-root textarea {
+      color: #2e3440 !important;
+    }
+    .commento-root .commento-mod-tools::before {
+      color: #b48ead !important;
+    }
+    .commento-root .commento-submit-button {
+      background: #5e81ac !important;
+    }
+
+    .commento-login-box {
+      background: #3b4252;
+    }
+
+    .commento-input::placeholder {
+      color:#d8dee9;
+    }
+
+    .commento-root .commento-login-box-container .commento-login-box .commento-email-container .commento-email .commento-email-button {
+      background: #d8dee9
+    }
+
     p code {
       font-family: monospace,monospace;
       font-size: 1em;
@@ -55,6 +65,15 @@
     }
     </style>
 
+    <!-- Umami -->
+    <script async
+            src="https://umami.phundrak.com/script.js"
+            data-website-id="ded52f14-40e3-43b9-a680-704f16e02838"
+            data-do-not-track="true"
+    >
+    </script>
+    <!-- End of Umami code -->
+
   </head>
   <body>
     <header class="app-header">

layouts/_default/single.html

@@ -1,35 +1,30 @@
 {{ define "main" }}
-  <article class="post">
+<article class="post">
   <header class="post-header">
-      <h1 class ="post-title">{{ .Title }}</h1>
+    <h1 class="post-title">{{ .Title }}</h1>
     <div class="post-meta">
       <div>
-          {{ partial "icon.html" (dict "ctx" $ "name" "calendar") }}
+        {{ partial "icon.html" (dict "ctx" $ "name" "calendar") }} {{
-          {{ .PublishDate.Format "Jan 2, 2006" }}
+        .PublishDate.Format "Jan 2, 2006" }}
       </div>
       <div>
-          {{ partial "icon.html" (dict "ctx" $ "name" "clock") }}
+        {{ partial "icon.html" (dict "ctx" $ "name" "clock") }} {{ .ReadingTime
-          {{ .ReadingTime }} min read
+        }} min read
       </div>
       {{- with .Params.tags -}}
       <div>
-          {{ partial "icon.html" (dict "ctx" $ "name" "tag") }}
+        {{ partial "icon.html" (dict "ctx" $ "name" "tag") }} {{ range . -}} {{-
-          {{ range . -}}
+        with $.Site.GetPage (printf "/%s/%s" "tags" . ) -}}
-            {{- with $.Site.GetPage (printf "/%s/%s" "tags" . ) -}}
         <a class="tag" href="{{ .Permalink }}">{{ .Title }}</a>
-            {{- end -}}
+        {{- end -}} {{- end -}}
-          {{- end -}}
       </div>
       {{- end -}}
     </div>
   </header>
-    <div class="post-content">
+  <div class="post-content">{{ .Content }}</div>
-      {{ .Content }}
-    </div>
   <div class="post-footer">
-      {{ template "_internal/disqus.html" . }}
+    <script defer src="https://comentario.phundrak.com/comentario.js"></script>
+    <comentario-comments></comentario-comments>
   </div>
-  </article>
+</article>
-  <script defer src="https://commento.phundrak.com/js/commento.js"></script>
-  <div id="commento"></div>
 {{ end }}

layouts/index.xml

@@ -0,0 +1,39 @@
+{{- $pctx := . -}}
+{{- if .IsHome -}}{{ $pctx = .Site }}{{- end -}}
+{{- $pages := slice -}}
+{{- if or $.IsHome $.IsSection -}}
+{{- $pages = $pctx.RegularPages -}}
+{{- else -}}
+{{- $pages = $pctx.Pages -}}
+{{- end -}}
+{{- $limit := .Site.Config.Services.RSS.Limit -}}
+{{- if ge $limit 1 -}}
+{{- $pages = $pages | first $limit -}}
+{{- end -}}
+{{- printf "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"yes\"?>" | safeHTML }}
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
+  <channel>
+    <title>{{ if eq  .Title  .Site.Title }}{{ .Site.Title }}{{ else }}{{ with .Title }}{{.}} on {{ end }}{{ .Site.Title }}{{ end }}</title>
+    <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 }}
+    <managingEditor>{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}</managingEditor>{{end}}{{ with .Site.Author.email }}
+    <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 -0700" | safeHTML }}</lastBuildDate>{{ end }}
+    {{- with .OutputFormats.Get "RSS" -}}
+    {{ printf "<atom:link href=%q rel=\"self\" type=%q />" .Permalink .MediaType | safeHTML }}
+    {{- end -}}
+    {{ range $pages }}
+    <item>
+      <title>{{ .Title }}</title>
+      <link>{{ .Permalink }}</link>
+      <pubDate>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</pubDate>
+      {{ with .Site.Author.email }}<author>{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}</author>{{end}}
+      <guid>{{ .Permalink }}</guid>
+      <description>{{ .Content | html }}</description>
+    </item>
+    {{ end }}
+  </channel>
+</rss>

publish

@@ -1,9 +0,0 @@
-#!/usr/bin/env fish
-printf "###############################################################################\n"
-printf "# Compiling blog                                                              #\n"
-printf "###############################################################################\n"
-hugo
-printf "###############################################################################\n"
-printf "# Uploading blog                                                              #\n"
-printf "###############################################################################\n"
-rsync -ruvtEhl --progress public/ Tilo:~/www/phundrak.com/blog