From 49499f75055ce669a439ecdcd964ad64cb591fd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Sun, 19 Jan 2025 21:08:54 +0100 Subject: nixos/wifi-adm: correctly configure wifi This is required because networkd would otherwise try to configure the interface when it can't be included in the bridge. --- flake.lock | 8 ++++---- nixos/modules/wifi-adm.nix | 10 ++++++++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 724dc3e..4ce4cbc 100644 --- a/flake.lock +++ b/flake.lock @@ -348,11 +348,11 @@ }, "personal-secret": { "locked": { - "lastModified": 1735639306, - "narHash": "sha256-uGuPL2TImNjtkrGnWR0P6gLYHf8DrxSm+I/2773c2fw=", + "lastModified": 1737306019, + "narHash": "sha256-XXrP6fZwG5jXDHAakvhIeSZlNJJ/ZwYgekuL2i2ANXY=", "ref": "refs/heads/master", - "rev": "8589154e62e67b7c0c09eff0c02adab7cd18c8a9", - "revCount": 120, + "rev": "e975c3ce7c68245523bea96e5ecdaab118f0d5cc", + "revCount": 121, "type": "git", "url": "ssh://git@cynerd.cz/nixos-personal-secret" }, diff --git a/nixos/modules/wifi-adm.nix b/nixos/modules/wifi-adm.nix index 7d6b5a6..63dc19a 100644 --- a/nixos/modules/wifi-adm.nix +++ b/nixos/modules/wifi-adm.nix @@ -91,7 +91,10 @@ in { }; systemd.network.networks = { "lan-${cnf.ar9287.interface}" = { - matchConfig.Name = cnf.ar9287.interface; + matchConfig = { + Name = cnf.ar9287.interface; + WLANInterfaceType = "ap"; + }; networkConfig.Bridge = "brlan"; bridgeVLANs = [ { @@ -121,7 +124,10 @@ in { ]; }; "lan-${cnf.qca988x.interface}" = { - matchConfig.Name = cnf.qca988x.interface; + matchConfig = { + Name = cnf.qca988x.interface; + WLANInterfaceType = "ap"; + }; networkConfig.Bridge = "brlan"; bridgeVLANs = [ { -- cgit v1.2.3