From 4e1a7389a8216e00cb8d16df6dfcc0cdc125edf5 Mon Sep 17 00:00:00 2001 From: Mel Date: Mon, 16 Mar 2026 15:41:56 +0100 Subject: Configure wpa_supplicant driven interfaces individually per machine Signed-off-by: Mel --- machines/serpentine/devices.nix | 6 ++++++ machines/wolfram/devices.nix | 2 ++ modules/wireless.nix | 6 +++--- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/machines/serpentine/devices.nix b/machines/serpentine/devices.nix index 700b198..65ab88a 100644 --- a/machines/serpentine/devices.nix +++ b/machines/serpentine/devices.nix @@ -18,6 +18,12 @@ }; }; + networking = { + useDHCP = true; + # currently unused! + # wireless.interfaces = [ ]; + }; + # trying out this fancy "trust" stuff! systemd.tpm2.enable = true; security.tpm2 = { diff --git a/machines/wolfram/devices.nix b/machines/wolfram/devices.nix index fa695c4..b33fb99 100644 --- a/machines/wolfram/devices.nix +++ b/machines/wolfram/devices.nix @@ -53,6 +53,8 @@ networking = { useDHCP = false; dhcpcd.enable = false; + + wireless.interfaces = [ "wlp6s0" ]; }; systemd.network = { enable = true; diff --git a/modules/wireless.nix b/modules/wireless.nix index beb0955..fdebd1d 100644 --- a/modules/wireless.nix +++ b/modules/wireless.nix @@ -1,4 +1,4 @@ -{ config, lib, ... }: +{ config, ... }: { age.secrets.wireless-secrets = { @@ -8,8 +8,8 @@ networking.wireless = { enable = true; - # force wpa_supplicant to use all wlan interfaces - interfaces = lib.mkForce [ ]; + # each machine which uses this module will configure their interface. + # interfaces = [ ]; secretsFile = config.age.secrets.wireless-secrets.path; networks = { -- cgit 1.4.1