Merge remote-tracking branch 'gum/master'

This commit is contained in:
lassulus 2021-03-23 21:15:27 +01:00
commit 876d404072
4 changed files with 15 additions and 8 deletions

View File

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

View File

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

View File

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

View File

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