From 6f054d31f40d9421e0131e07058738d48929b661 Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 6 Jul 2023 20:52:33 +0200 Subject: modules: expose kartei as module --- krebs/3modules/kartei.nix | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 krebs/3modules/kartei.nix (limited to 'krebs') diff --git a/krebs/3modules/kartei.nix b/krebs/3modules/kartei.nix new file mode 100644 index 00000000..3dcb65ff --- /dev/null +++ b/krebs/3modules/kartei.nix @@ -0,0 +1,3 @@ +{ + imports = [ ../../kartei ]; +} -- cgit v1.2.3 From 4ed74041f7fa2d1554770eb3bb65c8774dd529eb Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 6 Jul 2023 20:57:20 +0200 Subject: modules/default: sort entries --- krebs/3modules/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'krebs') diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix index 28ce0994..5d12ea7a 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 -- cgit v1.2.3 From 1241f43a0f35ee23a5d1c9426a2e7084a6fb58f4 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 8 Jul 2023 14:27:36 +0200 Subject: ircd: remove broken max-line-length --- krebs/2configs/ircd.nix | 1 - 1 file changed, 1 deletion(-) (limited to 'krebs') diff --git a/krebs/2configs/ircd.nix b/krebs/2configs/ircd.nix index c56883d3..b82aba45 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; }; }; -- cgit v1.2.3 From 3f899d309b27cb748bb9426ca7e58c25b005d98d Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 8 Jul 2023 14:28:48 +0200 Subject: reaktor2: add vicuna plugin --- krebs/2configs/reaktor2.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'krebs') diff --git a/krebs/2configs/reaktor2.nix b/krebs/2configs/reaktor2.nix index 231c3d46..e46282ae 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 = { -- cgit v1.2.3 From 4b799b4132057977f1b09acce22641be9090849a Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 8 Jul 2023 14:29:03 +0200 Subject: reaktor2: join #fin on irc.r --- krebs/2configs/reaktor2.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'krebs') diff --git a/krebs/2configs/reaktor2.nix b/krebs/2configs/reaktor2.nix index e46282ae..61b44fc2 100644 --- a/krebs/2configs/reaktor2.nix +++ b/krebs/2configs/reaktor2.nix @@ -626,6 +626,7 @@ in { channels = [ "#noise" "#xxx" + "#fin" ]; }; } -- cgit v1.2.3 From 8e23a28c590c058ac233bcec94e7c06ec1e06703 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 8 Jul 2023 14:35:36 +0200 Subject: exim-smarthost: allow defining extraRouters in multiple locations --- krebs/3modules/exim-smarthost.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'krebs') diff --git a/krebs/3modules/exim-smarthost.nix b/krebs/3modules/exim-smarthost.nix index 7b3dace6..093ae203 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; }; -- cgit v1.2.3 From 64ec34644c424ce83a4fc9ec880a4f21122fb64c Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 8 Jul 2023 14:49:19 +0200 Subject: fzfmenu: use upstream writers --- krebs/5pkgs/simple/fzfmenu/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'krebs') diff --git a/krebs/5pkgs/simple/fzfmenu/default.nix b/krebs/5pkgs/simple/fzfmenu/default.nix index fe5d5e27..eb244133 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. -- cgit v1.2.3 From e67a5c2c0d6d83609f468af6b0f2e006ef73a8f5 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 8 Jul 2023 14:50:38 +0200 Subject: htgen-paste: use _override for content_type forcing --- krebs/5pkgs/simple/htgen-paste/src/htgen-paste | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'krebs') diff --git a/krebs/5pkgs/simple/htgen-paste/src/htgen-paste b/krebs/5pkgs/simple/htgen-paste/src/htgen-paste index bc806e87..74266e53 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) -- cgit v1.2.3 From d9facad144fa9e91f3bccd78f4a5abc871859a00 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 8 Jul 2023 14:50:48 +0200 Subject: irc-announce: use upstream writers --- krebs/5pkgs/simple/irc-announce/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'krebs') diff --git a/krebs/5pkgs/simple/irc-announce/default.nix b/krebs/5pkgs/simple/irc-announce/default.nix index 7b2af030..75036d41 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 -- cgit v1.2.3 From de0db32fb87ad2d382f50fb04f96b4e60a8b2ebd Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 8 Jul 2023 14:51:38 +0200 Subject: realwallpaper: don't pin imagemagick --- krebs/5pkgs/simple/realwallpaper/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'krebs') diff --git a/krebs/5pkgs/simple/realwallpaper/default.nix b/krebs/5pkgs/simple/realwallpaper/default.nix index 236d75d7..544abb3a 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 -- cgit v1.2.3 From 9f5fd828e685a6c10fddfeb71a7eec77dc46e295 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 9 Jul 2023 11:29:05 +0200 Subject: nixpkgs: 0de8605 -> d8bb6c6 --- krebs/nixpkgs.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'krebs') diff --git a/krebs/nixpkgs.json b/krebs/nixpkgs.json index aed82e9f..5d61372b 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": "d8bb6c681cf86265fdcf3cc3119f757bbb085835", + "date": "2023-07-07T23:10:04+02:00", + "path": "/nix/store/v2mnhk8j1p2g67zvr8mlhasmvj6187yy-nixpkgs", + "sha256": "1jsgl8i78avkdm31lzyazzn9nb3yrb099c6msa450yigsbxcmjqn", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, -- cgit v1.2.3 From 581665cc9f3c3e8e281ae0fc513fec903cc17b7c Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 9 Jul 2023 11:32:04 +0200 Subject: nixpkgs-unstable: 645ff62 -> 3c74875 --- krebs/nixpkgs-unstable.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'krebs') diff --git a/krebs/nixpkgs-unstable.json b/krebs/nixpkgs-unstable.json index 83131c2b..244a2cc5 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": "3c7487575d9445185249a159046cc02ff364bff8", + "date": "2023-07-06T17:30:45-04:00", + "path": "/nix/store/cjn75bb2d5fgf0kj4nnk3p53z5qg2x80-nixpkgs", + "sha256": "0sll858mrfx64g5hc3sysg5cz4py9nxi8g7m9j5idhh8yq8lcz5p", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, -- cgit v1.2.3 From 791ee6f6ffe435244f4f8913fcd9fcf562ae5443 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 12 Jul 2023 20:39:32 +0200 Subject: nixpkgs-unstable: 3c74875 -> f240619 --- krebs/nixpkgs-unstable.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'krebs') diff --git a/krebs/nixpkgs-unstable.json b/krebs/nixpkgs-unstable.json index 244a2cc5..5cef39be 100644 --- a/krebs/nixpkgs-unstable.json +++ b/krebs/nixpkgs-unstable.json @@ -1,9 +1,9 @@ { "url": "https://github.com/NixOS/nixpkgs", - "rev": "3c7487575d9445185249a159046cc02ff364bff8", - "date": "2023-07-06T17:30:45-04:00", - "path": "/nix/store/cjn75bb2d5fgf0kj4nnk3p53z5qg2x80-nixpkgs", - "sha256": "0sll858mrfx64g5hc3sysg5cz4py9nxi8g7m9j5idhh8yq8lcz5p", + "rev": "f2406198ea0e4e37d4380d0e20336c575b8f8ef9", + "date": "2023-07-11T14:02:10-04:00", + "path": "/nix/store/mhgrn5j28cq3qz0fm4nkbnshfy5qsdv8-nixpkgs", + "sha256": "13pz57zm570zy89igvfs8bys3x2zcik957cwzyl1rhdlzpsky5vz", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, -- cgit v1.2.3 From 7b6a5eb60d5127d1c43d3893b91932f06583c9ad Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 13 Jul 2023 11:58:38 +0200 Subject: nixpkgs: d8bb6c6 -> 98da3dd --- krebs/nixpkgs.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'krebs') diff --git a/krebs/nixpkgs.json b/krebs/nixpkgs.json index 5d61372b..4ceb8723 100644 --- a/krebs/nixpkgs.json +++ b/krebs/nixpkgs.json @@ -1,9 +1,9 @@ { "url": "https://github.com/NixOS/nixpkgs", - "rev": "d8bb6c681cf86265fdcf3cc3119f757bbb085835", - "date": "2023-07-07T23:10:04+02:00", - "path": "/nix/store/v2mnhk8j1p2g67zvr8mlhasmvj6187yy-nixpkgs", - "sha256": "1jsgl8i78avkdm31lzyazzn9nb3yrb099c6msa450yigsbxcmjqn", + "rev": "98da3dd0de6660d4abed7bb74e748694bd803413", + "date": "2023-07-12T12:54:32+08:00", + "path": "/nix/store/h9ncvz7aq1aqhjmxngnnhwaw359prh2g-nixpkgs", + "sha256": "0qzflsmxfgqz07jlx7njfsq752n1la8a6007mmx7rvqspp30g6j1", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, -- cgit v1.2.3 From 364e8970a79dc6d0a482d200efe1466db7f617fc Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 23 Jul 2023 23:00:32 +0200 Subject: reaktor2-plugins: fix sed plugin --- krebs/5pkgs/simple/reaktor2-plugins.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'krebs') diff --git a/krebs/5pkgs/simple/reaktor2-plugins.nix b/krebs/5pkgs/simple/reaktor2-plugins.nix index 651062b0..b51b53a4 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} "$@" ''; }; }; -- cgit v1.2.3 From f1af1bc877533b8fcef35658fab364676053fcb4 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 25 Jul 2023 15:10:57 +0200 Subject: nixpkgs-unstable: f240619 -> b12803b --- krebs/nixpkgs-unstable.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'krebs') diff --git a/krebs/nixpkgs-unstable.json b/krebs/nixpkgs-unstable.json index 5cef39be..20bfd0ec 100644 --- a/krebs/nixpkgs-unstable.json +++ b/krebs/nixpkgs-unstable.json @@ -1,9 +1,9 @@ { "url": "https://github.com/NixOS/nixpkgs", - "rev": "f2406198ea0e4e37d4380d0e20336c575b8f8ef9", - "date": "2023-07-11T14:02:10-04:00", - "path": "/nix/store/mhgrn5j28cq3qz0fm4nkbnshfy5qsdv8-nixpkgs", - "sha256": "13pz57zm570zy89igvfs8bys3x2zcik957cwzyl1rhdlzpsky5vz", + "rev": "b12803b6d90e2e583429bb79b859ca53c348b39a", + "date": "2023-07-24T08:16:24+02:00", + "path": "/nix/store/786lhas0jmp3nihbb28pbp7sm1sjzsy7-nixpkgs", + "sha256": "1l9sa8hd242xrb2j18mj4f62f3cw0bf5pafp58gdl0jkl61dpapr", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, -- cgit v1.2.3