chore(catullus): split up telegram-bots

systems/catullus/configuration.nix

@@ -3,7 +3,6 @@ let
   sshKey = {
     homeros = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDn13Y6CznabMvKJPIrr/dj1TX4boe8F98yc3FDElJeprQo2RXlDzjg/po9/lHTHaoC5yQUjlRg/AnI4vizYkn2sqJebAeSPahmpS+l0eFnjZgsqds2cCFqSPB6Qc5YEkGRhN4aq/ABz0jdFJLBYOYGxuuXowYxyNrqrItxDR7tF7upG+kVjYiDoP/qFm8C7zv6Zy8aoehNbzf8HlIJd0ITbMr/vUftNsQ8C84QmbZljReHmchPgE8GUfVLTlCORkhndbvNX3jXo+75y7JOIZZ6193FZHM4seg/VSDWYLJtpnhttD1w6qmiLrlimqbJB9ihoXq2eDmQ+4zo6hxQ6pFH6P0xQClJ0hxVWn6hEM3rkMwoMfbq4v54gKJsYxcGdnwjAX6d9DQv/QVjmVZffKWsGGoC7uz7bdmc0akVKi+GLSPOx8sJwXqvyvFStfqLaweVcuikUqQ72JLK7pZyliA7na6KuQ1PE3LTpfSr0lbBJ73xtS2rU1nF/Oe5zwA4LX5s/QeDVmS86D8acUrSCO62pBB3Yv8go0KR4mEvfxLiUWV6gR2uTeIPXvo4ouYFZqyABAGybjUATlGCXJaeHd/y/VWkpIB8ocqNESlRMCEe4TrYjw91AEmYBL6kWIeop3dyhovm3dTB3fQvC97kbL16wuXBrOcN4lEc+56ShhmvdQ== kieran.meinhardt@gmail.com";
     scardanelli = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC19H0FhSNWcfBRPKzbTVSMJikIWZl0CoM8zCm+/3fdMgoaLRpeZWe/AfDK6b4qOjk/sez/J0JUFCGr+JbMwjsduoazsuQowu9L9DLP9Q5UkJje4BD7MHznaeu9/XfVng/MvyaEWArA/VUJeKQesHe76tR511/+n3+bdzlIh8Zw/3wfFxmg1OTNA99/vLkXrQzHDTuV/yj1pxykL4xFtN0OIssW1IKncJeKtkO/OHGT55ypz52Daj6bNKqvxiTuzeEhv5M+5ppyIPcRf1uj/7IaPKttCgZAntEqBTIR9MbyXFeAZVayzaFnLl2okeam5XreeZbj+Y1h2ZjxiIuWoab3MLndSekVfLtfa63gtcWIf8CIvZO2wJoH8v73y0U78JsfWVaTM09ZCfFlHHA/bWqZ6laAjW+mWLO/c77DcYkB3IBzaMVNfc6mfTcGFIC+biWeYpKgA0zC6rByUPbmbIoMueP9zqJwqUaM90Nwd6559inBB107/BK3Ktb3b+37mMCstetIPB9e4EFpGMjhmnL/G81jS53ACWLXJYzt7mKU/fEsiW93MtaB+Le46OEC18y/4G8F7p/nnH7i0kO74ukxbnc4PlpiM7iWT6ra2Cyy+nzEgdXCNXywIxr05TbCQDwX6/NY8k7Hokgdfyz+1Pq3sX0yCcWRPaoB26YF12KYFQ== kieran.meinhardt@gmail.com";
-    rilke = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDWRcTILWzSzOAWqwBjJC97K9wKm+pfxk15L5AiTUlUMyBzVQsU+d2jUEe1rmp+kjVXL0qgNMI+eBzEAzaafUMdCPeIkMyeiOlXaYxq8NHApcZUSYV9CmzWqePj8Dlu8uexoF3TJi6tj3mmGM8BY50qkwk4mlT/5xLPPnh/HHyFmoZlj6183Z4vJRnK8UZ6x2gevVaE36lP27MikZ/MQ6/PaHJ5TNZy63rQwzKXw6ZQMx4JU22CwyZqPn1wjlGEkpJFOBKtnypURdVBsPydaZd/I7b/13FMwso2hSUoXqeV6iaeno2FWOrB3cAaFogNWKPRkEacKEE5mQOvLGGdG1Xp u0_a138@localhost";
     wilde = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDyTnGhFq0Q+vghNhrqNrAyY+CsN7nNz8bPfiwIwNpjk kfm@wilde";
   };
   unstable = import <nixos-unstable> {};
