From 34930b3db2d4386e4826ae782f0c24044e45b9c5 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Tue, 31 Aug 2021 20:26:53 +0200
Subject: htgen-cyberlocker: remove crud, exit after success POST

---
 krebs/5pkgs/simple/htgen-cyberlocker/src/htgen-cyberlocker | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/simple/htgen-cyberlocker/src/htgen-cyberlocker b/krebs/5pkgs/simple/htgen-cyberlocker/src/htgen-cyberlocker
index 6c3ed6552..ab9c4e8e3 100644
--- a/krebs/5pkgs/simple/htgen-cyberlocker/src/htgen-cyberlocker
+++ b/krebs/5pkgs/simple/htgen-cyberlocker/src/htgen-cyberlocker
@@ -57,10 +57,7 @@ case "$Method $path" in
 
     mkdir -v -p $STATEDIR/items >&2
     cp -v $content $item >&2
-
-    scheme=${req_x_forwarded_proto-http}
-    link=$scheme://$req_host/$path
-
+    exit
   ;;
   'GET /'*)
     item=$STATEDIR/items/$(echo "$path" | jq -rR @uri)
-- 
cgit v1.3.1


From e8dc3141ae6a7f109c6ce9e5852dd1a62c60d543 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Tue, 31 Aug 2021 22:44:27 +0200
Subject: cyberlocker-tools: normalize url

---
 krebs/5pkgs/simple/cyberlocker-tools/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/simple/cyberlocker-tools/default.nix b/krebs/5pkgs/simple/cyberlocker-tools/default.nix
index d43be1d69..6e6563fb1 100644
--- a/krebs/5pkgs/simple/cyberlocker-tools/default.nix
+++ b/krebs/5pkgs/simple/cyberlocker-tools/default.nix
@@ -5,15 +5,19 @@ pkgs.symlinkJoin {
     (pkgs.writers.writeDashBin "cput" ''
       set -efu
       path=''${1:-$(hostname)}
+      path=$(echo "/$path" | sed -E 's:/+:/:')
+      url=http://c.r$path
 
-      ${pkgs.curl}/bin/curl -fSs --data-binary @- "http://c.r/$path"
-      echo "http://c.r/$path"
+      ${pkgs.curl}/bin/curl -fSs --data-binary @- "$url"
+      echo "$url"
     '')
     (pkgs.writers.writeDashBin "cdel" ''
       set -efu
       path=$1
+      path=$(echo "/$path" | sed -E 's:/+:/:')
+      url=http://c.r$path
 
-      ${pkgs.curl}/bin/curl -f -X DELETE "http://c.r/$path"
+      ${pkgs.curl}/bin/curl -f -X DELETE "$url"
     '')
   ];
 }
-- 
cgit v1.3.1


From e3e859c14eb34bc045544ff64c3340b9f4dbe1f0 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 5 Sep 2021 18:38:13 +0200
Subject: brockman: 3.4.5 -> 4.0.1

---
 krebs/5pkgs/haskell/brockman/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/haskell/brockman/default.nix b/krebs/5pkgs/haskell/brockman/default.nix
index ef9f36217..d3dbcd89c 100644
--- a/krebs/5pkgs/haskell/brockman/default.nix
+++ b/krebs/5pkgs/haskell/brockman/default.nix
@@ -7,12 +7,12 @@
 }:
 mkDerivation rec {
   pname = "brockman";
-  version = "3.4.5";
+  version = "4.0.1";
   src = fetchFromGitHub {
     owner = "kmein";
     repo = "brockman";
     rev = version;
-    sha256 = "1q56ibgijcz6fgd60h0d1f2020l4n2i2nh98yaq95zhzwg0qsciy";
+    sha256 = "0hppgban8hfyhn4c8qgm8j7ml6jaa35pjgrv3k3q27ln71wnr8rz";
   };
   isLibrary = false;
   isExecutable = true;
-- 
cgit v1.3.1


From b471ff4191011b000f60dd2c6dafc6e5ed9458c2 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 5 Sep 2021 22:51:37 +0200
Subject: irc-announce: add tls flag

---
 krebs/3modules/announce-activation.nix      |  5 +++++
 krebs/3modules/hidden-ssh.nix               | 20 ++++++++++++++++----
 krebs/5pkgs/simple/git-hooks/default.nix    |  3 +++
 krebs/5pkgs/simple/irc-announce/default.nix |  9 +++++++--
 4 files changed, 31 insertions(+), 6 deletions(-)

(limited to 'krebs/5pkgs')

diff --git a/krebs/3modules/announce-activation.nix b/krebs/3modules/announce-activation.nix
index 76eb4b136..a40ae8cef 100644
--- a/krebs/3modules/announce-activation.nix
+++ b/krebs/3modules/announce-activation.nix
@@ -9,6 +9,7 @@ with import <stockholm/lib>;
         ${shell.escape (toString cfg.irc.port)} \
         ${shell.escape cfg.irc.nick} \
         ${shell.escape cfg.irc.channel} \
+        ${escapeShellArg cfg.irc.tls} \
         "$message"
   '';
   default-get-message = pkgs.writeDash "announce-activation-get-message" ''
@@ -50,6 +51,10 @@ in {
         default = "irc.r";
         type = types.hostname;
       };
+      tls = mkOption {
+        default = false;
+        type = types.bool;
+      };
     };
   };
   config = mkIf cfg.enable {
diff --git a/krebs/3modules/hidden-ssh.nix b/krebs/3modules/hidden-ssh.nix
index 4436a6167..acbe717d9 100644
--- a/krebs/3modules/hidden-ssh.nix
+++ b/krebs/3modules/hidden-ssh.nix
@@ -19,6 +19,14 @@ let
       type = types.str;
       default = "irc.hackint.org";
     };
