diff --git a/configs/packages/default.nix b/configs/packages/default.nix index dabec6f..aafb2d3 100644 --- a/configs/packages/default.nix +++ b/configs/packages/default.nix @@ -104,7 +104,6 @@ gnupg # kmein.mnemosyne kmein.favicon - kmein.autorenkalender # kmein.bvg kmein.daybook kmein.depp diff --git a/packages/scripts/autorenkalender.nix b/packages/scripts/autorenkalender.nix deleted file mode 100644 index e8af80f..0000000 --- a/packages/scripts/autorenkalender.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ writeShellScriptBin, w3m, gnused }: -writeShellScriptBin "autorenkalender" '' - ${w3m}/bin/w3m -dump https://gutenberg.spiegel.de/ \ - | ${gnused}/bin/sed -n '/Autorenkalender/,/━/p' \ - | head -n -2 \ - | tail -n +3 -'' diff --git a/packages/scripts/default.nix b/packages/scripts/default.nix index 35bddfa..8ab5dcc 100644 --- a/packages/scripts/default.nix +++ b/packages/scripts/default.nix @@ -1,6 +1,5 @@ { pkgs, ... }: { - autorenkalender = pkgs.callPackage ./autorenkalender.nix {}; bvg = pkgs.callPackage ./bvg.nix {}; daybook = pkgs.callPackage ./daybook.nix {}; depp = pkgs.callPackage ./depp.nix {}; diff --git a/systems/catullus/containers.nix b/systems/catullus/containers.nix index 2570e7a..e9a225c 100644 --- a/systems/catullus/containers.nix +++ b/systems/catullus/containers.nix @@ -12,9 +12,15 @@ let rev = "f4201c5419354377a26b7f7873368683efbea417"; sha256 = "1ixffmxy3sxy2if7fd44ps451rds14hnz4d0x9nkh8lzshqk6v4y"; }; + autorenkalender-package = pkgs.fetchFromGitHub { + owner = "kmein"; + repo = "autorenkalender"; + rev = "1971f082ec6e14d392a0dc3ac62e0b1e4187409b"; + sha256 = "0hipj616vcsa3f62s83jvlx8zx4bmbgl5h2n4w8ba5ngp40lkmb3"; + }; in { nixpkgs.overlays = [(self: super: { - autorenkalender = super.callPackage {}; + autorenkalender = super.python3Packages.callPackage autorenkalender-package {}; literature-quote = super.callPackage {}; telegram-proverb = super.python3Packages.callPackage proverb-bot-package {}; telegram-reverse = super.python3Packages.callPackage "${telebots-package}/telegram-reverse" {}; @@ -36,6 +42,7 @@ in { time = "07:00"; token = lib.strings.fileContents ; chatIds = [ "@autorenkalender" ]; + parseMode = "Markdown"; command = "${pkgs.autorenkalender}/bin/autorenkalender"; };