alexion/dev
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(nixos): inline VLAN names

Browse Source
This commit is contained in:
alexion
2026-10-07 21:28:20 -04:00
parent 3c80edd3c2
commit c5036228ea
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
configs/nixos/modules/network/vlans.nix
View File

@@ -7,7 +7,6 @@
# Configures bridges for tagged VLANs on a physical interface that uses DHCP. # Configures bridges for tagged VLANs on a physical interface that uses DHCP.
let let
cfg = config.modules.network.vlans; # NOLINT(let_order) cfg = config.modules.network.vlans; # NOLINT(let_order)
vlanName = id: "vlan${toString id}";
in in
{ {
options.modules.network.vlans = { options.modules.network.vlans = {
@@ -42,7 +41,7 @@ in
"interface-name:${cfg.interface}" "interface-name:${cfg.interface}"
] ]
++ map (id: "interface-name:${util.bridgeName id}") cfg.ids ++ map (id: "interface-name:${util.bridgeName id}") cfg.ids
++ map (id: "interface-name:${vlanName id}") cfg.ids; ++ map (id: "interface-name:vlan${toString id}") cfg.ids;
}; };
systemd.network = { systemd.network = {
@@ -56,9 +55,9 @@ in
Kind = "bridge"; Kind = "bridge";
}; };
}; };
"40-${vlanName id}" = { "40-vlan${toString id}" = {
netdevConfig = { netdevConfig = {
Name = vlanName id; Name = "vlan${toString id}";
Kind = "vlan"; Kind = "vlan";
}; };
vlanConfig.Id = id; vlanConfig.Id = id;
@@ -72,14 +71,14 @@ in
"10-${cfg.interface}" = { "10-${cfg.interface}" = {
matchConfig.Name = cfg.interface; matchConfig.Name = cfg.interface;
networkConfig.DHCP = "yes"; networkConfig.DHCP = "yes";
vlan = map vlanName cfg.ids; vlan = map (id: "vlan${toString id}") cfg.ids;
linkConfig.RequiredForOnline = "routable"; linkConfig.RequiredForOnline = "routable";
}; };
} }
] ]
++ map (id: { ++ map (id: {
"40-${vlanName id}" = { "40-vlan${toString id}" = {
matchConfig.Name = vlanName id; matchConfig.Name = "vlan${toString id}";
networkConfig.Bridge = util.bridgeName id; networkConfig.Bridge = util.bridgeName id;
linkConfig.RequiredForOnline = "no"; linkConfig.RequiredForOnline = "no";
}; };