Merge remote-tracking branch 'gum/master'

makefu/2configs/bgt/social-to-irc.nix

@@ -4,6 +4,7 @@
     enable = true;
     config = {
       channel = "#binaergewitter";
+      notifyErrors =  false;
       irc = {
         host = "irc.freenode.net";
         port = 6667;
@@ -15,15 +16,13 @@
       bots = {
         bgt-mastodon-rss = {
           feed = "https://jit.social/users/binaergewitter.rss";
-          channels = [ "#binaergewitter" ];
+          #extraChannels = [ "#binaergewitter" ];
           delay = 180;
-          notifyErrors = false;
         };
         bgt-blog-rss = {
           feed = "https://blog.binaergewitter.de/rss.xml";
-          channels = [ "#binaergewitter" ];
+          #extraChannels = [ "#binaergewitter" ];
           delay = 180;
-          notifyErrors = false;
         };
       };
     };

makefu/2configs/bureautomation/kalauerbot.nix

@@ -1,11 +1,19 @@
 { config, lib, pkgs, ... }:
+let
+  oofdir = fetchTarball {
+    url = "https://o.euer.krebsco.de/s/AZn9QPLGFZeDfNq/download";
+    sha256 = "1wa59rkgffql6hbiw9vv0zh35wx9x1cp4bnwicprbd0kdxj75miz"; 
+  };
 
+in
 {
   systemd.services.kalauerbot  = {
     description = "Kalauerbot";
     after = [ "network-online.target"  ];
     wantedBy = [ "multi-user.target"  ];
-    environment = import <secrets/bureautomation/citadel.nix>;
+    environment = import <secrets/bureautomation/citadel.nix> // {
+      "KALAUER_OOFDIR" = oofdir;
+    };
     serviceConfig = {
       DynamicUser = true;
       StateDirectory = "kalauerbot";

makefu/2configs/home/ham/zigbee2mqtt.nix

@@ -6,7 +6,7 @@
 #   input_select
 #   timer
 let
-  inherit (import ../lib) zigbee;
+  inherit (import ./lib) zigbee;
   prefix = zigbee.prefix;
 in
 {

makefu/5pkgs/kalauerbot/default.nix

@@ -1,11 +1,11 @@
 { stdenv, python3, fetchgit }:
 python3.pkgs.buildPythonPackage rec {
 name = "kalauerbot";
-rev = "2a1e868";
+rev = "f244b35";
   src = fetchgit {
     url = "http://cgit.euer.krebsco.de/kalauerbot";
     inherit rev;
-    sha256 = "1vymz3dnpgcxwfgbnrpc0plcdmihxcq7xsvpap755c5jvzvb8a1k";
+    sha256 = "08y4rlsil9p0726wlpkw2lpmkcnckaj3zqsifbj5w6rgivp6ly0v";
   };
   propagatedBuildInputs = with python3.pkgs;[
      (callPackage ./python-matrixbot.nix {