summaryrefslogtreecommitdiffstats
path: root/krebs/1systems
diff options
context:
space:
mode:
authorlassulus <git@lassul.us>2024-05-12 20:12:33 +0200
committerlassulus <git@lassul.us>2024-05-12 20:12:33 +0200
commit3e3e561ccaf8d21595aca14b739ff36db5ba0cdc (patch)
tree359fb7a1a225622cd0e97e5be08d9a4590da4f19 /krebs/1systems
parentf5cbad7145223bc3dd0eec6494483b7d6146da93 (diff)
parent406b9022555ba8f1f3babb3333340b8c74518a0c (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'krebs/1systems')
-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;
}
];