flake.lock: Update

Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/4275a321beab5a71872fb7a5fe5da511bb2bec73' (2022-02-23) → 'github:NixOS/nixpkgs/47cd6702934434dd02bc53a67dbce3e5493e33a2' (2022-03-04) • Updated input 'nixpkgs-unstable': 'github:NixOS/nixpkgs/6f21ff94fc44af21973c6fdae6e03323382b7909' (2022-02-26) → 'github:NixOS/nixpkgs/a173e92ee458878651356b9bcfb1e2b5145f76af' (2022-03-05) • Updated input 'retiolum': 'github:krebs/retiolum/5e69ac7782c7d384a4b6cad4619dd83aa952426f' (2022-02-22) → 'github:krebs/retiolum/259d60325310b728f79c68dc1148f597e097d1b2' (2022-02-28) • Updated input 'stockholm': 'git+https://cgit.lassul.us/stockholm?ref=master&rev=a67ded588b45c09ca58a3b4007a8d32e42323613' (2022-02-26) → 'git+https://cgit.lassul.us/stockholm?ref=master&rev=87a44dd1573cbdc8f0fc3553b0896b470bcfa44d' (2022-03-03)
feat(urlwatch): lisalittmann.de
2026-03-20 20:01:08 +01:00 · 2022-03-06 00:39:35 +00:00 · 2022-03-05 13:46:09 +01:00 · 2022-03-05 13:46:09 +01:00 · 2022-03-05 13:46:09 +01:00 · 2022-03-05 13:46:09 +01:00
10 changed files with 242 additions and 30 deletions
--- a/configs/networkmanager.nix
+++ b/configs/networkmanager.nix
@@ -40,8 +40,14 @@ in
 {
  imports = [ <niveum/modules/networkmanager-declarative.nix> ];

+  programs.nm-applet.enable = true;
+
  networking.networkmanager = {
    enable = true;
+    packages = [
+      pkgs.networkmanager-openvpn
+      pkgs.networkmanager-fortisslvpn
+    ];
    wifi.macAddress = "random";
    ethernet.macAddress = "random";
    unmanaged = [ "docker*" ];
@@ -82,5 +88,10 @@ in

  users.users.me.extraGroups = [ "networkmanager" ];

-  environment.systemPackages = [ pkgs.speedtest-cli ];
+  environment.systemPackages = [
+    pkgs.speedtest-cli
+    pkgs.networkmanager-openvpn
+    pkgs.networkmanagerapplet
+    pkgs.networkmanager-fortisslvpn
+  ];
 }
--- a/flake.lock
+++ b/flake.lock
@@ -109,11 +109,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1644837400,
-        "narHash": "sha256-treFS89w/xKzeTjJSJdYp/Ceddv6oqq7bL9mZMQDPi0=",
+        "lastModified": 1646406548,
+        "narHash": "sha256-xp+3f76ycZXNf9pG65Ef9KfDl1fas2UQu/cBe/pLd+c=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "a03ae0e6d078cfdbb8404c3bff3622bd4e2f1c57",
+        "rev": "47cd6702934434dd02bc53a67dbce3e5493e33a2",
        "type": "github"
      },
      "original": {
@@ -125,11 +125,11 @@
    },
    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1644951967,
