main.scss: add comments explaining my font decisions

.gitattributes

@@ -6,9 +6,9 @@
 * text=auto eol=lf linguist-detectable
 
 # Built-in diff patterns (disabled by default).
-*.css   diff=css
+*.css diff=css
-*.html  diff=html
+*.html diff=html
-*.php   diff=php
+*.php diff=php
 *.{md,markdown} diff=markdown
 
 # These don't feel like mine

.prettierrc

@@ -1,4 +1,4 @@
 {
-  "plugins": ["@prettier/plugin-xml"],
+  "plugins": ["@prettier/plugin-xml", "prettier-plugin-sh"],
   "overrides": [{ "files": ".prettierrc", "options": { "parser": "json" } }]
 }

CODEOWNERS

@@ -1 +1 @@
-*	@Mikaela
+* @Mikaela

Gemfile.lock

@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.1.3.3)
+    activesupport (7.1.3.4)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -16,7 +16,7 @@ GEM
     base64 (0.2.0)
     bigdecimal (3.1.8)
     colorator (1.1.0)
-    concurrent-ruby (1.3.1)
+    concurrent-ruby (1.3.2)
     connection_pool (2.4.1)
     drb (2.2.1)
     em-websocket (0.5.3)
@@ -35,22 +35,22 @@ GEM
     ffi (1.17.0-x86_64-linux-gnu)
     ffi (1.17.0-x86_64-linux-musl)
     forwardable-extended (2.6.0)
-    google-protobuf (4.27.0)
+    google-protobuf (4.27.1)
       bigdecimal
       rake (>= 13)
-    google-protobuf (4.27.0-aarch64-linux)
+    google-protobuf (4.27.1-aarch64-linux)
       bigdecimal
       rake (>= 13)
-    google-protobuf (4.27.0-arm64-darwin)
+    google-protobuf (4.27.1-arm64-darwin)
       bigdecimal
       rake (>= 13)
-    google-protobuf (4.27.0-x86-linux)
+    google-protobuf (4.27.1-x86-linux)
       bigdecimal
       rake (>= 13)
-    google-protobuf (4.27.0-x86_64-darwin)
+    google-protobuf (4.27.1-x86_64-darwin)
       bigdecimal
       rake (>= 13)
-    google-protobuf (4.27.0-x86_64-linux)
+    google-protobuf (4.27.1-x86_64-linux)
       bigdecimal
       rake (>= 13)
     html-pipeline (2.14.3)

assets/main.scss

@@ -5,11 +5,18 @@
 @charset "utf-8";
 
 // Our variables
-$base-font-family: ui-serif, system-ui, "Liberation Serif", Tinos,
+$serif-font-family: ui-serif, "Liberation Serif", Tinos, "Times New Roman",
-  "Times New Roman", serif, emoji;
+  serif, emoji;
-//$base-font-family: ui-sans-serif, system-ui, "Liberation Sans", "Arimo", "Arial", sans-serif;
+// The second font, system-ui, may map to serif or something else entirely
+// instead of sans-serif, but it's less of an issue than the others
+// considering how serifs have distinguishable homoglyphs (I and l or O and 0
+// etc.)
+$sans-serif-font-family: ui-sans-serif, system-ui, "Liberation Sans", "Arimo",
+  "Arial", sans-serif;
 $monospace-font-family: ui-monospace, "Liberation Mono", Cousine, "Courier New",
   monospace, emoji;
+// Must be in the end or undefined error.
+$base-font-family: $sans-serif-font-family;
 
 // CSS of used Jekyll theme
 @import "{{ site.theme }}";
@@ -39,10 +46,17 @@ $monospace-font-family: ui-monospace, "Liberation Mono", Cousine, "Courier New",
   font-variant-emoji: text;
 }
 
+// E.g. blesmrt.net vs bIesmrt.net
 a {
   text-decoration: underline !important;
+  font-family: $serif-font-family;
 }
 
+// Extraneous considering the above.
+//a.site-title {
+//  font-family: $serif-font-family;
+//}
+
 // .page-content {
 //     width: 100% !important;
 //     max-width: 78ch !important;
@@ -60,6 +74,17 @@ code {
   font-size: 0.8em !important;
 }
 
