From 9aa563a37158b86a990c61334b2d41ab9d04e055 Mon Sep 17 00:00:00 2001 From: kekrby Date: Mon, 12 Sep 2022 20:36:24 +0300 Subject: [PATCH] t2-iso-minimal, t2-iso-gnome: switch to wpa_supplicant from iwd See https://github.com/kekrby/nixos-hardware/commit/8a8b616ad0755a61317ab85dd48a8001d8a44861 for the rationale. --- flake.lock | 6 +++--- nix/t2-iso-minimal.nix | 5 ----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/flake.lock b/flake.lock index 4416697..a06fb85 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixos-hardware": { "locked": { - "lastModified": 1662994796, - "narHash": "sha256-vN3kdE2D3g+3TSMd4ypMueZYoQHqXJyKwG7ASb9i4Ek=", + "lastModified": 1663003743, + "narHash": "sha256-DuwO1TgtJOG//KazwT/MIy7Rnnm/erggii6vikzHTsY=", "owner": "kekrby", "repo": "nixos-hardware", - "rev": "6389cb2f12a925922927d64643c3a181f3a0542d", + "rev": "8a8b616ad0755a61317ab85dd48a8001d8a44861", "type": "github" }, "original": { diff --git a/nix/t2-iso-minimal.nix b/nix/t2-iso-minimal.nix index 5b66e01..fd18312 100644 --- a/nix/t2-iso-minimal.nix +++ b/nix/t2-iso-minimal.nix @@ -10,11 +10,6 @@ # ZFS is broken and prevents building without this nixpkgs.config.allowBroken = true; - # iwd is preferred because wpa_supplicant does not work well (though wpa_cli seems to work fine for some reason) - # wpa_supplicant is enabled by a module imported by the installation CD module so it is turned off so that it does not conflict with iwd - networking.wireless.iwd.enable = true; - networking.wireless.enable = false; - environment.systemPackages = with pkgs; [ vim ];