-        "narHash": "sha256-j+l8bt++dsYTJSGABuqeBEom5aNpD4n0BsOTdewFYuU=",
+        "lastModified": 1646523963,
+        "narHash": "sha256-ixFwYnaOycrzs0iN9RvyRMEGCkQ9Pj58x6V/qc2khy8=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "05e1f8a2c7797b0d9f9e07ab2aaeccecdcf9b7da",
+        "rev": "a173e92ee458878651356b9bcfb1e2b5145f76af",
        "type": "github"
      },
      "original": {
@@ -158,11 +158,11 @@
    "retiolum": {
      "flake": false,
      "locked": {
-        "lastModified": 1644849126,
-        "narHash": "sha256-iaRNvfQrUD+ZownDWWNdDwhVPgSsU5ojvVdswVq1IpY=",
+        "lastModified": 1646081604,
+        "narHash": "sha256-+o4I0UWPT2ZBr3oGF3vHGidfjbydkzyuFKWKDOzJo2U=",
        "owner": "krebs",
        "repo": "retiolum",
-        "rev": "6de359ef848dc1f38fb76731c35e712ee885fd88",
+        "rev": "259d60325310b728f79c68dc1148f597e097d1b2",
        "type": "github"
      },
      "original": {
@@ -210,11 +210,11 @@
    "stockholm": {
      "flake": false,
      "locked": {
-        "lastModified": 1644865613,
-        "narHash": "sha256-z7hPtMYxoQuWyLujUs5vbdZOGbjFosh+/IX3GpCDlkc=",
+        "lastModified": 1646301205,
+        "narHash": "sha256-m3eG8L0PI9Y2R2ZRF5NHfIzvRGkOL7aUIl7i+UCxUGc=",
        "ref": "master",
-        "rev": "e3785b22b2c6cb173a58fd066c4eda80a67fb872",
-        "revCount": 10404,
+        "rev": "87a44dd1573cbdc8f0fc3553b0896b470bcfa44d",
+        "revCount": 10431,
        "type": "git",
        "url": "https://cgit.lassul.us/stockholm"
      },
--- a/lib/radio-news.html
+++ b/lib/radio-news.html
@@ -0,0 +1,143 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <title>lassulus radio news</title>
+    <style>
+      body {
+        font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+      }
+
+      main {
+        max-width: 800px;
+        margin: 0 auto;
+        display: grid;
+        grid-template-columns: 2fr 1fr;
+        grid-gap: 2em;
+      }
+
+      #news-list ul {
+        list-style: none;
+        padding-left: 0;
+      }
+
+      #news-list li {
+        margin-bottom: 1em;
+      }
+
+      #news-list time {
+        display: block;
+        color: grey;
+      }
+
+      form label {
+        display: block;
+      }
+
+      form input,
+      form textarea {
+        width: 100%;
+        margin-bottom: 1em;
+      }
+
+      @media only screen and (max-width: 768px) {
+        main {
+          grid-template-columns: 1fr;
+        }
+      }
+    </style>
+    <script>
+      const newsEndpoint = "http://prism.r:7999";
+
+      function isoString(date) {
+        return date.toISOString().slice(0, -5) + "Z";
+      }
+
+      function setNextNews() {
+        document.getElementById("next-news").innerHTML = (
+          60 - new Date().getUTCMinutes()
+        ).toString();
+      }
+
+      setInterval(setNextNews, 6000);
+
+      function fetchNews() {
+        fetch(newsEndpoint).then((response) => {
+          response.json().then((news) => {
+            const newsList = document.getElementById("news-list");
+            newsList.innerHTML = "";
+            const ul = document.createElement("ul");
+            for (const newsItem of news) {
+              const start = new Date(newsItem.from);
+              const end = new Date(newsItem.to);
+
+              const li = document.createElement("li");
+
+              const startDate = document.createElement("time");
+              startDate.className = "start";
+              startDate.title = start.toString();
+              startDate.setAttribute("datetime", isoString(start));
+              startDate.appendChild(document.createTextNode(isoString(start)));
+
+              const endDate = document.createElement("time");
+              endDate.className = "end";
+              endDate.title = end.toString();
+              endDate.setAttribute("datetime", isoString(end));
+              endDate.appendChild(document.createTextNode(isoString(end)));
+
+              li.appendChild(document.createTextNode(newsItem.text));
+              li.appendChild(startDate);
+              li.appendChild(endDate);
+              ul.appendChild(li);
+            }
+            newsList.appendChild(ul);
+          });
+        });
+      }
+
+      function sendNews(event) {
+        event.preventDefault();
+        const formData = new FormData(event.target);
+
+        const request = new XMLHttpRequest();
+        request.open("POST", newsEndpoint, false); // synchronous
+        request.send(
+          JSON.stringify({
+            from: isoString(new Date(formData.get("from"))),
+            to: isoString(new Date(formData.get("to"))),
+            text: formData.get("text"),
+          })
+        );
+        location.reload();
+      }
+
+      window.onload = () => {
+        setNextNews();
+        fetchNews();
+      };
+    </script>
+  </head>
+  <body>
+    <main>
+      <section>
+        <h1>Submit news</h1>
+        <form onsubmit="sendNews(event)">
+          <label>Start date</label>
+          <input type="datetime-local" name="from" required />
+          <label>End date</label>
+          <input type="datetime-local" name="to" required />
+          <label>News text</label>
+          <textarea name="text" rows="10" required></textarea>
+          <input type="submit" />
+        </form>
+        Next news report should start in <span id="next-news"></span> minutes.
+      </section>
+      <aside>
+        <h1>Planned news</h1>
+        <div id="news-list">
+          <em>No news planned yet.</em>
+        </div>
+      </aside>
+    </main>
+  </body>
+</html>
--- a/lib/streams.nix
+++ b/lib/streams.nix
@@ -44,7 +44,7 @@ let
  caster-fm = subdomain: port: "http://${subdomain}.caster.fm:${toString port}/listen.mp3?authn0b0236758bd0e178156d0787327a055d";
 in [
  {
-    stream = "https://radio.lassul.us/radio.ogg";
+    stream = "http://lassul.us:8000/radio.ogg";
    station = "Radio lassulus";
    logo = "http://lassul.us/art/portraits/selbstportrait.jpg";
    desc = "Diminutive from lassus (“weary, faint, tired”). A programming human. Doing superior professional art.";
--- a/systems/makanek/configuration.nix
+++ b/systems/makanek/configuration.nix
@@ -10,11 +10,12 @@ in
    ./matterbridge.nix
    ./menstruation.nix
    ./moinbot.nix
-    ./horoscopy.nix
+    # ./horoscopy.nix
    ./monitoring
    ./moodle-dl-borsfaye.nix
    ./names.nix
    ./nextcloud.nix
+    ./radio-news.nix
    ./radio.nix
    ./retiolum-map.nix
    ./tarot.nix
--- a/systems/makanek/matterbridge.nix
+++ b/systems/makanek/matterbridge.nix
@@ -1,16 +1,5 @@
 { pkgs, lib, ... }:
 {
-  nixpkgs.overlays = [
-    (self: super: {
-      matterbridge = (import (super.fetchFromGitHub {
-        owner = "NixOS";
-        repo = "nixpkgs";
-        rev = "e45d91ee65db293a172ec506759d1248e40c35f5";
-        sha256 = "03cjs5xcx09lw0djyrx2kfakw7gkg4iqmy9w25azai62im39l30k";
-      }) {}).matterbridge;
-    })
-  ];
-
  services.matterbridge = {
    enable = true;
    configPath =
--- a/systems/makanek/radio-news.nix
+++ b/systems/makanek/radio-news.nix
@@ -0,0 +1,23 @@
+{ pkgs, lib, ... }:
+let
+  inherit (import <niveum/lib>) serveHtml;
+  remote = "https://cgit.lassul.us/stockholm";
+in
+{
+  services.nginx.virtualHosts."redaktion.r".locations."/".extraConfig = serveHtml <niveum/lib/radio-news.html> pkgs;
+
+  systemd.services.stockholm-history = {
+    startAt = "hourly";
+    script = ''
+      stockholm=$(mktemp -d)
+      trap clean EXIT
+      clean() {
+        rm -rf "$stockholm"
+      }
+      ${pkgs.git}/bin/git clone ${remote} "$stockholm"
+      ${pkgs.git}/bin/git --git-dir "$stockholm"/.git log --pretty='"%s" by %an, %ar' --since "$(${pkgs.coreutils}/bin/date -I -d "yesterday")" \
+        | ${pkgs.jq}/bin/jq -R '{text: ., from: now | todateiso8601, to: (now + (60 * 60)) | todateiso8601}' \
+        | ${pkgs.curl}/bin/curl -Ssfd @- http://prism.r:7999/
+    '';
+  };
+}
--- a/systems/makanek/urlwatch.nix
+++ b/systems/makanek/urlwatch.nix
@@ -45,6 +45,51 @@ let
      url = "http://www.zeno.org/Lesesaal/M/E-Books";
      filter = [ { element-by-class = "zenoCOMain"; } "html2text" "strip" ];
    }
+    {
+      name = "Arnshaugk Neuerscheinungen";
+      url = "http://www.arnshaugk.de/index.php";
+      filter = [ "html2text" "strip" ];
+    }
+    {
+      name = "Carolina Welslau";
+      url = "https://carolinawelslau.de/";
+      filter = [ { element-by-id = "main"; } "html2text" "strip" ];
+    }
+    {
+      name = "Lisa Littmann";
+      url = "https://lisalittmann.de/";
+      filter = [ { element-by-id = "main"; } "html2text" "strip" ];
+    }
+    {
+      name = "Lisa Littmann: Projects";
+      url = "https://lisalittmann.de/projects/";
+      filter = [ { element-by-id = "main"; } "html2text" "strip" ];
+    }
+    {
+      name = "Lisa Littmann: Archive";
+      url = "https://lisalittmann.de/archive/";
+      filter = [ { element-by-id = "main"; } "html2text" "strip" ];
+    }
+    {
+      name = "WarpGrid: Idiomarium";
+      url = "https://warpgrid.de/idiomarium/";
+      filter = [ { element-by-id = "site-content"; } "html2text" "strip" ];
+    }
+    {
+      name = "WarpGrid: Futurism";
+      url = "https://warpgrid.de/futurism/";
+      filter = [ { element-by-id = "site-content"; } "html2text" "strip" ];
+    }
+    {
+      name = "WarpGrid: Imagiary";
+      url = "https://warpgrid.de/imagiary/";
+      filter = [ { element-by-id = "site-content"; } "html2text" "strip" ];
+    }
+    {
+      name = "WarpGrid: Cook";
+      url = "https://warpgrid.de/alchemy/";
+      filter = [ { element-by-id = "site-content"; } "html2text" "strip" ];
+    }
    {
      name = "Indogermanische Forschungen";
      url = "https://www.degruyter.com/journal/key/INDO/html";
--- a/systems/makanek/weechat.nix
+++ b/systems/makanek/weechat.nix
@@ -52,7 +52,7 @@ in {
                address = "irc.hackint.org/6697";
                ipv6 = true;
                ssl = true;
-                autojoin = [ "#krebs" "#nixos" "#the_playlist" ];
+                autojoin = [ "#krebs" "#hsmr" "#nixos" "#the_playlist" "#flipdot-berlin" "#hackint" ];
                sasl_mechanism = "plain";
                sasl_username = nick;
                sasl_password = lib.strings.fileContents <system-secrets/irc/hackint>;
@@ -75,7 +75,7 @@ in {
                  "/msg nickserv identify ${lib.strings.fileContents <system-secrets/irc/oftc>}"
                  "/msg nickserv set cloak on"
                ];
-                autojoin = [ "#osm" "#osm-de" "#home-manager" ];
+                autojoin = [ "#home-manager" ];
              };
              retiolum = {
                autoconnect = true;
--- a/systems/zaatar/backup.nix
+++ b/systems/zaatar/backup.nix
@@ -17,7 +17,7 @@ in

  environment.systemPackages = [
    (pkgs.writers.writeDashBin "restic-niveum" ''
-      exec ${pkgs.util-linux}/bin/runuser -u restic -g restic ${pkgs.restic}/bin/restic -r ${toString dataDir} -p ${<secrets/restic/password>} "$@"
+      exec ${pkgs.util-linux}/bin/runuser -u restic -g restic -- ${pkgs.restic}/bin/restic -r ${toString dataDir} -p ${<secrets/restic/password>} "$@"
    '')
  ];
Author	SHA1	Message	Date
github-actions[bot]	13727abfd6	flake.lock: Update Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/4275a321beab5a71872fb7a5fe5da511bb2bec73' (2022-02-23) → 'github:NixOS/nixpkgs/47cd6702934434dd02bc53a67dbce3e5493e33a2' (2022-03-04) • Updated input 'nixpkgs-unstable': 'github:NixOS/nixpkgs/6f21ff94fc44af21973c6fdae6e03323382b7909' (2022-02-26) → 'github:NixOS/nixpkgs/a173e92ee458878651356b9bcfb1e2b5145f76af' (2022-03-05) • Updated input 'retiolum': 'github:krebs/retiolum/5e69ac7782c7d384a4b6cad4619dd83aa952426f' (2022-02-22) → 'github:krebs/retiolum/259d60325310b728f79c68dc1148f597e097d1b2' (2022-02-28) • Updated input 'stockholm': 'git+https://cgit.lassul.us/stockholm?ref=master&rev=a67ded588b45c09ca58a3b4007a8d32e42323613' (2022-02-26) → 'git+https://cgit.lassul.us/stockholm?ref=master&rev=87a44dd1573cbdc8f0fc3553b0896b470bcfa44d' (2022-03-03)	2022-03-06 00:39:35 +00:00
Kierán Meinhardt	a23f0c80a2	feat(urlwatch): lisalittmann.de	2022-03-05 13:46:09 +01:00
Kierán Meinhardt	b0b19c3989	feat(networkmanager): enable applet	2022-03-05 13:46:09 +01:00
Kierán Meinhardt	ef223a9717	feat(weechat): hackint works now	2022-03-05 13:46:09 +01:00
Kierán Meinhardt	ecfc2ca06c	fix(weechat): no sasl	2022-03-05 13:46:09 +01:00
Kierán Meinhardt	cd7e688a46	feat(weechat): #flipdot-berlin	2022-03-05 13:46:09 +01:00
github-actions[bot]	f7b9008ed0	flake.lock: Update Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/40ef692a55b188b1f5ae3967f3fc7808838c3f1d' (2022-02-20) → 'github:NixOS/nixpkgs/4275a321beab5a71872fb7a5fe5da511bb2bec73' (2022-02-23) • Updated input 'nixpkgs-unstable': 'github:NixOS/nixpkgs/856fbb7e322fd9c7e951d42a792957b84f0b0bb6' (2022-02-23) → 'github:NixOS/nixpkgs/6f21ff94fc44af21973c6fdae6e03323382b7909' (2022-02-26) • Updated input 'stockholm': 'git+https://cgit.lassul.us/stockholm?ref=master&rev=442319c8949c85b32071fc4e694938b480637770' (2022-02-19) → 'git+https://cgit.lassul.us/stockholm?ref=master&rev=a67ded588b45c09ca58a3b4007a8d32e42323613' (2022-02-26)	2022-02-27 00:40:13 +00:00
Kierán Meinhardt	81706489b5	feat: bye bye horoscopy	2022-02-25 07:08:50 +01:00
Kierán Meinhardt	817f57ad09	fix: dont pin matterbridge	2022-02-23 19:25:04 +01:00
Kierán Meinhardt	eafb1ce0c3	chore: update nixpkgs	2022-02-23 19:24:09 +01:00
Kierán Meinhardt	0c72a89760	feat(streams): use lassulus radio as described in irc topic	2022-02-22 21:52:41 +01:00
Kierán Meinhardt	a7db357e54	feat(radio-news): most recent commits show	2022-02-22 21:52:17 +01:00
Kierán Meinhardt	1ad6c63a2f	feat(makanek): redaktion.r	2022-02-22 20:41:55 +01:00
Kierán Meinhardt	502ab93585	fix(restic): runuser correctly	2022-02-21 20:09:35 +01:00
github-actions[bot]	fe6bda3cf2	flake.lock: Update Flake lock file updates: • Updated input 'flake-utils': 'github:numtide/flake-utils/74f7e4319258e287b0f9cb95426c9853b282730b' (2021-11-28) → 'github:numtide/flake-utils/846b2ae0fc4cc943637d3d1def4454213e203cba' (2022-01-20) • Updated input 'home-manager': 'github:nix-community/home-manager/697cc8c68ed6a606296efbbe9614c32537078756' (2021-12-18) → 'github:nix-community/home-manager/2860d7e3bb350f18f7477858f3513f9798896831' (2022-02-04) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/5d3420c1285073d5061a5d88a533b347d1222750' (2022-01-10) → 'github:NixOS/nixpkgs/d49a447c18eac3c1639b99550df08b43948b28e0' (2022-02-06) • Updated input 'nixpkgs-unstable': 'github:NixOS/nixpkgs/bd20b7f07fd337b2e85420edd642382a2cc0196d' (2022-01-11) → 'github:NixOS/nixpkgs/91e0ecf1f103170237df3628c2c46cfe75212867' (2022-02-06) • Updated input 'retiolum': 'github:krebs/retiolum/23e04565a0360d31605a6c6cdc1becb5b9f76f32' (2022-01-28) → 'github:krebs/retiolum/ccf6324d29277b8c033a2275850eb7b09227f403' (2022-02-02) • Updated input 'stockholm': 'git+https://cgit.lassul.us/stockholm?ref=master&rev=f67bd5783d6ed2be836c7714ea38cbb3f7ac7257' (2022-01-09) → 'git+https://cgit.lassul.us/stockholm?ref=master&rev=332d4f5e1719df2b27f835c4fd0718317867043c' (2022-02-03)	2022-02-20 07:03:04 +01:00
Kierán Meinhardt	c64e681ada	feat(weechat): update channels	2022-02-19 12:10:04 +01:00
Kierán Meinhardt	af813cc876	feat(urlwatch): more urls	2022-02-19 12:09:31 +01:00