Compare commits

..

No commits in common. "8a2a2d40679aefd618dbb77adb7eab2c8b0ac54c" and "5eca00305486669fc3f65e32aa5ad27e8e1cdfce" have entirely different histories.

16 changed files with 241 additions and 124 deletions

View File

@ -13,6 +13,3 @@ charset = utf-8
indent_style = space
# https://github.com/Mikaela/mikaela.github.io/issues/324
#indent_size = 2
[*.json]
indent_style = tab

7
.json Normal file
View File

@ -0,0 +1,7 @@
{
"why": "because it occurred to me and I can?",
"matrix": {
"MSC1769": "https://github.com/matrix-org/matrix-spec-proposals/pull/1769",
"MSC3189": "https://github.com/matrix-org/matrix-spec-proposals/pull/3189"
}
}

1
.npmrc
View File

@ -1 +0,0 @@
manage-package-manager-versions=true

View File

@ -15,7 +15,6 @@ ci:
# Consistency with other tools
default_language_version:
node: "lts"
# Remember .python-version !
python: "3.12"
ruby: ".ruby-version"
@ -34,8 +33,6 @@ repos:
- id: check-json
- id: check-merge-conflict
- id: check-shebang-scripts-are-executable
- id: check-toml
#- id: check-xml
- id: destroyed-symlinks
- id: detect-private-key
- id: fix-byte-order-marker
@ -43,7 +40,7 @@ repos:
- id: mixed-line-ending
args: [--fix=auto]
- id: pretty-format-json
args: [--autofix, --indent, "\t", --no-ensure-ascii]
args: [--autofix, --no-ensure-ascii]
- repo: https://github.com/pre-commit/sync-pre-commit-deps
rev: v0.0.1
@ -68,7 +65,7 @@ repos:
]
- repo: https://github.com/python-jsonschema/check-jsonschema
rev: 0.29.1
rev: 0.29.0
hooks:
- id: check-dependabot
- id: check-github-actions

6
Gemfile vendored
View File

@ -14,9 +14,3 @@ gem "jekyll-sitemap"
gem "jekyll-seo-tag"
# Required for `bundle exec jekyll serve`
gem "webrick"
# Required for https://www.npmjs.com/package/@prettier/plugin-ruby
gem "prettier_print"
gem "syntax_tree"
gem "syntax_tree-haml"
gem "syntax_tree-rbs"

57
Gemfile.lock generated
View File

