From 30be9ada2486b92c39ddc464676f028dce980b55 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 13 Jan 2026 13:55:34 +0100 Subject: gitignore: fix bug introduced by 68d3c92 --- krebs/2configs/nameserver.nix | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'krebs/2configs') diff --git a/krebs/2configs/nameserver.nix b/krebs/2configs/nameserver.nix index fb22dc6f9..c394f312d 100644 --- a/krebs/2configs/nameserver.nix +++ b/krebs/2configs/nameserver.nix @@ -146,10 +146,14 @@ in { ''; }; + #krebs.systemd.services.knot.restartIfCredentialsChange = true; systemd.services."knsupdate-krebsco.de" = { serviceConfig = { Type = "oneshot"; SyslogIdentifier = "knsupdate-krebsco.de"; + #LoadCredential = [ + # "keys.conf:/var/src/secrets/knot-keys.conf" + #]; ExecStart = pkgs.writeDash "knsupdate-krebsco.de" /* sh */ '' set -efu -- cgit v1.3.1 From 9f8e108072cf80f53a37659955107f5ae76de8ca Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 21 Jan 2026 21:44:48 +0100 Subject: reaktor2: taskwarrior -> taskwarrior2 --- krebs/2configs/reaktor2.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'krebs/2configs') diff --git a/krebs/2configs/reaktor2.nix b/krebs/2configs/reaktor2.nix index e7d348d50..600f7cd6d 100644 --- a/krebs/2configs/reaktor2.nix +++ b/krebs/2configs/reaktor2.nix @@ -235,20 +235,20 @@ let env.TASKDATA = "${stateDir}/${name}"; commands = rec { add.filename = pkgs.writers.writeDash "${name}-task-add" '' - ${pkgs.taskwarrior}/bin/task rc:${taskRcFile} add "$1" + ${pkgs.taskwarrior2}/bin/task rc:${taskRcFile} add "$1" ''; list.filename = pkgs.writers.writeDash "${name}-task-list" '' - ${pkgs.taskwarrior}/bin/task rc:${taskRcFile} export \ + ${pkgs.taskwarrior2}/bin/task rc:${taskRcFile} export \ | ${pkgs.jq}/bin/jq -r ' .[] | select(.id != 0) | "\(.id) \(.description)" ' ''; delete.filename = pkgs.writers.writeDash "${name}-task-delete" '' - ${pkgs.taskwarrior}/bin/task rc:${taskRcFile} delete "$1" + ${pkgs.taskwarrior2}/bin/task rc:${taskRcFile} delete "$1" ''; del = delete; done.filename = pkgs.writers.writeDash "${name}-task-done" '' - ${pkgs.taskwarrior}/bin/task rc:${taskRcFile} done "$1" + ${pkgs.taskwarrior2}/bin/task rc:${taskRcFile} done "$1" ''; }; }; @@ -456,7 +456,7 @@ in { printf 'HTTP/1.1 200 OK\r\n' printf 'Connection: close\r\n' printf '\r\n' - TASKDATA=/var/lib/reaktor2/agenda ${pkgs.taskwarrior}/bin/task rc:${taskRcFile} export + TASKDATA=/var/lib/reaktor2/agenda ${pkgs.taskwarrior2}/bin/task rc:${taskRcFile} export exit ;; esac -- cgit v1.3.1 From 904a6641bd2fee9400f38f801fa21fa4305479f8 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 21 Jan 2026 21:50:54 +0100 Subject: repo-sync: fix path to konsens ssh key --- krebs/2configs/repo-sync.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'krebs/2configs') diff --git a/krebs/2configs/repo-sync.nix b/krebs/2configs/repo-sync.nix index a488fdfea..126048625 100644 --- a/krebs/2configs/repo-sync.nix +++ b/krebs/2configs/repo-sync.nix @@ -98,7 +98,7 @@ in { krebs.secret.files.konsens = { path = "/var/lib/konsens/.ssh/id_ed25519"; owner = konsens-user; - source-path = "${config.krebs.secret.directory}/konsens.id_ed25519>"; + source-path = "${config.krebs.secret.directory}/konsens.id_ed25519"; }; imports = [ -- cgit v1.3.1 From 345259d513c642ee4191ce93c51f2cf51a70b406 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 21 Jan 2026 22:15:12 +0100 Subject: buildbot-stockholm: RIP cgit.gum.r --- krebs/2configs/buildbot-stockholm.nix | 2 -- 1 file changed, 2 deletions(-) (limited to 'krebs/2configs') diff --git a/krebs/2configs/buildbot-stockholm.nix b/krebs/2configs/buildbot-stockholm.nix index 32452e010..c51d3c651 100644 --- a/krebs/2configs/buildbot-stockholm.nix +++ b/krebs/2configs/buildbot-stockholm.nix @@ -19,7 +19,6 @@ with import ../../lib/pure.nix { inherit lib; }; enable = true; repos = { disko.urls = [ - "http://cgit.gum.r/disko" "http://cgit.ni.r/disko" "http://cgit.orange.r/disko" ]; @@ -33,7 +32,6 @@ with import ../../lib/pure.nix { inherit lib; }; "http://cgit.orange.r/nix-writers" ]; stockholm.urls = [ - "http://cgit.gum.r/stockholm" "http://cgit.ni.r/stockholm" "http://cgit.orange.r/stockholm" ]; -- cgit v1.3.1 From 505faa5ee647129dac64d65354c2979cff592ea4 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 21 Jan 2026 22:17:56 +0100 Subject: repo-sync stockholm: update makefu remote --- krebs/2configs/repo-sync.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'krebs/2configs') diff --git a/krebs/2configs/repo-sync.nix b/krebs/2configs/repo-sync.nix index 126048625..df0f2fc22 100644 --- a/krebs/2configs/repo-sync.nix +++ b/krebs/2configs/repo-sync.nix @@ -107,7 +107,7 @@ in { desc = "take all computers hostage, they love it"; section = "configuration"; remotes = { - makefu = "http://cgit.gum.r/stockholm"; + makefu = "https://cgit.euer.krebsco.de/makefu/stockholm.git"; tv = "http://cgit.ni.r/stockholm"; lassulus = "http://cgit.orange.r/stockholm"; }; -- cgit v1.3.1 From 5660788d09ba9b45508dc3364135632ed7dd6b8c Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 21 Jan 2026 22:18:44 +0100 Subject: repo-sync stockholm: sort remotes --- krebs/2configs/repo-sync.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'krebs/2configs') diff --git a/krebs/2configs/repo-sync.nix b/krebs/2configs/repo-sync.nix index df0f2fc22..9854b3dd5 100644 --- a/krebs/2configs/repo-sync.nix +++ b/krebs/2configs/repo-sync.nix @@ -107,9 +107,9 @@ in { desc = "take all computers hostage, they love it"; section = "configuration"; remotes = { + lassulus = "http://cgit.orange.r/stockholm"; makefu = "https://cgit.euer.krebsco.de/makefu/stockholm.git"; tv = "http://cgit.ni.r/stockholm"; - lassulus = "http://cgit.orange.r/stockholm"; }; }) ({ krebs.git = defineRepo { -- cgit v1.3.1 From ddf64ae39bb652b46dccc036c68202511c393c39 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 21 Jan 2026 22:19:10 +0100 Subject: repo-sync stockholm: add krebs remote --- krebs/2configs/repo-sync.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'krebs/2configs') diff --git a/krebs/2configs/repo-sync.nix b/krebs/2configs/repo-sync.nix index 9854b3dd5..1c7ed4719 100644 --- a/krebs/2configs/repo-sync.nix +++ b/krebs/2configs/repo-sync.nix @@ -107,6 +107,7 @@ in { desc = "take all computers hostage, they love it"; section = "configuration"; remotes = { + krebs = "https://github.com/krebs/stockholm"; lassulus = "http://cgit.orange.r/stockholm"; makefu = "https://cgit.euer.krebsco.de/makefu/stockholm.git"; tv = "http://cgit.ni.r/stockholm"; -- cgit v1.3.1 From f63817b3421dbf28b7101d73e6a710fd65d9bdcd Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 21 Jan 2026 22:28:20 +0100 Subject: x220: vaapiIntel -> intel-vaapi-driver & co. --- krebs/2configs/hw/x220.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'krebs/2configs') diff --git a/krebs/2configs/hw/x220.nix b/krebs/2configs/hw/x220.nix index a797673c9..937a20c29 100644 --- a/krebs/2configs/hw/x220.nix +++ b/krebs/2configs/hw/x220.nix @@ -17,8 +17,8 @@ }; hardware.opengl.extraPackages = [ - pkgs.vaapiIntel - pkgs.vaapiVdpau + pkgs.intel-vaapi-driver + pkgs.libva-vdpau-driver ]; services.xserver = { -- cgit v1.3.1