Merge remote-tracking branch 'github/master'

5 files changed, 15 insertions, 12 deletions

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"
       ];
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 = {
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
 
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
diff --git a/krebs/2configs/repo-sync.nix b/krebs/2configs/repo-sync.nix
index a488fdfea..1c7ed4719 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 = [
@@ -107,9 +107,10 @@ in {
       desc = "take all computers hostage, they love it";
       section = "configuration";
       remotes = {
-        makefu = "http://cgit.gum.r/stockholm";
-        tv = "http://cgit.ni.r/stockholm";
+        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";
       };
     })
     ({ krebs.git = defineRepo {