clanModules/wifi: refactor to use NetworkManager
Neither iwd, nor wpa_supplicant seem to be very reliable on some machines I tested. Also NetworkManager has generally the best GUI support so it makes sense to build ontop of it
This commit is contained in:
@@ -7,9 +7,18 @@
|
|||||||
|
|
||||||
let
|
let
|
||||||
cfg = config.clan.wifi;
|
cfg = config.clan.wifi;
|
||||||
secret_path =
|
|
||||||
|
inherit (lib)
|
||||||
|
concatMapAttrsStringSep
|
||||||
|
flip
|
||||||
|
mapAttrs
|
||||||
|
;
|
||||||
|
|
||||||
|
password_path =
|
||||||
network_name: config.clan.core.vars.generators."iwd.${network_name}".files.password.path;
|
network_name: config.clan.core.vars.generators."iwd.${network_name}".files.password.path;
|
||||||
|
|
||||||
ssid_path = network_name: config.clan.core.vars.generators."iwd.${network_name}".files.ssid.path;
|
ssid_path = network_name: config.clan.core.vars.generators."iwd.${network_name}".files.ssid.path;
|
||||||
|
|
||||||
secret_generator = name: value: {
|
secret_generator = name: value: {
|
||||||
name = "iwd.${name}";
|
name = "iwd.${name}";
|
||||||
value = {
|
value = {
|
||||||
@@ -49,61 +58,53 @@ in
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
config = lib.mkMerge [
|
config = lib.mkIf (cfg.networks != { }) {
|
||||||
(lib.mkIf (cfg.networks != { }) {
|
|
||||||
|
|
||||||
clan.core.vars.generators = lib.mapAttrs' secret_generator cfg.networks;
|
clan.core.vars.generators = lib.mapAttrs' secret_generator cfg.networks;
|
||||||
|
|
||||||
systemd.services.iwd.partOf = [ "nixos-activation.service" ];
|
networking.networkmanager.enable = true;
|
||||||
|
|
||||||
/*
|
networking.networkmanager.ensureProfiles.environmentFiles = [
|
||||||
script that generates iwd config files inside /var/lib/iwd/clan and symlinks
|
"/run/secrets/NetworkManager/wifi-secrets"
|
||||||
them to /var/lib/iwd.
|
|
||||||
*/
|
|
||||||
systemd.services.iwd.serviceConfig.ExecStartPre = pkgs.writeShellScript "clan-iwd-setup" ''
|
|
||||||
set -e
|
|
||||||
|
|
||||||
rm -rf /var/lib/iwd/clan
|
|
||||||
mkdir -p /var/lib/iwd/clan
|
|
||||||
|
|
||||||
# remove all existing symlinks in /var/lib/iwd
|
|
||||||
${pkgs.findutils}/bin/find /var/lib/iwd -type l -exec rm {} \;
|
|
||||||
|
|
||||||
${toString (
|
|
||||||
lib.mapAttrsToList (name: network: ''
|
|
||||||
passwd=$(cat "${secret_path name}")
|
|
||||||
ssid=$(cat "${ssid_path name}")
|
|
||||||
echo "
|
|
||||||
[Settings]
|
|
||||||
autoConnect=${if network.autoConnect then "true" else "false"}
|
|
||||||
[Security]
|
|
||||||
Passphrase=$passwd
|
|
||||||
" > "/var/lib/iwd/clan/$ssid.psk"
|
|
||||||
'') cfg.networks
|
|
||||||
)}
|
|
||||||
|
|
||||||
# link all files in /var/lib/iwd/clan to /var/lib/iwd
|
|
||||||
${pkgs.findutils}/bin/find /var/lib/iwd/clan -type f -exec ln -s {} /var/lib/iwd \;
|
|
||||||
'';
|
|
||||||
})
|
|
||||||
{
|
|
||||||
# disable wpa supplicant
|
|
||||||
networking.wireless.enable = false;
|
|
||||||
|
|
||||||
# Set the network manager backend to iwd
|
|
||||||
networking.networkmanager.wifi.backend = "iwd";
|
|
||||||
|
|
||||||
# Use iwd instead of wpa_supplicant. It has a user friendly CLI
|
|
||||||
networking.wireless.iwd = {
|
|
||||||
enable = true;
|
|
||||||
settings = {
|
|
||||||
Network = {
|
|
||||||
EnableIPv6 = true;
|
|
||||||
RoutePriorityOffset = 300;
|
|
||||||
};
|
|
||||||
Settings.autoConnect = true;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
];
|
];
|
||||||
|
|
||||||
|
networking.networkmanager.ensureProfiles.profiles = flip mapAttrs cfg.networks (
|
||||||
|
name: _network: {
|
||||||
|
connection.id = "$ssid_${name}";
|
||||||
|
connection.type = "wifi";
|
||||||
|
wifi.mode = "infrastructure";
|
||||||
|
wifi.ssid = "$ssid_${name}";
|
||||||
|
wifi-security.psk = "$pw_${name}";
|
||||||
|
wifi-security.key-mgmt = "wpa-psk";
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
# service to generate the environment file containing all secrets, as
|
||||||
|
# expected by the nixos NetworkManager-ensure-profile service
|
||||||
|
systemd.services.NetworkManager-setup-secrets = {
|
||||||
|
description = "Generate wifi secrets for NetworkManager";
|
||||||
|
requiredBy = [ "NetworkManager-ensure-profiles.service" ];
|
||||||
|
partOf = [ "NetworkManager-ensure-profiles.service" ];
|
||||||
|
before = [ "NetworkManager-ensure-profiles.service" ];
|
||||||
|
serviceConfig = {
|
||||||
|
Type = "oneshot";
|
||||||
|
ExecStart = pkgs.writeShellScript "wifi-secrets" ''
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
env_file=/run/secrets/NetworkManager/wifi-secrets
|
||||||
|
mkdir -p $(dirname "$env_file")
|
||||||
|
: > "$env_file"
|
||||||
|
|
||||||
|
# Generate the secrets file
|
||||||
|
echo "Generating wifi secrets file: $env_file"
|
||||||
|
${flip (concatMapAttrsStringSep "\n") cfg.networks (
|
||||||
|
name: _network: ''
|
||||||
|
echo "ssid_${name}=\"$(cat "${ssid_path name}")\"" >> /run/secrets/NetworkManager/wifi-secrets
|
||||||
|
echo "pw_${name}=\"$(cat "${password_path name}")\"" >> /run/secrets/NetworkManager/wifi-secrets
|
||||||
|
''
|
||||||
|
)}
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user