3 files changed, 8 insertions, 3 deletions
diff --git a/krebs/1systems/hotdog/config.nix b/krebs/1systems/hotdog/config.nix
index 0a103ed1a..91071ec85 100644
--- a/krebs/1systems/hotdog/config.nix
+++ b/krebs/1systems/hotdog/config.nix
@@ -6,7 +6,6 @@
     ../../../krebs/2configs
     ../../../krebs/2configs/nginx.nix
 
-    ../../../krebs/2configs/buildbot-stockholm.nix
     ../../../krebs/2configs/binary-cache/nixos.nix
     ../../../krebs/2configs/ircd.nix
     ../../../krebs/2configs/reaktor2.nix
@@ -15,6 +14,10 @@
     ../../../krebs/2configs/mud.nix
     ../../../krebs/2configs/repo-sync.nix
 
+    ../../../krebs/2configs/buildbot-stockholm.nix
+    #../../../krebs/2configs/buildbot/master.nix
+    #../../../krebs/2configs/buildbot/worker.nix
+
     ../../../krebs/2configs/cal.nix
     ../../../krebs/2configs/mastodon.nix
 
diff --git a/krebs/1systems/puyak/config.nix b/krebs/1systems/puyak/config.nix
index 60c1c941a..d3891af82 100644
--- a/krebs/1systems/puyak/config.nix
+++ b/krebs/1systems/puyak/config.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 {
   imports = [
     ./net.nix
@@ -73,6 +73,7 @@
 
     # hass.shack
     <stockholm/krebs/2configs/shack/glados>
+    <stockholm/krebs/2configs/shack/esphome.nix>
 
     # connect to git.shackspace.de as group runner for rz
     <stockholm/krebs/2configs/shack/gitlab-runner.nix>
@@ -170,4 +171,5 @@
     isNormalUser = true;
     shell = "/run/current-system/sw/bin/zsh";
   };
+  system.stateVersion = lib.mkForce "24.05";
 }
diff --git a/krebs/1systems/puyak/net.nix b/krebs/1systems/puyak/net.nix
index 59b22b380..fe2fd238e 100644
--- a/krebs/1systems/puyak/net.nix
+++ b/krebs/1systems/puyak/net.nix
@@ -14,7 +14,7 @@ in {
     interfaces."${ext-if}".ipv4.addresses = [
       {
         address = shack-ip;
-        prefixLength = 22;
+        prefixLength = 20;
       }
     ];