CaZzzer/nix-conf
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WIP: router: attempt removing networkd, some bs testing

Browse Source
This commit is contained in:
Yuri Tatishchev 2025-03-08 13:06:11 -08:00
parent 3935e0316b
commit f640e3cb19
Signed by: CaZzzer
GPG Key ID: E0EBF441EA424369
1 changed files with 43 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
hosts/router/default.nix
View File

@ -230,8 +230,8 @@ let
matchConfig.Name = ifObj.name; matchConfig.Name = ifObj.name;
networkConfig = { networkConfig = {
IPv4Forwarding = true; IPv4Forwarding = true;
IPv6SendRA = true; IPv6SendRA = (ifObj.name != ifs.lan10.name); # TODO: temporary test, remove
Address = [ ifObj.addr4Sized ]; Address = [ ifObj.addr4Sized ifObj.addr6Sized ifObj.ulaAddrSized ];
}; };
ipv6Prefixes = [ ipv6Prefixes = [
{ {
@ -396,7 +396,7 @@ in
ifs.lan50.name ifs.lan50.name
]; ];
}; };
"30-vlan10" = mkLanConfig ifs.lan10; # "30-vlan10" = mkLanConfig ifs.lan10;
"30-vlan20" = mkLanConfig ifs.lan20 // { "30-vlan20" = mkLanConfig ifs.lan20 // {
routes = [ routes = [
{ {
@ -412,6 +412,43 @@ in
}; };
}; };
# networking.interfaces.${ifs.lan10.name} = {
# ipv4.addresses = [ { address = ifs.lan10.addr4; prefixLength = ifs.lan10.p4Size; } ];
# ipv6.addresses = [
# {
# address = ifs.lan10.addr6;
# prefixLength = ifs.lan10.p6Size;
# }
# {
# address = ifs.lan10.ulaAddr;
# prefixLength = ifs.lan10.ulaSize;
# }
# ];
# };
services.radvd.enable = true;
services.radvd.config = ''
interface ${ifs.lan10.name} {
RDNSS ${ifs.lan.ulaAddr} {
};
AdvSendAdvert on;
# MinRtrAdvInterval 3;
# MaxRtrAdvInterval 10;
AdvManagedFlag on;
# AdvOtherConfigFlag on;
prefix ${ifs.lan10.net6} {
AdvOnLink on;
AdvAutonomous on;
};
prefix ${ifs.lan10.ulaNet} {
AdvOnLink on;
AdvAutonomous on;
};
route ${ulaPrefix}::/48 {
};
};
'';
networking.firewall.enable = false; networking.firewall.enable = false;
networking.nftables.enable = true; networking.nftables.enable = true;
networking.nftables.tables.firewall = { networking.nftables.tables.firewall = {
@ -441,7 +478,8 @@ in
set port_forward_v6 { set port_forward_v6 {
type inet_proto . ipv6_addr . inet_service type inet_proto . ipv6_addr . inet_service
elements = { elements = {
tcp . ${ifs.lan.p6}::11:1 . https tcp . ${ifs.lan.p6}::11:1 . https,
tcp . ${ifs.lan.p6}:1cd5:56ff:feec:c74a . https,
} }
} }
@ -645,7 +683,7 @@ in
"@@||googleads.g.doubleclick.net" "@@||googleads.g.doubleclick.net"
] ]
# Alpina DNS rewrites # Alpina DNS rewrites
++ map (host: "${host}${domain}^$dnsrewrite=${ifs.lan.p6}::11:1") alpinaDomains ++ map (host: "${host}${domain}^$dnsrewrite=${ifs.lan.p6}:1cd5:56ff:feec:c74a") alpinaDomains
++ map (host: "${host}${domain}^$dnsrewrite=${ifs.lan.p4}.11") alpinaDomains; ++ map (host: "${host}${domain}^$dnsrewrite=${ifs.lan.p4}.11") alpinaDomains;
}; };