@ -35,28 +35,24 @@ 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.3)
google-protobuf (4.27.2)
bigdecimal
rake (>= 13)
google-protobuf (4.27.3-aarch64-linux)
google-protobuf (4.27.2-aarch64-linux)
bigdecimal
rake (>= 13)
google-protobuf (4.27.3-arm64-darwin)
google-protobuf (4.27.2-arm64-darwin)
bigdecimal
rake (>= 13)
google-protobuf (4.27.3-x86-linux)
google-protobuf (4.27.2-x86-linux)
bigdecimal
rake (>= 13)
google-protobuf (4.27.3-x86_64-darwin)
google-protobuf (4.27.2-x86_64-darwin)
bigdecimal
rake (>= 13)
google-protobuf (4.27.3-x86_64-linux)
google-protobuf (4.27.2-x86_64-linux)
bigdecimal
rake (>= 13)
haml (6.3.0)
temple (>= 0.8.2)
thor
tilt
html-pipeline (2.14.3)
activesupport (>= 2)
nokogiri (>= 1.4)
@ -102,7 +98,6 @@ GEM
listen (3.9.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
logger (1.6.0)
mercenary (0.4.0)
mini_portile2 (2.8.7)
minima (2.5.1)
@ -111,33 +106,30 @@ GEM
jekyll-seo-tag (~> 2.1)
minitest (5.24.1)
mutex_m (0.2.0)
nokogiri (1.16.7)
nokogiri (1.16.6)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
nokogiri (1.16.7-aarch64-linux)
nokogiri (1.16.6-aarch64-linux)
racc (~> 1.4)
nokogiri (1.16.7-arm-linux)
nokogiri (1.16.6-arm-linux)
racc (~> 1.4)
nokogiri (1.16.7-arm64-darwin)
nokogiri (1.16.6-arm64-darwin)
racc (~> 1.4)
nokogiri (1.16.7-x86-linux)
nokogiri (1.16.6-x86-linux)
racc (~> 1.4)
nokogiri (1.16.7-x86_64-darwin)
nokogiri (1.16.6-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.16.7-x86_64-linux)
nokogiri (1.16.6-x86_64-linux)
racc (~> 1.4)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
prettier_print (1.2.1)
public_suffix (6.0.1)
racc (1.8.1)
public_suffix (6.0.0)
racc (1.8.0)
rake (13.2.1)
rb-fsevent (0.11.2)
rb-inotify (0.11.1)
ffi (~> 1.0)
rbs (3.5.2)
logger
rexml (3.3.4)
rexml (3.3.2)
strscan
rouge (4.3.0)
safe_yaml (1.0.5)
@ -187,21 +179,8 @@ GEM
sass-embedded (1.77.8-x86_64-linux-musl)
google-protobuf (~> 4.26)
strscan (3.1.0)
syntax_tree (6.2.0)
prettier_print (>= 1.2.0)
syntax_tree-haml (4.0.3)
haml (>= 5.2)
prettier_print (>= 1.2.1)
syntax_tree (>= 6.0.0)
syntax_tree-rbs (1.0.0)
prettier_print
rbs
syntax_tree (>= 2.0.1)
temple (0.10.3)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
thor (1.3.1)
tilt (2.4.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (2.5.0)
@ -241,10 +220,6 @@ DEPENDENCIES
jekyll-seo-tag
jekyll-sitemap
minima
prettier_print
syntax_tree
syntax_tree-haml
syntax_tree-rbs
webrick
RUBY VERSION

View File

@ -4,14 +4,15 @@
@charset "utf-8";
// Font specifications. I keep changing my mind on what are the most pleasant
// fonts to my eyes, so I won't bother commenting them here.'
$serif-font-family: ui-serif, "Roboto Serif", "Noto Serif", Tinos, serif,
"Noto Emoji", "Noto Color Emoji", emoji;
$sans-serif-font-family: ui-sans-serif, "Roboto Flex", Roboto, "Noto Sans",
Arimo, sans-serif, "Noto Emoji", "Noto Color Emoji", emoji;
$monospace-font-family: ui-monospace, "Roboto Mono", "Noto Mono", Cousine,
monospace, "Noto Emoji", "Noto Color Emoji", emoji;
// Our font definitions. I know system-ui is generally sans-serif, but I
// consider that lesser evil than not letting the client OS choose its
// preferred font.
$serif-font-family: ui-serif, system-ui, serif, "Noto Emoji", "Noto Color Emoji",
emoji;
$sans-serif-font-family: ui-sans-serif, system-ui, sans-serif, "Noto Emoji",
"Noto Color Emoji", emoji;
$monospace-font-family: ui-monospace, monospace, "Noto Emoji",
"Noto Color Emoji", emoji;
// Must be in the end under threat of undefined variable error.
$base-font-family: $sans-serif-font-family;

View File

@ -47,11 +47,7 @@ robots: noai
1. Font and more
- Change font: yes
- Font name: Depends on the circumstances. Are you worried about I and l and
whatever else looking the same? Serif. Legibility especially with reading
difficulties? Sans-Serif. While system-ui generally maps to Sans Serif, I just
get annoyed by other fonts.
- `ui-serif, system-ui`
- `ui-sans-serif, system-ui`
- Font name: `ui-serif, system-ui`, or whatever fits the situation. I just get
annoyed by other options.
In _Settings_ there is additionally _Detect dark theme_ option.

View File

@ -23,8 +23,7 @@ _{{ page.excerpt }}_
- [Usability](#usability)
- [Offtopic system configuration](#offtopic-system-configuration)
- [Debian-based](#debian-based)
- [Terminus on Fedora](#terminus-on-fedora)
- [Terminus on Arch Linux](#terminus-on-arch-linux)
- [Terminus everywhere outside of Debian](#terminus-everywhere-outside-of-debian)
- [SSD](#ssd)
- [BTRFS](#btrfs)
@ -38,15 +37,10 @@ _{{ page.excerpt }}_
- `microcode` - propietary, but otherwise CPU holes are going to be gaping open.
Refer to `tail -n +1 /sys/devices/system/cpu/vulnerabilities/*`
- Debian calls this as `amd64-microcode` or `intel-microcode`
- Arch knows them as `amd-ucode` or `intel-ucode` and won't load it for you,
you will have to `initrd /intel-ucode.img` yourself instantly after `linux`
and before `initrd /initramfs-linux-lts.img`...
- `ufw` for Deb-based or `firewalld` on Fedora (and Kali and Arch Linux, if you
so choose in the last)
- `ufw` for Deb-based or `firewalld` on Fedora
- `sshguard` for mitigating shared systems where others refuse to use keys
- `needrestart` for knowing when updates actually require services to be
restarted or a kernel upgrade happens and requires reboot
- Arch users may prefer `checkservices` from `archlinux-contrib`
- `molly-guard` so you won't accidentally `reboot` or `poweroff` production
rather than local machine.
- `apt-listchanges` changelogs are worth knowing when updating.
@ -68,9 +62,9 @@ _{{ page.excerpt }}_
## Usability
- `nvim git tmux zsh` - good luck without these
- <del>if cryptographic operations are taking ages, consider something like
- if cryptographic operations are taking ages, consider something like
`haveged`. It's controversial, so if there are no issues, don't install a
random number generator.</del>
random number generator.
- userspace oom killer, may avoid frozen systems, much more pleasant than
actually having to deal with a frozen system.
- `earlyoom`
@ -101,7 +95,7 @@ issue):
- `sudo dpkg-reconfigure keyboard-configuration`
- compose key
#### Terminus on Fedora
#### Terminus everywhere outside of Debian
After installing the package, adjust `/etc/vconsole.conf` e.g.:
@ -112,10 +106,6 @@ FONT="ter-v16v"
Maybe `sudo updatedb` and `locate ter-v16v` at first though?
#### Terminus on Arch Linux
See Fedora, but change the `FONT` to `"ter-132b"` instead.
### SSD
- `sudo systemctl enable --now fstrim.timer`
@ -128,7 +118,7 @@ See Fedora, but change the `FONT` to `"ter-132b"` instead.
### BTRFS
- The above applies, `/etc/fstab` **_must have_** `noatime`.
- The above applies, `/etc/fstab` must have `noatime`.
- `compress=zstd:0` may be helpful. It enables zstd compression, which is an
integrated feature of BTRFS, with the default compression level (3 at the time
of writing). The BTRFS devs are most likely wiser than me and can provide a

View File

@ -1,28 +1,135 @@
---
layout: mini
permalink: /n/helen.html
title: Helenin hintatiedot
excerpt:
Lunttilappu sähkönhintatietosovelluksille paljonko maksan Helenille, sillä
kaipaan näitä tietoja säännöllisen epäsäännöllisesti jostakin Helenin
valikoita helpommasta paikasta.
sitemap: true
robots: noai
sitemap: false
month: 02 of 2023
monthly: "31.58 c/kWh"
basicdistribution: "5.51 €/month"
distributionmargin: "4.07 c/kWh"
basicstock: "3,93 €/month"
stockmargin: "0,38 c/kWh"
omahelenhighprice: "20 c/kWh"
omahelenlowprice: "5 c/kWh"
hattiwatthighprice: "30 c/kWh"
hattiwattlowprice: "10 c/kWh"
lang: fi
locale: fi-FI
date: 2024-07-31
---
## Helen pörssisähköhinnasto {{ page.date }}
Tuntihinta @
[Apple App Store](https://apps.apple.com/app/tuntihinta/id824684537)
[Google Play](https://play.google.com/store/apps/details?id=fi.fingrid.tuntihinta)
_{{ page.excerpt }}_
<!-- editorconfig-checker-disable -->
<!-- prettier-ignore-start -->
- Perusmaksu: `4.90 €/kk`
- Marginaali: `0.48 snt/kk`
- Siirron perusmaksu: `5.51€/kk`
- Siirtomaksu: `4.07 snt/kWh`
- Sähkövero: `2.79 c/kWh
<!-- START doctoc generated TOC please keep comment here to allow auto update -->
<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
<em lang="fi">Automaattinen sisällysluettelo</em> / <em lang="en">Automatically generated Table of Contents</em>
Hintatiedot sisältävät ALVn jos tulkitsen sopimusta oikein!
- [Helen hintalaskelmia Tuntihinta-sovellukselle](#helen-hintalaskelmia-tuntihinta-sovellukselle)
- [Yhtälöt Tuntihinnalle](#yht%C3%A4l%C3%B6t-tuntihinnalle)
- [Lähteet](#l%C3%A4hteet)
- [Helen price calculations for Tuntihinta](#helen-price-calculations-for-tuntihinta)
- [Equations for Tuntihinta](#equations-for-tuntihinta)
- [Sources](#sources)
- [web.oma.helen.fi/personal/contracts](https://web.oma.helen.fi/personal/contracts)
<!-- END doctoc generated TOC please keep comment here to allow auto update -->
<!-- prettier-ignore-end -->
<!-- editorconfig-checker-enable -->
# Helen hintalaskelmia Tuntihinta-sovellukselle
Helen markkinahintasähkö kuukaudelle {{ page.month }} on {{ page.monthly }}.
- Helen sähköverkot Oy:n siirron perusmaksu: {{ page.basicdistribution }},
siirron marginaali {{ page.distributionmargin }}.
- Helenin pörssisähkön kuukausihinta: {{ page.basicstock }}, marginaali
{{ page.stockmargin }}.
## Yhtälöt Tuntihinnalle
_Jekyll ei salli matematiikkaa suoraan tietoturvasyistä._
- Kallis: <strong>{{ page.monthly }} + {{ page.distributionmargin }}</strong>
(Helenin markkinasähköhinta + siirtohinta kWh)
- Halpa: <strong>({{ page.monthly }} + {{ page.distributionmargin }}) /
2</strong> (Helenin markkinasähköhinta + siirtohinta kWh / 2),
**_pyöristettynä alaspäin_**
- Marginaali: <strong>{{ page.distributionmargin }} +
{{ page.stockmargin }}</strong> (Helen Sähköverkot Oy siirtohinta kWh +
pörssisähkön marginaali).
- OmaHelen kohtelee alle {{ page.omahelenlowprice }} halpana ja yli
{{ page.omahelenhighprice }} kalliina, joten vaihtoehtoiset kaavat ovat:
- Kallis: <strong>{{ page.omahelenhighprice }} +
{{ page.distributionmargin }} + {{ page.stockmargin }}</strong> (OmaHelenin
korkea hinta + Marginaali)
- Halpa: <strong>{{ page.omahelenlowprice }} + {{ page.distributionmargin }} +
{{ page.stockmargin }}</strong> (OmaHelenin matala hinta + Marginaali)
- [HattiWatt](https://hattiwatt.com/) vuorostaan sanoo korkean olevan yli
{{ page.hattiwatthighprice }} ja halvan olevan alle
{{ page.hattiwattlowprice }}. Se tosin näyttää hinnan myös liikennevaloin.
- Halpa: <strong>{{ page.hattiwattlowprice }} +
{{ page.distributionmargin }} + {{ page.stockmargin }}</strong> (HattiWattin
matala hinta + Marginaali)
- Kallis: <strong>{{ page.hattiwatthighprice }} +
{{ page.distributionmargin }} + {{ page.stockmargin }}</strong> (HattiWattin
korkea hinta + Marginaali)
## Lähteet
- [Helen.fi: Markkinasähkö; ja sähkön markkinahinta](https://www.helen.fi/sahko/sahkosopimus/markkinahinta)
määrittää kalliin hinnan.
- Helen veloittaa sitä markkinasähköasiakkailtaan koko kuukauden ja pyrkii
sillä kattamaan omat kulunsa ja varmistamaan, ettei myy sähköä liian
edullisesti.
- Siirtohinta näkyy _Oma Helen_-sovelluksessa ja muutokset ilmoitetaan Helenin
asiakaslehdessä.
<div lang="en">
# Helen price calculations for Tuntihinta
Helen's monthly market price for month {{ page.month }} is {{ page.monthly }}.
- Distribution price: {{ page.basicdistribution }} and
{{ page.distributionmargin }}.
- Stock price: {{ page.basicstock }} and {{ page.stockmargin }}.
## Equations for Tuntihinta
_Jekyll doesn't allow maths directly for infosec reasons._
- Expensive: <strong>{{ page.monthly }} + {{ page.distributionmargin }}</strong>
(Helen's Market Price Electricity + distribution margin)
- Cheap: <strong>({{ page.monthly }} + {{ page.distributionmargin }}) /
2</strong> (Helen's Market Price Electricity + distribution margin / 2),
**_round down_**
- Margin: <strong>{{ page.distributionmargin }} +
{{ page.stockmargin }}</strong> (Distribution fee + stock margin)
- OmaHelen app treats {{ page.omahelenlowprice }} as cheap and over
{{ page.omahelenhighprice }} as expensive, so alternative equations are:
- Expensive: <strong>{{ page.omahelenhighprice }} +
{{ page.distributionmargin }} + {{ page.stockmargin }}</strong> (OmaHelen's
high price + Margin)
- Cheap: <strong>{{ page.omahelenlowprice }} + {{ page.distributionmargin }} +
{{ page.stockmargin }}</strong> (OmaHelen's low price + Margin)
- [HattiWatt](https://hattiwatt.com/) again treats over
{{ page.hattiwatthighprice }} as high price with low price being
{{ page.hattiwattlowprice }}. It however shows price in traffic lights.
- Cheap: <strong>{{ page.hattiwattlowprice }} +
{{ page.distributionmargin }} + {{ page.stockmargin }}</strong> (HattiWatt's
low price + Margin))
- Expensive: <strong>{{ page.hattiwatthighprice }} +
{{ page.distributionmargin }} + {{ page.stockmargin }}</strong> (HattiWatt's
high price + Margin)
## Sources
- Definition of monthly plan price:
[Helen: Market Price Electricity](https://www.helen.fi/en/electricity/electricity-products-and-prices/marketpriceelectricity)
- They use it all month following stock market price and trying to get their
own citation.
- Distribution is in _Oma Helen_ and changes are announced in their newspaper.
</div>

60
n/ksoy.md Normal file
View File

@ -0,0 +1,60 @@
---
layout: mini
permalink: /n/ksoy.html
sitemap: false
month: "11/2022"
monthly: "29.99 c/kWh"
basicdistribution: "EI TIEDOSSA €/kk"
distributionmargin: "EI TIEDOSSA c/kWh"
basicstock: "2.99 €/kuukausi"
stockmargin: "0.23 c/kWh"
lang: fi
---
Tuntihinta @
[Apple App Store](https://apps.apple.com/app/tuntihinta/id824684537)
[Google Play](https://play.google.com/store/apps/details?id=fi.fingrid.tuntihinta)
<!-- editorconfig-checker-disable -->
<!-- prettier-ignore-start -->
<!-- START doctoc generated TOC please keep comment here to allow auto update -->
<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
<em lang="fi">Automaattinen sisällysluettelo</em> / <em lang="en">Automatically generated Table of Contents</em>
- [KSOY hintalaskelmia Tuntihinta-sovellukselle](#ksoy-hintalaskelmia-tuntihinta-sovellukselle)
- [Yhtälöt Tuntihinnalle](#yht%C3%A4l%C3%B6t-tuntihinnalle)
- [Lähteet](#l%C3%A4hteet)
<!-- END doctoc generated TOC please keep comment here to allow auto update -->
<!-- prettier-ignore-end -->
<!-- editorconfig-checker-enable -->
# KSOY hintalaskelmia Tuntihinta-sovellukselle
_Siirtohinnasto ei tiedossa, joten se ei ole mukana yhtälöissä._
KSOYn Jatkuvan sähkösopimuksen hinta kuukaudelle {{ page.month }} on
{{ page.monthly }}.
- KSOY Pörssisähkön hinta: {{ page.basicstock }}, marginaali
{{ page.stockmargin }}.
## Yhtälöt Tuntihinnalle
_Jekyll ei salli matematiikkaa suoraan tietoturvasyistä._
- Kallis: <strong>{{ page.monthly }}</strong> (KSOY jatkuvan sähkösopimuksen
hinta)
- Halpa: <strong>{{ page.monthly }} / 2</strong> (KSOY jatkuvan sähkösopimuksen
hinta / 2), **_pyöristettynä alaspäin_**
- Marginaali: <strong>{{ page.stockmargin }}</strong> (pörssisähkön marginaali).
## Lähteet
- [KSOY jatkuva sähkösopimus](https://www.ksoy.fi/sahkon-myynti/sahkoa-kotiin/ksoy-jatkuva/)
määrittää kalliin hinnan.
- KSOY veloittaa sitä jatkuvilta sähköasiakkailtaan koko kuukauden ja pyrkii
sillä kattamaan omat kulunsa ja varmistamaan, ettei myy sähköä liian
edullisesti.

3
package.json vendored
View File

@ -2,6 +2,5 @@
"devDependencies": {
"@aminda/global-prettier-config": "2024.28.4"
},
"packageManager": "pnpm@9.7.0+sha512.dc09430156b427f5ecfc79888899e1c39d2d690f004be70e05230b72cb173d96839587545d09429b55ac3c429c801b4dc3c0e002f653830a420fa2dd4e3cf9cf",
"prettier": "@aminda/global-prettier-config"
"packageManager": "pnpm@9.6.0+sha512.38dc6fba8dba35b39340b9700112c2fe1e12f10b17134715a4aa98ccf7bb035e76fd981cf0bb384dfa98f8d6af5481c2bef2f4266a24bfa20c34eb7147ce0b5e"
}

View File

@ -46,4 +46,4 @@ _Note that this section is manually updated and might be missing some links._
- ZNC
- [ZNC 1.6.0 & SSL certificate verification]({% post_url blog/2015-02-24-znc160-ssl %})
- [Installing ZNC on Ubuntu using PPA]({% post_url blog/2015-05-10-znc-ubuntu %})
- [A couple of words on protocols (on the Discuss page)](/discuss.html#a-couple-of-words-on-protocols)
- [A couple of words on protocols (on the Discuss page)](/discuss.html/#a-couple-of-words-on-protocols)

View File

@ -1,5 +0,0 @@
---
redirect_to: https://hdtvopas.fi/fi/ohjeet-kuluttajille
permalink: /r/hdtv.html
sitemap: false
---