diff --git a/systems/catullus/configuration.nix b/systems/catullus/configuration.nix index 6510746..3922aa8 100644 --- a/systems/catullus/configuration.nix +++ b/systems/catullus/configuration.nix @@ -93,22 +93,27 @@ in { { - nixpkgs.config.packageOverrides = pkgs: { - writeDash = pkgs.writers.writeDash; - writeDashBin = pkgs.writers.writeDashBin; + nixpkgs = { + config.packageOverrides = pkgs: { + writeDash = pkgs.writers.writeDash; + writeDashBin = pkgs.writers.writeDashBin; + writeJSON = pkgs.writers.writeJSON; + }; + overlays = [ + (import ) + ]; + }; + + services.matterbridge = { + enable = true; + configPath = toString (pkgs.writeTOML (import { + token = lib.strings.fileContents ; + })); }; } { services.keybase.enable = true; } - { - services.matterbridge = { - enable = true; - configPath = toString (pkgs.writeTOML (import { - token = lib.strings.removeSuffix "\n" (builtins.readFile ); - })); - }; - } { environment.systemPackages = [ pkgs.wtf ]; @@ -128,13 +133,9 @@ in { telegram = { enable = true; chatId = [ "18980945" ]; - botToken = lib.strings.removeSuffix "\n" (builtins.readFile ); + botToken = lib.strings.fileContents ; }; - urls = [ - # https://www.refrat.de/wahlen/2020/index.html - "https://www.refrat.de/wahlen/" - "https://www.berlinerfestspiele.de/de/treffen-junger-autorinnen/service/publikationen/publikationen.html" - ]; + urls = []; }; } ]; diff --git a/systems/catullus/containers.nix b/systems/catullus/containers.nix index d9e9892..2570e7a 100644 --- a/systems/catullus/containers.nix +++ b/systems/catullus/containers.nix @@ -13,14 +13,14 @@ let sha256 = "1ixffmxy3sxy2if7fd44ps451rds14hnz4d0x9nkh8lzshqk6v4y"; }; in { - nixpkgs.config.packageOverrides = pkgs: { - autorenkalender = pkgs.callPackage {}; - literature-quote = pkgs.callPackage {}; - telegram-proverb = pkgs.python3Packages.callPackage proverb-bot-package {}; - telegram-reverse = pkgs.python3Packages.callPackage "${telebots-package}/telegram-reverse" {}; - telegram-odyssey = pkgs.python3Packages.callPackage "${telebots-package}/telegram-odyssey" {}; - telegram-betacode = pkgs.python3Packages.callPackage "${telebots-package}/telegram-betacode" {}; - }; + nixpkgs.overlays = [(self: super: { + autorenkalender = super.callPackage {}; + literature-quote = super.callPackage {}; + 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;