From 4c94f3db361b9d7cd2fa4ae49a534910da178c32 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 5 Sep 2021 19:51:31 +0200
Subject: shack: move repos to github

---
 krebs/2configs/shack/light.shack.nix     | 6 ++++--
 krebs/2configs/shack/muell_mail.nix      | 5 +++--
 krebs/2configs/shack/muellshack.nix      | 5 +++--
 krebs/2configs/shack/node-light.nix      | 5 +++--
 krebs/2configs/shack/powerraw.nix        | 5 +++--
 krebs/2configs/shack/s3-power.nix        | 5 +++--
 krebs/2configs/shack/shackDNS.nix        | 7 ++++---
 krebs/2configs/shack/worlddomination.nix | 5 +++--
 8 files changed, 26 insertions(+), 17 deletions(-)

(limited to 'krebs/2configs')

diff --git a/krebs/2configs/shack/light.shack.nix b/krebs/2configs/shack/light.shack.nix
index 8e01cb1bf..715339a69 100644
--- a/krebs/2configs/shack/light.shack.nix
+++ b/krebs/2configs/shack/light.shack.nix
@@ -1,7 +1,9 @@
 { config, pkgs, ... }:
 let
-  light-shack-src = pkgs.fetchgit {
-      url = "https://git.shackspace.de/rz/standby.shack";
+  light-shack-src = 
+    pkgs.fetchFromGitHub {
+      owner = "shackspace";
+      repo = "standby.shack";
       rev = "e1b90a0a";
       sha256 = "07fmz63arc5rxa0a3778srwz0jflp4ad6xnwkkc56hwybby0bclh";
     };
diff --git a/krebs/2configs/shack/muell_mail.nix b/krebs/2configs/shack/muell_mail.nix
index 951450200..9308c7b13 100644
--- a/krebs/2configs/shack/muell_mail.nix
+++ b/krebs/2configs/shack/muell_mail.nix
@@ -2,8 +2,9 @@
 
 let
   pkg = pkgs.callPackage (
-    pkgs.fetchgit {
-      url = "https://git.shackspace.de/rz/muell_mail";
+    pkgs.fetchFromGitHub {
+      owner = "shackspace";
+      repo = "muell_mail";
       rev = "c3e43687879f95e01a82ef176fa15678543b2eb8";
       sha256 = "0hgchwam5ma96s2v6mx2jfkh833psadmisjbm3k3153rlxp46frx";
     }) { mkYarnPackage = pkgs.yarn2nix-moretea.mkYarnPackage; };
diff --git a/krebs/2configs/shack/muellshack.nix b/krebs/2configs/shack/muellshack.nix
index b032b4299..cabe72b40 100644
--- a/krebs/2configs/shack/muellshack.nix
+++ b/krebs/2configs/shack/muellshack.nix
@@ -2,8 +2,9 @@
 
 let
   pkg = pkgs.callPackage (
-    pkgs.fetchgit {
-      url = "https://git.shackspace.de/rz/muellshack";
+    pkgs.fetchFromGitHub {
+      owner = "shackspace";
+      repo = "muellshack";
       rev = "dc80cf1edaa3d86ec2bebae8596ad1d4c4e3650a";
       sha256 = "1yipr66zhrg5m20pf3rzvgvvl78an6ddkq6zc45rxb2r0i7ipkyh";
 
diff --git a/krebs/2configs/shack/node-light.nix b/krebs/2configs/shack/node-light.nix
index 2e69d5aaa..7a648d4ee 100644
--- a/krebs/2configs/shack/node-light.nix
+++ b/krebs/2configs/shack/node-light.nix
@@ -2,8 +2,9 @@
 
 let
   pkg = pkgs.callPackage (
-    pkgs.fetchgit {
-      url = "https://git.shackspace.de/rz/node-light.git";
+    pkgs.fetchFromGitHub {
+      owner = "shackspace";
+      repo = "node-light";
       rev = "90a9347b73af3a9960bd992e6293b357226ef6a0";
       sha256 = "1av9w3w8aknlra25jw6gqxzbb01i9kdlfziy29lwz7mnryjayvwk";
     }) { };
diff --git a/krebs/2configs/shack/powerraw.nix b/krebs/2configs/shack/powerraw.nix
index 43c743587..ace74cbc3 100644
--- a/krebs/2configs/shack/powerraw.nix
+++ b/krebs/2configs/shack/powerraw.nix
@@ -6,8 +6,9 @@
 let
   influx-url = "http://influx.shack:8086";
   pkg = pkgs.python3.pkgs.callPackage (
-    pkgs.fetchgit {
-      url = "https://git.shackspace.de/rz/powermeter.git";
+    pkgs.fetchFromGitHub {
+      owner = "shackspace";
+      repo = "powermeter";
       rev = "438b08f";
       sha256 = "0c5czmrwlw985b7ia6077mfrvbf2fq51iajb481pgqbywgxqis5m";
     }) {};
diff --git a/krebs/2configs/shack/s3-power.nix b/krebs/2configs/shack/s3-power.nix
index 0ce8a8786..bed98d860 100644
--- a/krebs/2configs/shack/s3-power.nix
+++ b/krebs/2configs/shack/s3-power.nix
@@ -2,8 +2,9 @@
 
 let
   pkg = pkgs.callPackage (
-    pkgs.fetchgit {
-      url = "https://git.shackspace.de/rz/s3-power";
+    pkgs.fetchFromGitHub {
+      owner = "shackspace";
+      repo = "s3-power";
       rev = "0687ab64";
       sha256 = "1m8h4bwykv24bbgr5v51mam4wsbp5424xcrawhs4izv563jjf130";
     }) { mkYarnPackage = pkgs.yarn2nix-moretea.mkYarnPackage; };
diff --git a/krebs/2configs/shack/shackDNS.nix b/krebs/2configs/shack/shackDNS.nix
index c9cdfd24b..00f79abc4 100644
--- a/krebs/2configs/shack/shackDNS.nix
+++ b/krebs/2configs/shack/shackDNS.nix
@@ -1,9 +1,10 @@
 { config, lib, pkgs, ... }:
 
 let
-  pkg = 
-    pkgs.fetchgit {
-      url = "https://git.shackspace.de/rz/shackdns";
+  pkg =
+    pkgs.fetchFromGitHub {
+      owner = "shackspace";
+      repo = "shackdns";
       rev = "e55cc906c734b398683f9607b93f1ad6435d8575";
       sha256 = "1hkwhf3hqb4fz06b1ckh7sl0zcyi4da5fgdlksian8lxyd19n8sq";
 	  };
diff --git a/krebs/2configs/shack/worlddomination.nix b/krebs/2configs/shack/worlddomination.nix
index 4bdb095f1..e339d3174 100644
--- a/krebs/2configs/shack/worlddomination.nix
+++ b/krebs/2configs/shack/worlddomination.nix
@@ -4,8 +4,9 @@ with import <stockholm/lib>;
 let
   pkg = pkgs.stdenv.mkDerivation {
     name = "worlddomination-2020-12-01";
-    src = pkgs.fetchgit {
-      url = "https://git.shackspace.de/rz/worlddomination.git";
+    src = pkgs.fetchFromGitHub {
+      owner = "shackspace";
+      repo = "worlddomination";
       rev = "c7aedcde7cd1fcb870b5356a6125e1a384b0776c";
       sha256 = "0y6haz5apwa33lz64l7b2x78wrrckbw39j4wzyd1hfk46478xi2y";
     };
-- 
cgit v1.3.1


From 87c758f629ce70addf40f0509b8a7856fe0f0da4 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 5 Sep 2021 21:27:30 +0200
Subject: puyak: add shackie reaktor irc bot

---
 krebs/1systems/puyak/config.nix  |  3 +++
 krebs/2configs/shack/reaktor.nix | 19 +++++++++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 krebs/2configs/shack/reaktor.nix

(limited to 'krebs/2configs')

diff --git a/krebs/1systems/puyak/config.nix b/krebs/1systems/puyak/config.nix
index 2f122f6ff..1dcf20308 100644
--- a/krebs/1systems/puyak/config.nix
+++ b/krebs/1systems/puyak/config.nix
@@ -115,6 +115,9 @@
     ## Collect local statistics via collectd and send to collectd
     <stockholm/krebs/2configs/stats/shack-client.nix>
     <stockholm/krebs/2configs/stats/shack-debugging.nix>
+
+    ## shackie irc bot
+    <stockholm/krebs/2configs/shack/reaktor.nix>
   ];
 
   krebs.build.host = config.krebs.hosts.puyak;
diff --git a/krebs/2configs/shack/reaktor.nix b/krebs/2configs/shack/reaktor.nix
new file mode 100644
index 000000000..40c121299
--- /dev/null
+++ b/krebs/2configs/shack/reaktor.nix
@@ -0,0 +1,19 @@
+{ config, lib, pkgs, ... }:
+{
+  krebs.reaktor2.shackie = {
+    hostname = "irc.libera.chat";
+    port = "6697";
+    nick = "shackie";
+    API.listen = "inet://127.0.0.1:7777";
+    plugins = [
+      {
+        plugin = "register";
+        config = {
+          channels = [
+            "#shackspace"
+          ];
+        };
+      }
+    ];
+  };
+}
-- 
cgit v1.3.1


From e0c5b3f187310cae8f5ad0abb2e92d5aa79e94db Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 5 Sep 2021 21:52:47 +0200
Subject: puyak.r: announce doorstatus

---
 krebs/2configs/shack/doorstatus.sh | 74 ++++++++++++++++++++++++++++++++++++++
 krebs/2configs/shack/reaktor.nix   | 11 ++++++
 2 files changed, 85 insertions(+)
 create mode 100755 krebs/2configs/shack/doorstatus.sh

(limited to 'krebs/2configs')

diff --git a/krebs/2configs/shack/doorstatus.sh b/krebs/2configs/shack/doorstatus.sh
new file mode 100755
index 000000000..11e710cfd
--- /dev/null
+++ b/krebs/2configs/shack/doorstatus.sh
@@ -0,0 +1,74 @@
+#!/bin/sh
+# needs in path:
+#   curl jq
+# creates and manages $PWD/state
+set -euf
+
+send_reaktor(){
+  # usage: send_reaktor "text"
+  echo "send_reaktor: $1"
+  curl -fsS http://localhost:7777 \
+      -H content-type:application/json \
+      -d "$(jq -n \
+        --arg text "$1" '{
+          command:"PRIVMSG",
+          params:["#shackspace",$text]
+        }'
+      )"
+}
+
+open=$(shuf -n1 <<EOF
+happy hacking, shack ist offen
+Heureka, der shack ist offen
+Die Türe ist offen, der shack will bespielt werden
+Frohlocket, der shack ist offen
+shack is love, shack is life, shack is offen
+Bin da, wer noch? shack hat geöffnet!
+shack hat geöffnet: Arbeiten Sie sicher, arbeiten Sie klug!
+Bin ich schon drin? Ich bin schon drin.. das war ja einfach. Also im shack.
+Uuuuund es setzt sich in Bewegung, wir öffnen den shack, los, los! Ja da guckt ihr, jetzt gehts looos!
+EOF
+)
+
+close=$(shuf -n1 <<EOF
+Hacking vorbei, shack ist zu!
+Tja, shack ist zu
+Shackie-closie
+Der Sandmann kommt, alle shackies sind zu haus und die Tür ist zu
+shack hat Stromsparmodus aktiviert
+Tür ist zu, shackspace ist jetzt koronakonform
+Oh nein, eine Tür, sie ist verschlossen! Also, die vom shack
+Ihr kennt das ja: Abschalten. Der shack ist zu.
+EOF
+)
+error=$(shuf -n1 <<EOF
+Hase, api ist kaputt! Bitte reparieren
+API liefert kein sinnvolles Ergebnis, keine Ahnung ob shack offen oder zu ist
+shack api defekt :(
+Hubel Hubel, jemand könnte mal die shack api reparieren
+API sagt derp
+Siehste das? API? Da soll ich jetzt nen Request drauf machen? Jetzt werd ich aber langsam n bisschen wild hier langsam!
+Der API ist ein bisschen ein Otto geworden, ischwör der will mich flaxen
+ich möchte den geschäftsführer sprechen, das API geht nicht mehr!
+Herr makefu an Kasse 3 bitte, Kasse 3 bitte Herr makefu. Der API Computer ist mal wieder ausgefallen
+EOF
+)
+
+state=$(curl https://api.shackspace.de/v1/space | jq  .doorState.open)
+prevstate=$(cat state ||:)
+
+if test "$state" == "$(cat state)";then
+  #echo "current and last state is the same ($state), doing nothing"
+  :
+else
+  echo "API state and last state differ ( '$state' != '$prevstate')"
+  if test "$state" == "true";then
+    send_reaktor "$open"
+  elif test "$state" == "false";then
+    send_reaktor "$close"
+  else
+    send_reaktor "$error"
+  fi
+  echo "updating state"
+  printf "%s" "$state" > state
+fi
diff --git a/krebs/2configs/shack/reaktor.nix b/krebs/2configs/shack/reaktor.nix
index 40c121299..a31c7a687 100644
--- a/krebs/2configs/shack/reaktor.nix
+++ b/krebs/2configs/shack/reaktor.nix
@@ -16,4 +16,15 @@
       }
     ];
   };
+  systemd.services.announce_doorstatus = {
+    startAt = "*:0/1";
+    path = with pkgs; [ curl jq ];
+    script = builtins.readFile ./doorstatus.sh;
+    serviceConfig = {
+      DynamicUser = true;
+      StateDirectory = "doorstatus";
+      WorkingDirectory = "/var/lib/doorstatus";
+      PrivateTmp = true;
+    };
+  };
 }
-- 
cgit v1.3.1


From 9202b9b33eaf60500f33c68a15d6d7ac3c9f7343 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 5 Sep 2021 22:18:33 +0200
Subject: puyak.r glados: fix tts

---
 krebs/2configs/shack/glados/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'krebs/2configs')

diff --git a/krebs/2configs/shack/glados/default.nix b/krebs/2configs/shack/glados/default.nix
index 53d6e6f4a..51c2ad94f 100644
--- a/krebs/2configs/shack/glados/default.nix
+++ b/krebs/2configs/shack/glados/default.nix
@@ -112,7 +112,8 @@ in {
         }
         { platform = "mpd";
           name = "kiosk";
-          host = "lounge.kiosk.shack";
+          #host = "lounge.kiosk.shack";
+          host = "kiosk.shack";
         }
       ];
 
@@ -123,7 +124,7 @@ in {
       http = {
         base_url = "http://hass.shack";
         use_x_forwarded_for = true;
-        trusted_proxies = "127.0.0.1";
+        trusted_proxies = [ "127.0.0.1" "::1" ];
       };
       #conversation = {};
 
@@ -139,6 +140,7 @@ in {
           language = "de";
           cache = true;
           time_memory = 57600;
+          base_url = "http://hass.shack";
         }
       ];
       device_tracker = [];
-- 
cgit v1.3.1


From 96de4530c3744867933d6e957697ce0a12859f78 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 9 Sep 2021 20:40:13 +0200
Subject: shack/powerraw: also open tcp port 11111

---
 krebs/2configs/shack/powerraw.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'krebs/2configs')

diff --git a/krebs/2configs/shack/powerraw.nix b/krebs/2configs/shack/powerraw.nix
index ace74cbc3..64e1911cf 100644
--- a/krebs/2configs/shack/powerraw.nix
+++ b/krebs/2configs/shack/powerraw.nix
@@ -15,6 +15,7 @@ let
 in {
   # receive response from light.shack / standby.shack
   networking.firewall.allowedUDPPorts = [ 11111 ];
+  networking.firewall.allowedTCPPorts = [ 11111 ];
   users.users.powermeter = {
     extraGroups = [ "dialout" ];
     isSystemUser = true;
-- 
cgit v1.3.1


From e7d5d990837981496fd8883c85391132200a5319 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Tue, 14 Sep 2021 19:10:16 +0200
Subject: rip Reaktor

---
 krebs/1systems/test-all-krebs-modules/config.nix   |   1 -
 krebs/2configs/reaktor2.nix                        |   6 +-
 krebs/2configs/repo-sync.nix                       |   1 -
 krebs/3modules/Reaktor.nix                         | 155 ------------------
 krebs/3modules/default.nix                         |   1 -
 krebs/5pkgs/default.nix                            |   2 -
 krebs/5pkgs/simple/Reaktor/default.nix             |  24 ---
 krebs/5pkgs/simple/Reaktor/plugins.nix             | 182 ---------------------
 krebs/5pkgs/simple/Reaktor/scripts/tell-on_join.sh |  25 +++
 .../simple/Reaktor/scripts/tell-on_privmsg.sh      |  18 ++
 krebs/5pkgs/simple/reaktor2-plugins.nix            |   4 -
 11 files changed, 46 insertions(+), 373 deletions(-)
 delete mode 100644 krebs/3modules/Reaktor.nix
 delete mode 100644 krebs/5pkgs/simple/Reaktor/default.nix
 delete mode 100644 krebs/5pkgs/simple/Reaktor/plugins.nix
 create mode 100755 krebs/5pkgs/simple/Reaktor/scripts/tell-on_join.sh
 create mode 100755 krebs/5pkgs/simple/Reaktor/scripts/tell-on_privmsg.sh

(limited to 'krebs/2configs')

diff --git a/krebs/1systems/test-all-krebs-modules/config.nix b/krebs/1systems/test-all-krebs-modules/config.nix
index 2e1b5c1ad..8495a3ded 100644
--- a/krebs/1systems/test-all-krebs-modules/config.nix
+++ b/krebs/1systems/test-all-krebs-modules/config.nix
@@ -10,7 +10,6 @@ in {
     enable = true;
     build.user = config.krebs.users.krebs;
     build.host = config.krebs.hosts.test-all-krebs-modules;
-    Reaktor.test = {};
     apt-cacher-ng.enable = true;
     backup.enable = true;
     bepasty.enable = true;
diff --git a/krebs/2configs/reaktor2.nix b/krebs/2configs/reaktor2.nix
index 4a33c33ec..79822668b 100644
--- a/krebs/2configs/reaktor2.nix
+++ b/krebs/2configs/reaktor2.nix
@@ -47,7 +47,7 @@ let
           activate = "always";
           command = {
             filename =
-              "${pkgs.Reaktor.src}/reaktor/commands/tell-on_join";
+              <stockholm/krebs/5pkgs/simple/Reaktor/scripts/tell-on_join.sh>;
             env = {
               PATH = makeBinPath [
                 pkgs.coreutils # XXX env, touch
@@ -95,10 +95,10 @@ let
         }
         hooks.sed
         (generators.command_hook {
-          inherit (commands) hello random-emoji nixos-version;
+          inherit (commands) random-emoji nixos-version;
           tell = {
             filename =
-              "${pkgs.Reaktor.src}/reaktor/commands/tell-on_privmsg";
+              <stockholm/krebs/5pkgs/simple/Reaktor/scripts/tell-on_privmsg.sh>;
             env = {
               PATH = makeBinPath [
                 pkgs.coreutils # XXX date, env
diff --git a/krebs/2configs/repo-sync.nix b/krebs/2configs/repo-sync.nix
index 392e6bed3..e2be477fd 100644
--- a/krebs/2configs/repo-sync.nix
+++ b/krebs/2configs/repo-sync.nix
@@ -183,7 +183,6 @@ in {
     (sync-remote { name = "skytraq-datalogger"; url = "https://github.com/makefu/skytraq-datalogger"; })
     (sync-remote { name = "realwallpaper"; url = "https://github.com/lassulus/realwallpaper"; })
     (sync-remote { name = "painload"; url = "https://github.com/krebs/painload"; })
-    (sync-remote { name = "Reaktor"; url = "https://github.com/krebs/Reaktor"; })
     (sync-remote { name = "nixos-wiki"; url = "https://github.com/Mic92/nixos-wiki.wiki.git"; })
   ];
 }
diff --git a/krebs/3modules/Reaktor.nix b/krebs/3modules/Reaktor.nix
deleted file mode 100644
index 2a035d7be..000000000
--- a/krebs/3modules/Reaktor.nix
+++ /dev/null
@@ -1,155 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with import <stockholm/lib>;
-let
-
-  cfg = config.krebs.Reaktor;
-  homedir = "/var/lib/Reaktor";
-
-  out = {
-    options.krebs.Reaktor = api;
-    config = mkIf (cfg != {}) imp;
-  };
-
-  api = mkOption {
-    default = {};
-    type = with types; attrsOf (submodule ({ options = {
-
-      nickname = mkOption {
-        default = config.krebs.build.host.name + "|r";
-        type = types.str;
-        description = ''
-          The nick name of the irc bot.
-          Defaults to {hostname}|r
-        '';
-      };
-
-      overrideConfig = mkOption {
-        default = null;
-        type = types.nullOr types.str;
-        description = ''
-          configuration to be used instead of default ones.
-          Reaktor default cfg can be retrieved via `reaktor get-config`
-        '';
-      };
-
-      plugins = mkOption {
-        default = [pkgs.ReaktorPlugins.nixos-version];
-      };
-
-      workdir = mkOption {
-        default = "/var/lib/Reaktor";
-        type = types.path;
-        description = ''
-          path to be used as workdir (home dir is still /var/lib/Reaktor)
-        '';
-      };
-
-      extraConfig = mkOption {
-        default = "";
-        type = types.str;
-        description = ''
-          configuration appended to the default or overridden configuration
-        '';
-      };
-
-      extraEnviron = mkOption {
-        default = {};
-        type = types.attrsOf types.str;
-        description = ''
-          Environment to be provided to the service, can be:
-            REAKTOR_HOST
-            REAKTOR_PORT
-            REAKTOR_STATEDIR
-
-            debug and nickname can be set separately via the Reaktor api
-        '';
-      };
-
-      channels = mkOption {
-        default = [ "#krebs" ];
-        type = types.listOf types.str;
-        description = ''
-          Channels the Reaktor should connect to at startup.
-        '';
-      };
-
-      debug = mkOption {
-        default = false;
-        description = ''
-          Reaktor debug output
-        '';
-      };
-    };}));
-  };
-
-  imp = {
-    # TODO get user per configured bot
-    # TODO get home from api
-    # for reaktor get-config
-    users.extraUsers = singleton rec {
-      name = "Reaktor";
-      uid = genid name;
-      description = "Reaktor user";
-      home = homedir;
-      createHome = true;
-    };
-
-    #users.extraGroups = singleton {
-    #  name = "Reaktor";
-    #  gid = config.ids.gids.Reaktor;
-    #};
-
-    systemd.services = mapAttrs' (name: botcfg:
-      let
-        ReaktorConfig = pkgs.writeText "config.py" ''
-          ${if (isString botcfg.overrideConfig ) then ''
-          # Overriden Config
-          ${botcfg.overrideConfig}
-          '' else ""}
-          ## Extra Config
-          ${concatStringsSep "\n" (map (plug: plug.config) botcfg.plugins)}
-          ${botcfg.extraConfig}
-        '';
-      in nameValuePair "Reaktor-${name}" {
-        path = with pkgs; [
-          git # for nag
-          jq # for tell
-          python # for caps
-          utillinux # flock for tell
-        ];
-        description = "Reaktor IRC Bot";
-        after = [ "network.target" ];
-        wantedBy = [ "multi-user.target" ];
-        environment = {
-          GIT_SSL_CAINFO = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
-          PYTHONPATH = "${pkgs.Reaktor}/lib/python3.6/site-packages";
-          REAKTOR_NICKNAME = botcfg.nickname;
-          REAKTOR_DEBUG = (if botcfg.debug  then "True" else "False");
-          REAKTOR_CHANNELS = lib.concatStringsSep "," botcfg.channels;
-          state_dir = botcfg.workdir;
-
-        } // botcfg.extraEnviron;
-        serviceConfig= {
-          ExecStartPre = pkgs.writeScript "Reaktor-init" ''
-            #! /bin/sh
-            ${if (isString botcfg.overrideConfig) then
-              ''cp ${ReaktorConfig} /tmp/reaktor-${name}-config.py''
-            else
-              ''(${pkgs.Reaktor}/bin/reaktor get-config;cat "${ReaktorConfig}" ) > /tmp/reaktor-${name}-config.py''
-            }
-            mkdir -p ${botcfg.workdir}
-          '';
-          ExecStart = "${pkgs.Reaktor}/bin/reaktor run /tmp/reaktor-${name}-config.py";
-          PrivateTmp = "true";
-          User = "Reaktor";
-          Restart = "always";
-          RestartSec= "30" ;
-        };
-      }
-    ) cfg;
-
-  };
-
-in
-out
diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix
index 30ca82b97..149995a23 100644
--- a/krebs/3modules/default.nix
+++ b/krebs/3modules/default.nix
@@ -43,7 +43,6 @@ let
       ./permown.nix
       ./per-user.nix
       ./power-action.nix
-      ./Reaktor.nix
       ./reaktor2.nix
       ./realwallpaper.nix
       ./retiolum-bootstrap.nix
diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix
index d18c3e4c8..c077bf4d7 100644
--- a/krebs/5pkgs/default.nix
+++ b/krebs/5pkgs/default.nix
@@ -15,6 +15,4 @@ foldl' mergeAttrs {}
 {
   brockman = self.haskellPackages.brockman;
   reaktor2 = self.haskellPackages.reaktor2;
-
-  ReaktorPlugins = self.callPackage ./simple/Reaktor/plugins.nix {};
 }
diff --git a/krebs/5pkgs/simple/Reaktor/default.nix b/krebs/5pkgs/simple/Reaktor/default.nix
deleted file mode 100644
index 1cc498a68..000000000
--- a/krebs/5pkgs/simple/Reaktor/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ lib, pkgs, python3Packages, fetchFromGitHub, ... }:
-
-python3Packages.buildPythonPackage rec {
-  name = "Reaktor-${version}";
-  version = "0.7.1";
-
-  doCheck = false;
-
-  propagatedBuildInputs = with pkgs;[
-    python3Packages.docopt
-    python3Packages.requests
-  ];
-  src = fetchFromGitHub {
-    owner = "krebs";
-    repo = "Reaktor";
-    rev = "v${version}";
-    sha256 = "0cv5a4x73ls6sk8qj2qi6gqn31rv8kvdg13dsf3jv92xdfx6brjn";
-  };
-  meta = {
-    homepage = http://krebsco.de/;
-    description = "An IRC bot based on asynchat";
-    license = lib.licenses.wtfpl;
-  };
-}
diff --git a/krebs/5pkgs/simple/Reaktor/plugins.nix b/krebs/5pkgs/simple/Reaktor/plugins.nix
deleted file mode 100644
index 1b19a1178..000000000
--- a/krebs/5pkgs/simple/Reaktor/plugins.nix
+++ /dev/null
@@ -1,182 +0,0 @@
-{ stdenv, lib, pkgs, makeWrapper }:
-
-rec {
-  # Begin API
-  buildBaseReaktorPlugin = { name
-                        , config # python extra configuration for plugin
-                        , phases ? []
-                        , ... } @ attrs:
-    stdenv.mkDerivation (attrs // {
-      name = "Reaktor-plugin-" + name;
-      isReaktorPlugin = true;
-    });
-
-  buildSimpleReaktorPlugin = name: { script
-                        , path ? []
-                        , env ? {}
-                        , append_rule ? false # append the rule instead of insert
-                        , pattern ? ""
-                        , ... } @ attrs:
-    let
-      path_env = { "PATH" = lib.makeSearchPath "bin" (path ++ [ pkgs.coreutils ]); };
-      src_dir = pkgs.substituteAll ( {
-        inherit name;
-        dir = "bin";
-        isExecutable = true;
-        src = script;
-      });
-      src_file = "${src_dir}/bin/${name}";
-      config = ''
-        public_commands.${if append_rule then "append(" else "insert(0," }{
-          'capname' : "${name}",
-          'pattern' : ${if pattern == "" then
-                          ''indirect_pattern.format("${name}")'' else
-                          ''"${pattern}"'' },
-          'argv'    : ["${src_file}"],
-          'env'     : ${builtins.toJSON (path_env // env)} })
-      '';
-      config_file = pkgs.writeText "plugin.py" config;
-    in buildBaseReaktorPlugin (attrs // rec {
-      inherit name config;
-
-      phases = [ "installPhase" ];
-      buildInputs = [ makeWrapper ];
-      installPhase = ''
-        mkdir -p $out/bin $out/etc/Reaktor
-        ln -s ${src_file} $out/bin
-        wrapProgram $out/bin/${name} \
-          --prefix PATH : ${path_env.PATH}
-        ln -s ${config_file} $out/etc/Reaktor/plugin.py
-      '';
-
-    });
-  # End API
-
-  # Begin Plugins
-  random-emoji = buildSimpleReaktorPlugin "emoji" {
-    path = with pkgs; [ gnused gnugrep xmlstarlet curl ];
-    script = ./scripts/random-emoji.sh;
-  };
-
-  sed-plugin = buildSimpleReaktorPlugin "sed-plugin" {
-    path = [ pkgs.gnused pkgs.python3 ];
-    # only support s///gi the plugin needs to see every msg
-    # TODO: this will eat up the last regex, fix Reaktor to support fallthru
-    append_rule = true;
-    pattern = "^(?P<args>.*)$$";
-    script = ./scripts/sed-plugin.py;
-  };
-
-  shack-correct = buildSimpleReaktorPlugin "shack-correct" {
-    path = [ pkgs.gnused ];
-    pattern = "^(?P<args>.*Shack.*)$$";
-    script = ./scripts/shack-correct.sh;
-  };
-
-  nixos-version = buildSimpleReaktorPlugin "nixos-version" {
-    script = pkgs.writeDash "nixos-version" ''
-      . /etc/os-release
-      echo "$PRETTY_NAME"
-      '';
-  };
-  stockholm-issue = buildSimpleReaktorPlugin "stockholm-issue" {
-    script = ./scripts/random-issue.sh;
-    path = with pkgs; [ git gnused haskellPackages.lentil ];
-    env = { "origin" = "http://cgit.gum/stockholm"; };
-  };
-
-  titlebot =
-  let
-    pypkgs = pkgs.python3Packages;
-    titlebot_cmds =  pypkgs.buildPythonPackage {
-      name = "titlebot_cmds";
-      propagatedBuildInputs =  with pypkgs; [ setuptools ];
-      src = pkgs.fetchurl {
-        url = "https://github.com/makefu/reaktor-titlebot/archive/2.1.0.tar.gz";
-        sha256 = "0wvf09wmk8b52f9j65qrw81nwrhs9pfhijwrlkzp5l7l2q8cjkp6";
-        };
-      };
-  in buildBaseReaktorPlugin rec {
-    name = "titlebot";
-    phases = [ "installPhase" ];
-    installPhase = ''
-      mkdir -p $out
-      ln -s ${titlebot_cmds}/* $out
-    '';
-    config = ''
-      def titlebot_cmd(cmd):
-        from os import environ
-        return {  'capname': None,
-                  'env': { 'TITLEDB':
-                    environ['state_dir']+'/suggestions.json' },
-                  'pattern': '^\\.' + cmd + '\\s*(?:\\s+(?P<args>.*))?$$',
-                  'argv': [ '${titlebot_cmds}/bin/' + cmd ] }
-      for i in ['up','help','list','top','new']:
-        public_commands.insert(0,titlebot_cmd(i))
-      commands.insert(0,titlebot_cmd('clear'))
-    '';
-  };
-
-  url-title = (buildSimpleReaktorPlugin "url-title" {
-    pattern = "^.*(?P<args>http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+).*$$";
-    path = with pkgs; [ curl perl ];
-    script = pkgs.writePython3 "url-title" { deps = with pkgs.python3Packages; [ beautifulsoup4 lxml ]; } ''
-      import cgi
-      import sys
-      import urllib.request
-      from bs4 import BeautifulSoup
-
-      try:
-          req = urllib.request.Request(sys.argv[1])
-          req.add_header('user-agent', 'Reaktor-url-title')
-          resp = urllib.request.urlopen(req)
-          if resp.headers['content-type'].find('text/html') >= 0:
-              soup = BeautifulSoup(resp.read(16000), "lxml")
-              title = soup.find('title').string
-
-              if len(title.split('\n')) > 5:
-                  title = '\n'.join(title.split('\n')[:5])
-
-              print(title[:450])
-          else:
-              cd_header = resp.headers['content-disposition']
-              print(cgi.parse_header(cd_header)[1]['filename'])
-      except:  # noqa: E722
-          pass
-    '';
-  });
-
-  task = name: let
-    rcFile = builtins.toFile "taskrc" ''
-      confirmation=no
-    '';
-  in {
-    add = buildSimpleReaktorPlugin "${name}-task-add" {
-      pattern = "^${name}-add: (?P<args>.*)$$";
-      script = pkgs.writeDash "${name}-add" ''
-        TASKDATA=$HOME/${name} ${pkgs.taskwarrior}/bin/task rc:${rcFile} add "$*"
-      '';
-    };
-
-    list = buildSimpleReaktorPlugin "task-list" {
-      pattern = "^${name}-list";
-      script = pkgs.writeDash "task-list" ''
-        TASKDATA=$HOME/${name} ${pkgs.taskwarrior}/bin/task rc:${rcFile} export | ${pkgs.jq}/bin/jq -r '.[] | select(.id != 0) | "\(.id) \(.description)"'
-      '';
-    };
-
-    delete = buildSimpleReaktorPlugin "task-delete" {
-      pattern = "^${name}-delete: (?P<args>.*)$$";
-      script = pkgs.writeDash "task-delete" ''
-        TASKDATA=$HOME/${name} ${pkgs.taskwarrior}/bin/task rc:${rcFile} delete "$*"
-      '';
-    };
-
-    done = buildSimpleReaktorPlugin "task-done" {
-      pattern = "^${name}-done: (?P<args>.*)$$";
-      script = pkgs.writeDash "task-done" ''
-        TASKDATA=$HOME/${name} ${pkgs.taskwarrior}/bin/task rc:${rcFile} done "$*"
-      '';
-    };
-  };
-}
diff --git a/krebs/5pkgs/simple/Reaktor/scripts/tell-on_join.sh b/krebs/5pkgs/simple/Reaktor/scripts/tell-on_join.sh
new file mode 100755
index 000000000..c21dc8776
--- /dev/null
+++ b/krebs/5pkgs/simple/Reaktor/scripts/tell-on_join.sh
@@ -0,0 +1,25 @@
+#! /bin/sh
+set -euf
+
+# require flock from util-linux (pkgs.utillinux)
+if test "${FLOCK-}" != "$state_file"; then
+  exec env FLOCK="$state_file" flock "$state_file" "$0" "$@"
+fi
+
+# TODO tell now, if already joined
+jq -r <"$state_file" \
+    --arg to "$_from" \
+    --arg msgtarget "$_msgtarget" \
+    '
+      select(.to == $to and .msgtarget == $msgtarget) |
+      "\(.to): \(.text) \u00032-- \(.from)\u00032 \(.date)"
+    '
+
+jq -c <"$state_file" >"$state_file.tmp" \
+    --arg to "$_from" \
+    --arg msgtarget "$_msgtarget" \
+    '
+      select((.to == $to and .msgtarget == $msgtarget) | not)
+    '
+
+mv "$state_file.tmp" "$state_file"
diff --git a/krebs/5pkgs/simple/Reaktor/scripts/tell-on_privmsg.sh b/krebs/5pkgs/simple/Reaktor/scripts/tell-on_privmsg.sh
new file mode 100755
index 000000000..fc05bdefb
--- /dev/null
+++ b/krebs/5pkgs/simple/Reaktor/scripts/tell-on_privmsg.sh
@@ -0,0 +1,18 @@
+#! /bin/sh
+set -euf
+
+# require flock from util-linux
+if test "${FLOCK-}" != "$state_file"; then
+  exec env FLOCK="$state_file" flock "$state_file" "$0" "$@"
+fi
+
+# TODO tell now, if already joined
+jq -cn \
+    --arg from "$_from" \
+    --arg to "${1%% *}" \
+    --arg text "${1#* }" \
+    --arg msgtarget "$_msgtarget" \
+    '{ $from, $to, $text, $msgtarget, date: (now | todate) }' \
+  >> "$state_file"
+
+echo 'Consider it noted.' # that's what lambdabot says...
diff --git a/krebs/5pkgs/simple/reaktor2-plugins.nix b/krebs/5pkgs/simple/reaktor2-plugins.nix
index 48464c0b6..4cd9e7d89 100644
--- a/krebs/5pkgs/simple/reaktor2-plugins.nix
+++ b/krebs/5pkgs/simple/reaktor2-plugins.nix
@@ -14,10 +14,6 @@ rec {
 
   commands = {
 
-    hello = {
-      filename = "${pkgs.Reaktor.src}/reaktor/commands/hello";
-    };
-
     random-emoji = {
       filename = <stockholm/krebs/5pkgs/simple/Reaktor/scripts/random-emoji.sh>;
       env = {
-- 
cgit v1.3.1


From e151cfd3298120ec541987d4beb155e18335a0d8 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Tue, 28 Sep 2021 22:41:33 +0200
Subject: reaktor2: add link to wiki.r for each agenda item

---
 krebs/2configs/reaktor2.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'krebs/2configs')

diff --git a/krebs/2configs/reaktor2.nix b/krebs/2configs/reaktor2.nix
index 79822668b..cbf3e7889 100644
--- a/krebs/2configs/reaktor2.nix
+++ b/krebs/2configs/reaktor2.nix
@@ -223,9 +223,13 @@ in {
               spanDate.title = new Date(entryDate).toString();
               spanDate.appendChild(document.createTextNode(entryDate));
 
+              const link = document.createElement("a");
+              link.href = "http://wiki.r/agenda/" + encodeURIComponent(agendaItem.description.replaceAll("/", "\u29F8"));
+              link.appendChild(document.createTextNode(agendaItem.description));
+
               const dd = document.createElement("dd");
               dd.className = "description";
-              dd.appendChild(document.createTextNode(agendaItem.description));
+              dd.appendChild(link);
               dd.appendChild(document.createTextNode(" "));
               dd.appendChild(spanDate);
 
-- 
cgit v1.3.1