From c5036228ea3a41a3feb9f62be43480912230d6c7 Mon Sep 17 00:00:00 2001
From: alexion <contact@alexion.dev>
Date: Wed, 7 Oct 2026 21:28:20 -0400
Subject: [PATCH] refactor(nixos): inline VLAN names

---
 configs/nixos/modules/network/vlans.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/configs/nixos/modules/network/vlans.nix b/configs/nixos/modules/network/vlans.nix
index 87872dd..bf06a57 100644
--- a/configs/nixos/modules/network/vlans.nix
+++ b/configs/nixos/modules/network/vlans.nix
@@ -7,7 +7,6 @@
 # Configures bridges for tagged VLANs on a physical interface that uses DHCP.
 let
   cfg = config.modules.network.vlans; # NOLINT(let_order)
-  vlanName = id: "vlan${toString id}";
 in
 {
   options.modules.network.vlans = {
@@ -42,7 +41,7 @@ in
         "interface-name:${cfg.interface}"
       ]
       ++ 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 = {
@@ -56,9 +55,9 @@ in
               Kind = "bridge";
             };
           };
-          "40-${vlanName id}" = {
+          "40-vlan${toString id}" = {
             netdevConfig = {
-              Name = vlanName id;
+              Name = "vlan${toString id}";
               Kind = "vlan";
             };
             vlanConfig.Id = id;
@@ -72,14 +71,14 @@ in
             "10-${cfg.interface}" = {
               matchConfig.Name = cfg.interface;
               networkConfig.DHCP = "yes";
-              vlan = map vlanName cfg.ids;
+              vlan = map (id: "vlan${toString id}") cfg.ids;
               linkConfig.RequiredForOnline = "routable";
             };
           }
         ]
         ++ map (id: {
-          "40-${vlanName id}" = {
-            matchConfig.Name = vlanName id;
+          "40-vlan${toString id}" = {
+            matchConfig.Name = "vlan${toString id}";
             networkConfig.Bridge = util.bridgeName id;
             linkConfig.RequiredForOnline = "no";
           };