From 16f9fbb49196ccb09354dd9d6b28734f3516cc46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= Date: Fri, 1 Feb 2019 02:00:07 +0100 Subject: [PATCH] catullus: reliably deploy telegram-reverse --- configs/packages.nix | 2 ++ packages/telegram-reverse.nix | 9 +++++++++ systems/catullus/configuration.nix | 10 ++++++++++ systems/krops.nix | 9 +++++++-- 4 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 packages/telegram-reverse.nix diff --git a/configs/packages.nix b/configs/packages.nix index c139e9c..2310174 100644 --- a/configs/packages.nix +++ b/configs/packages.nix @@ -168,10 +168,12 @@ in with pkgs; aspellDicts.en aspellDicts.la daybook + gnupg jo jq memo par + pass qrencode unstable.hledger wordnet diff --git a/packages/telegram-reverse.nix b/packages/telegram-reverse.nix new file mode 100644 index 0000000..9a62157 --- /dev/null +++ b/packages/telegram-reverse.nix @@ -0,0 +1,9 @@ +{ buildPythonPackage, pillow, python-telegram-bot, pydub }: +buildPythonPackage rec { + pname = "telegram-reverse"; + version = "0.2.0"; + + src = "${builtins.fetchTarball https://github.com/kmein/telebots/archive/e83ec7d78f24214801d53cc3706918d282d9cadf.tar.gz}/${pname}"; + + propagatedBuildInputs = [ pillow python-telegram-bot pydub ]; +} diff --git a/systems/catullus/configuration.nix b/systems/catullus/configuration.nix index fbbc17a..2de7be9 100644 --- a/systems/catullus/configuration.nix +++ b/systems/catullus/configuration.nix @@ -4,6 +4,7 @@ let 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"; }; + telegram-reverse = pkgs.python3Packages.callPackage {}; in { imports = [ @@ -21,6 +22,15 @@ in { networks.Aether = { pskRaw = "e1b18af54036c5c9a747fe681c6a694636d60a5f8450f7dec0d76bc93e2ec85a"; }; }; + systemd.services.telegram-reverse = { + wantedBy = [ "multi-user.target" ]; + description = "A Telegram bot for reversing things"; + environment.TELEGRAM_REVERSE_TOKEN = builtins.readFile ; + enable = true; + script = ''${telegram-reverse}/bin/telegram-reverse''; + serviceConfig.Restart = "always"; + }; + environment.variables.TERM = "linux"; documentation.enable = false; diff --git a/systems/krops.nix b/systems/krops.nix index 4d0820d..8024204 100644 --- a/systems/krops.nix +++ b/systems/krops.nix @@ -5,17 +5,22 @@ let lib = import "${krops}/lib"; pkgs = import "${krops}/pkgs" {}; - source = path: lib.evalSource [{ + source = name: path: lib.evalSource [{ nixpkgs.git = { ref = "6a3f5bcb061e1822f50e299f5616a0731636e4e7"; # 18.09 url = https://github.com/NixOS/nixpkgs-channels; }; system.file = toString path; + packages.file = toString ../packages; nixos-config.symlink = "system/configuration.nix"; + secrets.pass = { + dir = toString ~/.password-store; + name = name; + }; }]; systems.catullus = pkgs.krops.writeDeploy "deploy-catullus" { - source = source ./catullus; + source = source "catullus" ./catullus; target = "root@catullus.local"; }; in systems // {