summaryrefslogtreecommitdiffstats
path: root/krebs
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2022-11-29 19:54:28 +0100
committertv <tv@krebsco.de>2022-11-29 19:54:28 +0100
commit43428ccca56bdf10572f1c93ebafa82cfdf7dbf5 (patch)
treeb6c79e4f047ccb8842c9e5f7b73688ccbc5ff053 /krebs
parent5c05e2a9b68b01e1f0f69a1e4414bce21a801f1f (diff)
parent32b23666d15861f6f4d8b1f522ee53d4f21fabb6 (diff)
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'krebs')
-rw-r--r--krebs/1systems/hotdog/config.nix2
-rw-r--r--krebs/2configs/cal.nix33
-rw-r--r--krebs/2configs/reaktor2.nix27
3 files changed, 60 insertions, 2 deletions
diff --git a/krebs/1systems/hotdog/config.nix b/krebs/1systems/hotdog/config.nix
index cf07d3b4d..02749dafe 100644
--- a/krebs/1systems/hotdog/config.nix
+++ b/krebs/1systems/hotdog/config.nix
@@ -13,6 +13,8 @@
<stockholm/krebs/2configs/acme.nix>
<stockholm/krebs/2configs/mud.nix>
+ <stockholm/krebs/2configs/cal.nix>
+
## shackie irc bot
<stockholm/krebs/2configs/shack/reaktor.nix>
];
diff --git a/krebs/2configs/cal.nix b/krebs/2configs/cal.nix
new file mode 100644
index 000000000..90093e8eb
--- /dev/null
+++ b/krebs/2configs/cal.nix
@@ -0,0 +1,33 @@
+{ config, lib, pkgs, ... }:
+{
+ users.users.testing = {
+ uid = pkgs.stockholm.lib.genid_uint31 "testing";
+ isNormalUser = true;
+ openssh.authorizedKeys.keys = [
+ config.krebs.users.xkey.pubkey
+ config.krebs.users.lass.pubkey
+ ];
+ packages = [
+ pkgs.calendar-cli
+ pkgs.tmux
+ ];
+ };
+
+ services.xandikos = {
+ enable = true;
+ extraOptions = [
+ "--autocreate"
+ "--defaults"
+ "--current-user-principal /krebs"
+ "--dump-dav-xml"
+ ];
+ };
+
+ services.nginx = {
+ enable = true;
+
+ virtualHosts = {
+ "calendar.r".locations."/".proxyPass = "http://localhost:${toString config.services.xandikos.port}/";
+ };
+ };
+}
diff --git a/krebs/2configs/reaktor2.nix b/krebs/2configs/reaktor2.nix
index c1af2d8b4..13b59fa82 100644
--- a/krebs/2configs/reaktor2.nix
+++ b/krebs/2configs/reaktor2.nix
@@ -62,7 +62,6 @@ let
export PATH=${makeBinPath [
pkgs.coreutils
pkgs.curl
- pkgs.gnused
pkgs.stable-generate
]}
stable_url=$(stable-generate "$@")
@@ -85,7 +84,6 @@ let
export PATH=${makeBinPath [
pkgs.coreutils
pkgs.curl
- pkgs.gnused
pkgs.stable-generate
]}
case $_msgtarget in \#*)
@@ -100,6 +98,30 @@ let
};
};
+ say = {
+ pattern = "^!say (.*)$";
+ activate = "match";
+ arguments = [1];
+ command = {
+ filename = pkgs.writeDash "say" ''
+ set -efu
+
+ export PATH=${makeBinPath [
+ pkgs.coreutils
+ pkgs.curl
+ pkgs.opusTools
+ ]}
+ paste_url=$(printf '%s' "$1" |
+ curl -fSsG http://tts.r/api/tts --data-urlencode 'text@-' |
+ opusenc - - |
+ curl -Ss https://p.krebsco.de --data-binary @- |
+ tail -1
+ )
+ echo "$_from: $paste_url"
+ '';
+ };
+ };
+
taskRcFile = builtins.toFile "taskrc" ''
confirmation=no
'';
@@ -275,6 +297,7 @@ let
bedger-add
bedger-balance
hooks.sed
+ say
(generators.command_hook {
inherit (commands) dance random-emoji nixos-version;
tell = {