diff --git a/nix/os/devices/sj-srv1/system.nix b/nix/os/devices/sj-srv1/system.nix index a6498a4..d8c2797 100644 --- a/nix/os/devices/sj-srv1/system.nix +++ b/nix/os/devices/sj-srv1/system.nix @@ -6,7 +6,9 @@ nodeFlake, nodeName, ... -}: { +}: let + hostBridgeAddress = "192.168.101.1"; +in { imports = [ ../../snippets/systemd-resolved.nix ]; @@ -42,7 +44,7 @@ br0 = { ipv4.addresses = [ { - address = "192.168.101.1"; + address = hostBridgeAddress; prefixLength = 24; } ]; @@ -66,6 +68,9 @@ enable = true; matchConfig.Name = "eth0"; + linkConfig.RequiredForOnline = "carrier"; + networkConfig.LinkLocalAddressing = "no"; + # TODO: i'm not sure if and if so why this is required macvlan = [ "dmz0" @@ -134,7 +139,7 @@ autoStart = true; hostBridge = "br0"; - hostAddress = "192.168.101.1"; + hostAddress = hostBridgeAddress; localAddress = "192.168.101.10/24"; imapsPort = 993; @@ -151,7 +156,7 @@ autoStart = true; hostBridge = "br0"; - hostAddress = "192.168.101.1"; + hostAddress = hostBridgeAddress; localAddress = "192.168.101.11/24"; httpPort = 80; @@ -166,7 +171,7 @@ autoStart = true; hostBridge = "br0"; - hostAddress = "192.168.101.1"; + hostAddress = hostBridgeAddress; localAddress = "192.168.101.12/24"; syncthingPort = 22000;