+    port = mkOption {
+      type = types.int;
+      default = 6697;
+    };
+    tls = mkOption {
+      type = types.bool;
+      default = true;
+    };
     message = mkOption {
       type = types.str;
       default = "SSH Hidden Service at ";
@@ -53,10 +61,14 @@ let
             echo "still waiting for ${hiddenServiceDir}/hostname"
             sleep 1
           done
-          ${pkgs.untilport}/bin/untilport ${cfg.server} 6667 && \
-            ${pkgs.irc-announce}/bin/irc-announce \
-            ${cfg.server} 6667 ${config.krebs.build.host.name}-ssh \
-            \${cfg.channel} \
+          ${pkgs.untilport}/bin/untilport ${escapeShellArg cfg.server} ${toString cfg.port}
+
+          ${pkgs.irc-announce}/bin/irc-announce \
+            ${escapeShellArg cfg.server} \
+            ${toString cfg.port} \
+            "${config.krebs.build.host.name}-ssh" \
+            ${escapeShellArg cfg.channel} \
+            ${escapeShellArg cfg.tls} \
             "${cfg.message}$(cat ${hiddenServiceDir}/hostname)"
         '';
         PrivateTmp = "true";
diff --git a/krebs/5pkgs/simple/git-hooks/default.nix b/krebs/5pkgs/simple/git-hooks/default.nix
index 0a2c84410..012c4ccf8 100644
--- a/krebs/5pkgs/simple/git-hooks/default.nix
+++ b/krebs/5pkgs/simple/git-hooks/default.nix
@@ -12,6 +12,7 @@ with import <stockholm/lib>;
   , port ? 6667
   , refs ? []
   , server
+  , tls ? false
   , verbose ? false
   }: /* sh */ ''
     #! /bin/sh
@@ -39,6 +40,7 @@ with import <stockholm/lib>;
     nick=${escapeShellArg nick}
     channel=${escapeShellArg channel}
     server=${escapeShellArg server}
+    tls=${escapeShellArg tls}
     port=${toString port}
 
     host=$nick
@@ -114,6 +116,7 @@ with import <stockholm/lib>;
         "$port" \
         "$nick" \
         "$channel" \
+        "tls" \
         "$message"
     fi
   '';
diff --git a/krebs/5pkgs/simple/irc-announce/default.nix b/krebs/5pkgs/simple/irc-announce/default.nix
index 52cf12862..5797b3667 100644
--- a/krebs/5pkgs/simple/irc-announce/default.nix
+++ b/krebs/5pkgs/simple/irc-announce/default.nix
@@ -17,7 +17,8 @@ pkgs.writeDashBin "irc-announce" ''
   IRC_PORT=$2
   IRC_NICK=$3_$$
   IRC_CHANNEL=$4
-  message=$5
+  IRC_TLS=$5
+  message=$6
 
   export IRC_CHANNEL # for privmsg_cat
 
@@ -34,6 +35,8 @@ pkgs.writeDashBin "irc-announce" ''
   # privmsg_cat transforms stdin to a privmsg
   privmsg_cat() { awk '{ print "PRIVMSG "ENVIRON["IRC_CHANNEL"]" :"$0 }'; }
 
+  tls_flag() { if [ "$IRC_TLS" -eq 1 ]; then echo "-c"; fi }
+
   # ircin is used to feed the output of netcat back to the "irc client"
   # so we can implement expect-like behavior with sed^_^
   # XXX mkselfdestructingtmpfifo would be nice instead of this cruft
@@ -51,6 +54,8 @@ pkgs.writeDashBin "irc-announce" ''
     echo2 "USER $LOGNAME 0 * :$LOGNAME@$(hostname)"
     echo2 "NICK $IRC_NICK"
 
+    awk 'match($0, /PING(.*)/, m) {print "PONG", m[1]; exit}'
+
     # wait for MODE message
     sed -n '/^:[^ ]* MODE /q'
 
@@ -67,5 +72,5 @@ pkgs.writeDashBin "irc-announce" ''
 
     echo2 'QUIT :Gone to have lunch'
   } < ircin \
-    | nc "$IRC_SERVER" "$IRC_PORT" | tee -a ircin
+    | nc $(tls_flag) "$IRC_SERVER" "$IRC_PORT" | tee -a ircin
 ''
-- 
cgit v1.3.1


From 9a9abc561b63871c9237d185b6651e4e995cdb41 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Fri, 10 Sep 2021 09:30:46 +0200
Subject: git-hooks irc-announce: fix tls arg

---
 krebs/5pkgs/simple/git-hooks/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/simple/git-hooks/default.nix b/krebs/5pkgs/simple/git-hooks/default.nix
index 012c4ccf8..acf34ad69 100644
--- a/krebs/5pkgs/simple/git-hooks/default.nix
+++ b/krebs/5pkgs/simple/git-hooks/default.nix
@@ -116,7 +116,7 @@ with import <stockholm/lib>;
         "$port" \
         "$nick" \
         "$channel" \
-        "tls" \
+        "$tls" \
         "$message"
     fi
   '';
-- 
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/5pkgs')

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

[cgit] Unable to lock slot /tmp/cgit/fe100000.lock: No such file or directory (2)