Compare commits

..

No commits in common. "543611983cd66449378ada55e33d6d0bff7a6e55" and "d40bdb7415e66cb9b646f1517a2ea6db3397439b" have entirely different histories.

4 changed files with 9 additions and 25 deletions

View file

@ -629,11 +629,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1720722856,
"narHash": "sha256-vTD9PK8X0rVrOkcRetSpTacRNbH/qZi8YdKBXxAC8GQ=",
"lastModified": 1717922286,
"narHash": "sha256-RsV7rNWYceglPDVgVukwYfoYK2fuAgyvyvSE/Gyah+Y=",
"owner": "chayleaf",
"repo": "nixpkgs",
"rev": "06bfe30652b5d4b56a800a09c29ada61adcede65",
"rev": "47c40a60d0952cd6b86c171898870142b0747602",
"type": "github"
},
"original": {

View file

@ -35,6 +35,8 @@ in
"net.ipv4.tcp_congestion_control" = "bbr";
};
networking.useDHCP = true;
/*
# as expected, systemd initrd and networking didn't work well, and i really cba to debug it
networking.useDHCP = false;
networking.useNetworkd = true;
@ -50,18 +52,8 @@ in
networks."10-dhcp" = {
DHCP = "yes";
name = "e*";
networkConfig = {
IPv6AcceptRA = "yes";
};
dhcpV4Config = {
ClientIdentifier = "mac";
DUIDType = "link-layer";
};
dhcpV6Config = {
DUIDType = "link-layer";
};
};
};
};*/
boot.initrd = {
/*systemd = {
@ -87,12 +79,10 @@ in
preLVMCommands = lib.mkOrder 499 ''
ip link set end0 address ${router-config.router-settings.serverInitrdMac} || ip link set eth0 address ${router-config.router-settings.serverInitrdMac} || true
'';
# postMountCommands = ''
# ip link set end0 address ${router-config.router-settings.serverMac} || ip link set eth0 address ${router-config.router-settings.serverMac} || true
# '';
postMountCommands = ''
ip link set end0 address ${router-config.router-settings.serverMac} || ip link set eth0 address ${router-config.router-settings.serverInitrdMac} || true
'';
network.enable = true;
network.flushBeforeStage2 = true;
network.udhcpc.enable = true;
network.udhcpc.extraArgs = [ "-t100" ];
network.ssh = {
enable = true;

View file

@ -296,7 +296,6 @@ in {
{ ipAddress = lightBulbAddress6;
macAddress = cfg.lightBulbMac; }
{ ipAddress = serverInitrdAddress6;
duid = cfg.serverInitrdDuid;
macAddress = cfg.serverInitrdMac; }
];

View file

@ -70,11 +70,6 @@
description = "server's mac address in initrd";
type = lib.types.str;
};
serverInitrdDuid = lib.mkOption {
description = "server's duid in initrd";
type = with lib.types; nullOr str;
default = null;
};
vacuumMac = lib.mkOption {
description = "robot vacuum's mac address";
type = lib.types.str;