From 9b1f59203adf4a527d61d3d24dca37817444917e Mon Sep 17 00:00:00 2001
From: "Ando \"Thor\" Nando" <divinegod@gmail.com>
Date: Mon, 11 May 2026 14:12:49 +1000
Subject: [PATCH 1/3] fix(wifi): remove iwd, rely only on wpa_supplicant

---
 nix/builders/nanopc-t6/base.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/nix/builders/nanopc-t6/base.nix b/nix/builders/nanopc-t6/base.nix
index ba0c3c4..0582449 100644
--- a/nix/builders/nanopc-t6/base.nix
+++ b/nix/builders/nanopc-t6/base.nix
@@ -69,6 +69,7 @@
     "nvme"
     "usbhid"
   ];
+
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [
     "rtw88_8822ce"
@@ -119,19 +120,19 @@
   # This allows a user to configure the dogebox by only plugging in power
   # Caveat: Upon configuring the OS with a proper Wi-Fi network, the user will
   # have to reconnect to that network and manually reload the dpanel page.
-  networking.wireless.iwd.enable = true;
+  networking.wireless.enable = lib.mkDefault true;
 
   services.create_ap = {
     enable = lib.mkDefault true;
     settings = {
       INTERNET_IFACE = "lo";
-      WIFI_IFACE = "wlan0";
+      WIFI_IFACE = "wlP3p49s0";
       SSID = "Dogebox";
       PASSPHRASE = "SuchPass";
     };
   };
 
-  networking.wireless.interfaces = [ "wlan0" ];
+  networking.wireless.interfaces = [ "wlP3p49s0" ];
 
   systemd.services.resizerootfs = {
     description = "Expands root filesystem of boot device on first boot";

From 3ce60958f54657445dc3291dca6789304443cbac Mon Sep 17 00:00:00 2001
From: "Ando \"Thor\" Nando" <divinegod@gmail.com>
Date: Mon, 11 May 2026 15:59:38 +1000
Subject: [PATCH 2/3] document why we use backport driver

---
 nix/builders/nanopc-t6/base.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nix/builders/nanopc-t6/base.nix b/nix/builders/nanopc-t6/base.nix
index 0582449..aef9b13 100644
--- a/nix/builders/nanopc-t6/base.nix
+++ b/nix/builders/nanopc-t6/base.nix
@@ -71,6 +71,9 @@
   ];
 
   boot.initrd.kernelModules = [ ];
+  # Load bearing backports in the rtw88 driver
+  # If these are removed, iwlist scan will crash
+  # https://github.com/lwfinger/rtw88/issues/418
   boot.kernelModules = [
     "rtw88_8822ce"
     "rtw88_pci"

From b9da9691771a5e5571e9de41164e48b44f02a944 Mon Sep 17 00:00:00 2001
From: "Ando \"Thor\" Nando" <divinegod@gmail.com>
Date: Mon, 18 May 2026 11:34:09 +1000
Subject: [PATCH 3/3] WIP: Remove backported modules

---
 nix/builders/nanopc-t6/base.nix | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/nix/builders/nanopc-t6/base.nix b/nix/builders/nanopc-t6/base.nix
index aef9b13..fef5a7e 100644
--- a/nix/builders/nanopc-t6/base.nix
+++ b/nix/builders/nanopc-t6/base.nix
@@ -71,20 +71,6 @@
   ];
 
   boot.initrd.kernelModules = [ ];
-  # Load bearing backports in the rtw88 driver
-  # If these are removed, iwlist scan will crash
-  # https://github.com/lwfinger/rtw88/issues/418
-  boot.kernelModules = [
-    "rtw88_8822ce"
-    "rtw88_pci"
-    "rtw88_core"
-  ];
-
-  boot.extraModulePackages =
-    let
-      rtw88 = config.boot.kernelPackages.callPackage ./rtw88 { };
-    in
-    [ rtw88 ];
 
   fileSystems."/" = {
     device = "/dev/disk/by-label/nixos";