+// Serif for headings to constrast with everything else being sans-serif
+// (except links).
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+  font-family: $serif-font-family !important;
+}
+
 // Overrides for light themes
 @media (prefers-color-scheme: light) {
   *:not(a) {
@@ -105,6 +130,7 @@ code {
 #bio {
   text-align: center;
   font-style: italic;
+  font-family: ui-cursive, $serif-font-family;
 }
 
 // _layouts/mini.html calls this for returning to index!

blog/_posts/2015-02-24-znc160-ssl.md

@@ -69,16 +69,16 @@ from multiple places:
 ```bash
 # Get server SSL certificate fingerprint in MD5, SHA1 and SHA256.
 # Note that OpenSSL doesn't support IPv6 at time of writing (2015-01-13).
-serversslcertfp () {
+serversslcertfp() {
-    SSSLCFFN=$(openssl s_client -showcerts -connect $1 < /dev/null)
+  SSSLCFFN=$(openssl s_client -showcerts -connect $1 < /dev/null)
-    # To see all validity information
+  # To see all validity information
-    echo "$SSSLCFFN"
+  echo "$SSSLCFFN"
-    # For getting the fingerprints
+  # For getting the fingerprints
-    echo "$SSSLCFFN" | openssl x509 -md5 -fingerprint -noout
+  echo "$SSSLCFFN" | openssl x509 -md5 -fingerprint -noout
-    echo "$SSSLCFFN" | openssl x509 -sha1 -fingerprint -noout
+  echo "$SSSLCFFN" | openssl x509 -sha1 -fingerprint -noout
-    echo "$SSSLCFFN" | openssl x509 -sha256 -fingerprint -noout
+  echo "$SSSLCFFN" | openssl x509 -sha256 -fingerprint -noout
-    echo "$SSSLCFFN" | openssl x509 -sha512 -fingerprint -noout
+  echo "$SSSLCFFN" | openssl x509 -sha512 -fingerprint -noout
-    unset SSSLCFFN
+  unset SSSLCFFN
 }
 ```
 

blog/_posts/2016-03-27-puhelimet-kellojen-siirto-pysyvasti.md

@@ -1,7 +1,7 @@
 ---
 layout: post
 comments: true
-title: "Mitä puhelimet tekisivät jos kelloja siirrettäisiin pysyvästi"
+title: "Mitä puhelimet tekisivät jos kelloja siirrettäisiin pysyvästi?"
 category: [finnish]
 tags:
   [

blog/_posts/2022-08-22-ssh-signing-verifying-functions.md

@@ -38,9 +38,9 @@ There isn't much point in signing things, unless you are able to verify them. Th
 
 ```bash
 sshAllowedSigners=$HOME/src/gitea.blesmrt.net/Mikaela/ssh-allowed_signers/allowed_signers
-ssh-verify-file () {
+ssh-verify-file() {
-    echo "$1 ${2:?Usage: ssh-verify-file <email> <file-to-verify>}" > /dev/null
+  echo "$1 ${2:?Usage: ssh-verify-file <email> <file-to-verify>}" > /dev/null
-    ssh-keygen -Y verify -f $sshAllowedSigners -I $1 -n file -s $2.sig < $2
+  ssh-keygen -Y verify -f $sshAllowedSigners -I $1 -n file -s $2.sig < $2
 }
 ```
 

blog/index.html

@@ -17,19 +17,16 @@ robots: noai
   <h2 id="in-english">In English</h2>
 
   {% for post in site.categories.english %}
-  <p>
+  <h3><a href="{{ post.url }}">{{ post.title }}</a></h3>
-    <em>{{ post.date | date: "%F" }}:</em>
+  <p>{{ post.date | date: "%F" }}: {{ post.excerpt | strip_html }}</p>
-    <strong><a href="{{ post.url }}">{{ post.title }}</a></strong>
+  {% endfor %}
-  </p>
-  {{ post.excerpt | markdownify }} {% endfor %}
 </div>
 <hr />
+<br />
 <div lang="fi">
   <h2 id="suomeksi">suomeksi</h2>
   {% for post in site.categories.finnish %}
-  <p>
+  <h3><a href="{{ post.url }}">{{ post.title }}</a></h3>
-    <em>{{ post.date | date: "%F" }}:</em>
+  <p>{{ post.date | date: "%F" }}: {{ post.excerpt | strip_html }}</p>
-    <strong><a href="{{ post.url }}">{{ post.title }}</a></strong>
+  {% endfor %}
-  </p>
-  {{ post.excerpt | markdownify }} {% endfor %}
 </div>

n/index.html

@@ -32,8 +32,9 @@ robots: noai
 <!-- If the page is on the sitemap, I want to publish it here -->
 {% assign notes = site.pages | where_exp: "page", "page.path contains 'n/'" %}
 {% for note in notes %} {% if note.sitemap == true %}
+<h2><a href="{{ note.url }}">{{note.title}}</a></h2>
 <p>
-  <a href="{{ note.url }}">{{ note.url | split: ".html" }} - {{note.title}}</a>
+  <span class="monospaced">{{ note.url | split: ".html" }}</span> - {{
+  note.excerpt | strip_html }}
 </p>
-<p>{{ note.excerpt | strip_html }}</p>
 {% endif %} {% endfor %}

package.json

@@ -1,6 +1,7 @@
 {
   "devDependencies": {
     "@prettier/plugin-xml": "3.4.1",
-    "prettier": "3.3.1"
+    "prettier": "3.3.1",
+    "prettier-plugin-sh": "0.14.0"
   }
 }

pnpm-lock.yaml

@@ -13,6 +13,9 @@ importers:
       prettier:
         specifier: 3.3.1
         version: 3.3.1
+      prettier-plugin-sh:
+        specifier: 0.14.0
+        version: 0.14.0(prettier@3.3.1)
 
 packages:
   "@prettier/plugin-xml@3.4.1":
@@ -35,6 +38,21 @@ packages:
         integrity: sha512-wy3mC1x4ye+O+QkEinVJkPf5u2vsrDIYW9G7ZuwFl6v/Yu0LwUuT2POsb+NUWApebyxfkQq6+yDfRExbnI5rcw==,
       }
 
+  mvdan-sh@0.10.1:
+    resolution:
+      {
+        integrity: sha512-kMbrH0EObaKmK3nVRKUIIya1dpASHIEusM13S4V1ViHFuxuNxCo+arxoa6j/dbV22YBGjl7UKJm9QQKJ2Crzhg==,
+      }
+
+  prettier-plugin-sh@0.14.0:
+    resolution:
+      {
+        integrity: sha512-hfXulj5+zEl/ulrO5kMuuTPKmXvOg0bnLHY1hKFNN/N+/903iZbNp8NyZBTsgI8dtkSgFfAEIQq0IQTyP1ZVFQ==,
+      }
+    engines: { node: ">=16.0.0" }
+    peerDependencies:
+      prettier: ^3.0.3
+
   prettier@3.3.1:
     resolution:
       {
@@ -49,6 +67,19 @@ packages:
         integrity: sha512-tlbJqcMHnPKI9zSrystikWKwHkBqu2a/Sgw01h3zFjvYrMxEDYHzzoMZnUrbIfpTFEsoRnnviOXNCzFiSc54Qw==,
       }
 
+  sh-syntax@0.4.2:
+    resolution:
+      {
+        integrity: sha512-/l2UZ5fhGZLVZa16XQM9/Vq/hezGGbdHeVEA01uWjOL1+7Ek/gt6FquW0iKKws4a9AYPYvlz6RyVvjh3JxOteg==,
+      }
+    engines: { node: ">=16.0.0" }
+
+  tslib@2.6.3:
+    resolution:
+      {
+        integrity: sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==,
+      }
+
 snapshots:
   "@prettier/plugin-xml@3.4.1(prettier@3.3.1)":
     dependencies:
@@ -63,6 +94,20 @@ snapshots:
     dependencies:
       regexp-to-ast: 0.5.0
 
+  mvdan-sh@0.10.1: {}
+
+  prettier-plugin-sh@0.14.0(prettier@3.3.1):
+    dependencies:
+      mvdan-sh: 0.10.1
+      prettier: 3.3.1
+      sh-syntax: 0.4.2
+
   prettier@3.3.1: {}
 
   regexp-to-ast@0.5.0: {}
+
+  sh-syntax@0.4.2:
+    dependencies:
+      tslib: 2.6.3
+
+  tslib@2.6.3: {}