all repos — nixfiles @ 1db2e8348d166e78798f3bd20669ee2f7b92e368

System and user configuration, managed by nix and home-manager

nanopi: update network setting structure (logical no-op)

Alan Pearce
commit

1db2e8348d166e78798f3bd20669ee2f7b92e368

parent

c46e0e72210f0b4e977dab75ceccae51969523ae

1 file changed, 24 insertions(+), 36 deletions(-)

jump to
M system/nanopi.nixsystem/nanopi.nix
@@ -310,10 +310,8 @@ "fd12:d04f:65d:42::1/56"
]; addresses = [ { - addressConfig = { - Address = "fe80::1/64"; - Scope = "link"; - }; + Address = "fe80::1/64"; + Scope = "link"; } ]; networkConfig = {
@@ -347,13 +345,11 @@ };
ipv6AcceptRAConfig.UseDNS = false; routes = [ { - routeConfig = { - Gateway = "_dhcp4"; - Metric = 2048; - QuickAck = true; - InitialCongestionWindow = 30; - InitialAdvertisedReceiveWindow = 30; - }; + Gateway = "_dhcp4"; + Metric = 2048; + QuickAck = true; + InitialCongestionWindow = 30; + InitialAdvertisedReceiveWindow = 30; } ]; cakeConfig = {
@@ -394,30 +390,24 @@ UseGateway = false;
}; addresses = [ { - addressConfig = { - Address = "192.168.100.10/24"; - # Peer = "192.168.100.1/32"; - Label = "wan0:0"; - # Scope = "link"; - }; + Address = "192.168.100.10/24"; + # Peer = "192.168.100.1/32"; + Label = "wan0:0"; + # Scope = "link"; } ]; routes = [ { - routeConfig = { - Gateway = "_dhcp4"; - QuickAck = true; - InitialCongestionWindow = 30; - InitialAdvertisedReceiveWindow = 30; - }; + Gateway = "_dhcp4"; + QuickAck = true; + InitialCongestionWindow = 30; + InitialAdvertisedReceiveWindow = 30; } { - routeConfig = { - Gateway = "_ipv6ra"; - QuickAck = true; - InitialCongestionWindow = 30; - InitialAdvertisedReceiveWindow = 30; - }; + Gateway = "_ipv6ra"; + QuickAck = true; + InitialCongestionWindow = 30; + InitialAdvertisedReceiveWindow = 30; } ]; cakeConfig = {
@@ -445,13 +435,11 @@ RouteMetric = 2048;
}; routes = [ { - routeConfig = { - Metric = 2048; - Gateway = "_dhcp4"; - QuickAck = true; - InitialCongestionWindow = 30; - InitialAdvertisedReceiveWindow = 30; - }; + Metric = 2048; + Gateway = "_dhcp4"; + QuickAck = true; + InitialCongestionWindow = 30; + InitialAdvertisedReceiveWindow = 30; } ]; cakeConfig = {