summaryrefslogtreecommitdiffstats
path: root/krebs/1systems/puyak
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2024-05-22 19:56:07 +0200
committertv <tv@krebsco.de>2024-05-22 19:56:07 +0200
commit5316b58ab315970613ee76993ad4feb1a73826d0 (patch)
tree95c0f9a1e695b5a55a49599dbca472e80110b3a8 /krebs/1systems/puyak
parent04c9e3ecdd07c8b5afa5c9f335d9cc1ef467f925 (diff)
parent2245f90c40a31bb5b440b1a5a5019a57e51f4214 (diff)
Merge remote-tracking branch 'orange/master'
Diffstat (limited to 'krebs/1systems/puyak')
-rw-r--r--krebs/1systems/puyak/config.nix4
-rw-r--r--krebs/1systems/puyak/net.nix2
2 files changed, 4 insertions, 2 deletions
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;
}
];