aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarel Kočí <cynerd@email.cz>2025-01-19 21:08:54 +0100
committerKarel Kočí <cynerd@email.cz>2025-01-19 21:08:54 +0100
commit49499f75055ce669a439ecdcd964ad64cb591fd9 (patch)
tree36007fdb24cb181dfd7f894e15ce4089300fc22c
parent390c8c66a1b06498382a2d1acef0659eaf6fdae5 (diff)
downloadnixos-personal-49499f75055ce669a439ecdcd964ad64cb591fd9.tar.gz
nixos-personal-49499f75055ce669a439ecdcd964ad64cb591fd9.tar.bz2
nixos-personal-49499f75055ce669a439ecdcd964ad64cb591fd9.zip
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.
-rw-r--r--flake.lock8
-rw-r--r--nixos/modules/wifi-adm.nix10
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 = [
{