@@ -83,7 +82,7 @@ let
 in {
   imports = [
     ./hardware-configuration.nix
-    ./containers.nix
+    ./telegram-bots
     <niveum/configs/distrobump.nix>
     <niveum/configs/nixpkgs-unstable.nix>
     <niveum/configs/save-space.nix>
@@ -192,7 +191,6 @@ in {
   users.users.me.openssh.authorizedKeys.keys = [
     sshKey.homeros
     sshKey.scardanelli
-    sshKey.rilke
     sshKey.wilde
   ];
 

systems/catullus/containers.nix

@@ -1,104 +0,0 @@
-{ config, pkgs, lib, ... }:
-let
-  telebots-package = pkgs.fetchFromGitHub {
-    owner = "kmein";
-    repo = "telebots";
-    rev = "b4276155114ee96cd3f320e361e52952ea700db6";
-    sha256 = "08rp1pcisk4zzhxdlgrlhxa0sbza5qhxa70rjycg4r7fmixkkbz2";
-  };
-  proverb-bot-package = pkgs.fetchFromGitHub {
-    owner = "kmein";
-    repo = "proverb-pro";
-    rev = "f4201c5419354377a26b7f7873368683efbea417";
-    sha256 = "1ixffmxy3sxy2if7fd44ps451rds14hnz4d0x9nkh8lzshqk6v4y";
-  };
-  autorenkalender-package = pkgs.fetchFromGitHub {
-    owner = "kmein";
-    repo = "autorenkalender";
-    rev = "1971f082ec6e14d392a0dc3ac62e0b1e4187409b";
-    sha256 = "0hipj616vcsa3f62s83jvlx8zx4bmbgl5h2n4w8ba5ngp40lkmb3";
-  };
-in {
-  nixpkgs.overlays = [(self: super: {
-    autorenkalender = super.python3Packages.callPackage autorenkalender-package {};
-    literature-quote = super.callPackage <niveum/packages/scripts/literature-quote.nix> {};
-    telegram-proverb = super.python3Packages.callPackage proverb-bot-package {};
-    telegram-reverse = super.python3Packages.callPackage "${telebots-package}/telegram-reverse" {};
-    telegram-odyssey = super.python3Packages.callPackage "${telebots-package}/telegram-odyssey" {};
-    telegram-betacode = super.python3Packages.callPackage "${telebots-package}/telegram-betacode" {};
-  })];
-
-  niveum.telegramBots.quotebot = {
-    enable = true;
-    time = "08/6:00";
-    token = lib.strings.fileContents <secrets/telegram/kmein.token>;
-    chatIds = [ "18980945" "757821027" "455964311" ];
-    command = "${pkgs.literature-quote}/bin/literature-quote";
-    parseMode = "Markdown";
-  };
-
-  niveum.telegramBots.autorenkalender = {
-    enable = true;
-    time = "07:00";
-    token = lib.strings.fileContents <secrets/telegram/kmein.token>;
-    chatIds = [ "@autorenkalender" ];
-    parseMode = "Markdown";
-    command = "${pkgs.autorenkalender}/bin/autorenkalender";
-  };
-
-  systemd.services.telegram-odyssey = {
-    wantedBy = [ "multi-user.target" ];
-    description = "Telegram bot reciting the Odyssey to you";
-    environment.TELEGRAM_ODYSSEY_TOKEN = lib.strings.fileContents <secrets/telegram/odyssey.token>;
-    enable = true;
-    script = ''${pkgs.telegram-odyssey}/bin/telegram-odyssey'';
-    serviceConfig.Restart = "always";
-  };
-
-  systemd.services.telegram-reverse = {
-    wantedBy = [ "multi-user.target" ];
-    description = "Telegram bot for reversing things";
-    environment.TELEGRAM_REVERSE_TOKEN = lib.strings.fileContents <secrets/telegram/reverse.token>;
-    enable = true;
-    script = ''${pkgs.telegram-reverse}/bin/telegram-reverse'';
-    serviceConfig.Restart = "always";
-  };
-
-  systemd.services.telegram-betacode = {
-    wantedBy = [ "multi-user.target" ];
-    description = "Telegram bot for converting Ancient Greek betacode into unicode";
-    environment.TELEGRAM_BETACODE_TOKEN = lib.strings.fileContents <secrets/telegram/betacode.token>;
-    enable = true;
-    script = ''${pkgs.telegram-betacode}/bin/telegram-betacode'';
-    serviceConfig.Restart = "always";
-  };
-
-  systemd.services.telegram-nachtischsatan = {
-    wantedBy = [ "multi-user.target" ];
-    description = "*flubberflubber*";
-    enable = true;
-    script = toString (pkgs.callPackage <niveum/packages/scripts/nachtischsatan-bot.nix> {
-      token = lib.strings.fileContents <secrets/telegram/nachtischsatan.token>;
-    });
-    serviceConfig.Restart = "always";
-  };
-
-  systemd.services.telegram-proverb = {
-    wantedBy = [ "multi-user.target" ];
-    description = "Telegram bot for generating inspiring but useless proverbs";
-    environment.TELEGRAM_PROVERB_TOKEN = lib.strings.fileContents <secrets/telegram/proverb.token>;
-    enable = true;
-    script = ''${pkgs.telegram-proverb}/bin/proverb_bot.py'';
-    serviceConfig.Restart = "always";
-  };
-
-  # systemd.services.telegram-horoscope = {
-  #   wantedBy = [ "multi-user.target" ];
-  #   description = "Telegram bot for generating horoscope charts";
-  #   environment.TELEGRAM_HOROSCOPE_TOKEN = builtins.readFile <secrets/telegram-horoscope.token>;
-  #   environment.GOOGLE_MAPS_API_KEY = builtins.readFile <secrets/google-maps.api-key>;
-  #   enable = true;
-  #   script = ''${telegram-horoscope}/bin/telegram-horoscope'';
-  #   serviceConfig.Restart = "always";
-  # };
-}

systems/catullus/telegram-bots/autorenkalender.nix

@@ -0,0 +1,20 @@
+{ pkgs, lib, ... }:
+let
+  autorenkalender-package = pkgs.fetchFromGitHub {
+    owner = "kmein";
+    repo = "autorenkalender";
+    rev = "1971f082ec6e14d392a0dc3ac62e0b1e4187409b";
+    sha256 = "0hipj616vcsa3f62s83jvlx8zx4bmbgl5h2n4w8ba5ngp40lkmb3";
+  };
+  autorenkalender = pkgs.python3Packages.callPackage autorenkalender-package {};
+in
+{
+  niveum.telegramBots.autorenkalender = {
+    enable = true;
+    time = "07:00";
+    token = lib.strings.fileContents <secrets/telegram/kmein.token>;
+    chatIds = [ "@autorenkalender" ];
+    parseMode = "Markdown";
+    command = "${autorenkalender}/bin/autorenkalender";
+  };
+}

systems/catullus/telegram-bots/default.nix

@@ -0,0 +1,50 @@
+{ config, pkgs, lib, ... }:
+let
+  telebots =
+  let
+    telebots-package = pkgs.fetchFromGitHub {
+      owner = "kmein";
+      repo = "telebots";
+      rev = "b4276155114ee96cd3f320e361e52952ea700db6";
+      sha256 = "08rp1pcisk4zzhxdlgrlhxa0sbza5qhxa70rjycg4r7fmixkkbz2";
+    };
+  in {
+    reverse = pkgs.python3Packages.callPackage "${telebots-package}/telegram-reverse" {};
+    odyssey = pkgs.python3Packages.callPackage "${telebots-package}/telegram-odyssey" {};
+    betacode = pkgs.python3Packages.callPackage "${telebots-package}/telegram-betacode" {};
+  };
+in {
+  imports = [
+    ./literature-quote.nix
+    ./autorenkalender.nix
+    ./proverb.nix
+    ./nachtischsatan.nix
+  ];
+
+  systemd.services.telegram-odyssey = {
+    wantedBy = [ "multi-user.target" ];
+    description = "Telegram bot reciting the Odyssey to you";
+    environment.TELEGRAM_ODYSSEY_TOKEN = lib.strings.fileContents <secrets/telegram/odyssey.token>;
+    enable = true;
+    script = ''${telebots.odyssey}/bin/telegram-odyssey'';
+    serviceConfig.Restart = "always";
+  };
+
+  systemd.services.telegram-reverse = {
+    wantedBy = [ "multi-user.target" ];
+    description = "Telegram bot for reversing things";
+    environment.TELEGRAM_REVERSE_TOKEN = lib.strings.fileContents <secrets/telegram/reverse.token>;
+    enable = true;
+    script = ''${telebots.reverse}/bin/telegram-reverse'';
+    serviceConfig.Restart = "always";
+  };
+
+  systemd.services.telegram-betacode = {
+    wantedBy = [ "multi-user.target" ];
+    description = "Telegram bot for converting Ancient Greek betacode into unicode";
+    environment.TELEGRAM_BETACODE_TOKEN = lib.strings.fileContents <secrets/telegram/betacode.token>;
+    enable = true;
+    script = ''${telebots.betacode}/bin/telegram-betacode'';
+    serviceConfig.Restart = "always";
+  };
+}

systems/catullus/telegram-bots/literature-quote.nix

@@ -0,0 +1,14 @@
+{ pkgs, lib, ... }:
+let
+  literature-quote = pkgs.callPackage <niveum/packages/scripts/literature-quote.nix> {};
+in
+{
+  niveum.telegramBots.quotebot = {
+    enable = true;
+    time = "08/6:00";
+    token = lib.strings.fileContents <secrets/telegram/kmein.token>;
+    chatIds = [ "18980945" "757821027" "455964311" ];
+    command = "${literature-quote}/bin/literature-quote";
+    parseMode = "Markdown";
+  };
+}

systems/catullus/telegram-bots/nachtischsatan.nix

@@ -0,0 +1,38 @@
+{ pkgs, lib, ... }:
+let
+  nachtischsatan-bot = { token }: pkgs.writers.writePython3 "nachtischsatan-bot" {
+    libraries = [ pkgs.python3Packages.python-telegram-bot ];
+  } ''
+    import random
+    import time
+
+    from telegram.ext import Updater, MessageHandler
+    from telegram.ext.filters import Filters
+
+
+    def flubber(bot, update):
+        time.sleep(random.randrange(4000) / 1000)
+        update.message.reply_text("*flubberflubber*")
+
+
+    updater = Updater(
+      '${token}'
+    )
+
+    updater.dispatcher.add_handler(MessageHandler(Filters.all, flubber))
+
+    updater.start_polling()
+    updater.idle()
+  '';
+in
+{
+  systemd.services.telegram-nachtischsatan = {
+    wantedBy = [ "multi-user.target" ];
+    description = "*flubberflubber*";
+    enable = true;
+    script = toString (nachtischsatan-bot {
+      token = lib.strings.fileContents <secrets/telegram/nachtischsatan.token>;
+    });
+    serviceConfig.Restart = "always";
+  };
+}

systems/catullus/telegram-bots/proverb.nix

@@ -0,0 +1,20 @@
+{ pkgs, lib, ... }:
+let
+  proverb-bot-package = pkgs.fetchFromGitHub {
+    owner = "kmein";
+    repo = "proverb-pro";
+    rev = "f4201c5419354377a26b7f7873368683efbea417";
+    sha256 = "1ixffmxy3sxy2if7fd44ps451rds14hnz4d0x9nkh8lzshqk6v4y";
+  };
+  telegram-proverb = pkgs.python3Packages.callPackage proverb-bot-package {};
+in
+{
+  systemd.services.telegram-proverb = {
+    wantedBy = [ "multi-user.target" ];
+    description = "Telegram bot for generating inspiring but useless proverbs";
+    environment.TELEGRAM_PROVERB_TOKEN = lib.strings.fileContents <secrets/telegram/proverb.token>;
+    enable = true;
+    script = ''${telegram-proverb}/bin/proverb_bot.py'';
+    serviceConfig.Restart = "always";
+  };
+}