summaryrefslogtreecommitdiffstats
path: root/krebs
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2023-07-25 20:39:35 +0200
committertv <tv@krebsco.de>2023-07-25 20:39:35 +0200
commit5d1b0675cf179f863a5b34b67661a953197b6057 (patch)
treedd9c83dff894fd97cee61dd1b2df3eaeecbbd740 /krebs
parenta2c9ad05b2e8237b915a100e1e38ca0f3d18526c (diff)
parent8eab63eaa81717391269a61355cb7fb64341fd1a (diff)
Merge remote-tracking branch 'orange/master'
Diffstat (limited to 'krebs')
-rw-r--r--krebs/2configs/ircd.nix1
-rw-r--r--krebs/2configs/reaktor2.nix20
-rw-r--r--krebs/3modules/default.nix6
-rw-r--r--krebs/3modules/exim-smarthost.nix2
-rw-r--r--krebs/3modules/kartei.nix3
-rw-r--r--krebs/5pkgs/simple/fzfmenu/default.nix2
-rw-r--r--krebs/5pkgs/simple/htgen-paste/src/htgen-paste4
-rw-r--r--krebs/5pkgs/simple/irc-announce/default.nix2
-rw-r--r--krebs/5pkgs/simple/reaktor2-plugins.nix2
-rw-r--r--krebs/5pkgs/simple/realwallpaper/default.nix2
-rw-r--r--krebs/nixpkgs-unstable.json8
-rw-r--r--krebs/nixpkgs.json8
12 files changed, 41 insertions, 19 deletions
diff --git a/krebs/2configs/ircd.nix b/krebs/2configs/ircd.nix
index c56883d3e..b82aba45a 100644
--- a/krebs/2configs/ircd.nix
+++ b/krebs/2configs/ircd.nix
@@ -38,7 +38,6 @@
hidden = false;
password = "$2a$04$0AtVycWQJ07ymrDdKyAm2un3UVSVIzpzL3wsWbWb3PF95d1CZMcMO";
};
- server.max-line-length = 1024;
server.lookup-hostnames = true;
};
};
diff --git a/krebs/2configs/reaktor2.nix b/krebs/2configs/reaktor2.nix
index 231c3d46c..61b44fc27 100644
--- a/krebs/2configs/reaktor2.nix
+++ b/krebs/2configs/reaktor2.nix
@@ -253,6 +253,24 @@ let
};
};
+ vicuna = {
+ pattern = "^!vicuna (.*)$";
+ activate = "match";
+ arguments = [1];
+ timeoutSec = 1337;
+ command = {
+ filename = pkgs.writeDash "vicuna" ''
+ set -efu
+
+ mkdir -p ${stateDir}/vicuna
+ export CONTEXT=${stateDir}/vicuna/"$_msgtarget".context
+ ${pkgs.vicuna-chat}/bin/vicuna-chat "$@" |
+ echo "$_from: $(cat)" |
+ fold -s -w 426
+ '';
+ };
+ };
+
locationsLib = pkgs.writeText "locations.sh" ''
ENDPOINT=http://c.r/poi.json
get_locations() {
@@ -413,6 +431,7 @@ let
hooks.sed
interrogate
say
+ vicuna
(generators.command_hook {
inherit (commands) dance random-emoji nixos-version;
tell = {
@@ -607,6 +626,7 @@ in {
channels = [
"#noise"
"#xxx"
+ "#fin"
];
};
}
diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix
index 28ce09941..5d12ea7af 100644
--- a/krebs/3modules/default.nix
+++ b/krebs/3modules/default.nix
@@ -1,7 +1,6 @@
{ config, lib, ... }:
{
imports = [
- ../../kartei
./acl.nix
./airdcpp.nix
./announce-activation.nix
@@ -28,9 +27,10 @@
./iana-etc.nix
./iptables.nix
./kapacitor.nix
+ ./kartei.nix
./konsens.nix
- ./krebs.nix
./krebs-pages.nix
+ ./krebs.nix
./monit.nix
./nixpkgs.nix
./on-failure.nix
@@ -45,8 +45,8 @@
./secret.nix
./setuid.nix
./shadow.nix
- ./ssh.nix
./sitemap.nix
+ ./ssh.nix
./ssl.nix
./sync-containers.nix
./sync-containers3.nix
diff --git a/krebs/3modules/exim-smarthost.nix b/krebs/3modules/exim-smarthost.nix
index 7b3dace6a..093ae2030 100644
--- a/krebs/3modules/exim-smarthost.nix
+++ b/krebs/3modules/exim-smarthost.nix
@@ -40,7 +40,7 @@ let
};
extraRouters = mkOption {
- type = types.nullOr types.str;
+ type = types.nullOr types.lines;
default = null;
};
diff --git a/krebs/3modules/kartei.nix b/krebs/3modules/kartei.nix
new file mode 100644
index 000000000..3dcb65ff6
--- /dev/null
+++ b/krebs/3modules/kartei.nix
@@ -0,0 +1,3 @@
+{
+ imports = [ ../../kartei ];
+}
diff --git a/krebs/5pkgs/simple/fzfmenu/default.nix b/krebs/5pkgs/simple/fzfmenu/default.nix
index fe5d5e27a..eb2441330 100644
--- a/krebs/5pkgs/simple/fzfmenu/default.nix
+++ b/krebs/5pkgs/simple/fzfmenu/default.nix
@@ -39,7 +39,7 @@ let
};
in
-pkgs.writeDashBin "fzfmenu" ''
+pkgs.writers.writeDashBin "fzfmenu" ''
set -efu
# Spawn terminal if called without one, like e.g. from a window manager.
diff --git a/krebs/5pkgs/simple/htgen-paste/src/htgen-paste b/krebs/5pkgs/simple/htgen-paste/src/htgen-paste
index bc806e870..74266e53a 100644
--- a/krebs/5pkgs/simple/htgen-paste/src/htgen-paste
+++ b/krebs/5pkgs/simple/htgen-paste/src/htgen-paste
@@ -46,8 +46,8 @@ case "$Method $abs_path" in
cp -v $content $item >&2
fi
- if test -n ${reg_content_type-}; then
- echo -n "$req_content_type" > "$item".content_type
+ if test -n "${req_content_type_override-}"; then
+ echo -n "$req_content_type_override" > "$item".content_type
fi
base32short=$(echo $base32 | cut -b-7)
diff --git a/krebs/5pkgs/simple/irc-announce/default.nix b/krebs/5pkgs/simple/irc-announce/default.nix
index 7b2af0307..75036d41c 100644
--- a/krebs/5pkgs/simple/irc-announce/default.nix
+++ b/krebs/5pkgs/simple/irc-announce/default.nix
@@ -1,6 +1,6 @@
{ pkgs, lib, ... }:
-pkgs.writeDashBin "irc-announce" ''
+pkgs.writers.writeDashBin "irc-announce" ''
set -euf
IRC_SERVER=$1
diff --git a/krebs/5pkgs/simple/reaktor2-plugins.nix b/krebs/5pkgs/simple/reaktor2-plugins.nix
index 651062b0a..b51b53a48 100644
--- a/krebs/5pkgs/simple/reaktor2-plugins.nix
+++ b/krebs/5pkgs/simple/reaktor2-plugins.nix
@@ -59,7 +59,7 @@ rec {
filename = pkgs.writers.writeDash "sed-plugin" ''
set -efu
exec ${pkgs.python3}/bin/python \
- ${stockholm.outPath + "/krebs/5pkgs/simple/Reaktor/scripts/sed-plugin.py"} "$@"
+ ${./Reaktor/scripts/sed-plugin.py} "$@"
'';
};
};
diff --git a/krebs/5pkgs/simple/realwallpaper/default.nix b/krebs/5pkgs/simple/realwallpaper/default.nix
index 236d75d72..544abb3a3 100644
--- a/krebs/5pkgs/simple/realwallpaper/default.nix
+++ b/krebs/5pkgs/simple/realwallpaper/default.nix
@@ -9,7 +9,7 @@ pkgs.writers.writeDashBin "generate-wallpaper" ''
gnused
file
findutils
- imagemagick6
+ imagemagick
inkscape
jq
nomads-cloud
diff --git a/krebs/nixpkgs-unstable.json b/krebs/nixpkgs-unstable.json
index 83131c2b8..20bfd0ec4 100644
--- a/krebs/nixpkgs-unstable.json
+++ b/krebs/nixpkgs-unstable.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/NixOS/nixpkgs",
- "rev": "645ff62e09d294a30de823cb568e9c6d68e92606",
- "date": "2023-07-01T19:09:17+02:00",
- "path": "/nix/store/s5zy1prlscbr2iz6h9fj5la3973isaxw-nixpkgs",
- "sha256": "02hpby5ln7p5kix9518hn0ady4q3i41z5ycamvwsarv3gvlzbsb4",
+ "rev": "b12803b6d90e2e583429bb79b859ca53c348b39a",
+ "date": "2023-07-24T08:16:24+02:00",
+ "path": "/nix/store/786lhas0jmp3nihbb28pbp7sm1sjzsy7-nixpkgs",
+ "sha256": "1l9sa8hd242xrb2j18mj4f62f3cw0bf5pafp58gdl0jkl61dpapr",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
diff --git a/krebs/nixpkgs.json b/krebs/nixpkgs.json
index aed82e9f3..4ceb87230 100644
--- a/krebs/nixpkgs.json
+++ b/krebs/nixpkgs.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/NixOS/nixpkgs",
- "rev": "0de86059128947b2438995450f2c2ca08cc783d5",
- "date": "2023-07-01T05:19:59+03:00",
- "path": "/nix/store/fwazy7k5nlavyj4637jnsqabdzdiad90-nixpkgs",
- "sha256": "0m3aqg2xx5705v4yglal1ksknqnj3cbdyzcyw1dvz6qqvn9ng7i5",
+ "rev": "98da3dd0de6660d4abed7bb74e748694bd803413",
+ "date": "2023-07-12T12:54:32+08:00",
+ "path": "/nix/store/h9ncvz7aq1aqhjmxngnnhwaw359prh2g-nixpkgs",
+ "sha256": "0qzflsmxfgqz07jlx7njfsq752n1la8a6007mmx7rvqspp30g6j1",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,