From 51c788834739755c76c7d9c7bc510e5cbb593db6 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Mon, 23 Jun 2025 13:02:10 -0400
Subject: [PATCH] Add dhcpcd for USB tethering and use upstream linux-firmware.

---
 nix/configuration/configuration.nix         |  2 +-
 nix/configuration/roles/network/default.nix | 15 ++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/nix/configuration/configuration.nix b/nix/configuration/configuration.nix
index a95185c..3aae101 100644
--- a/nix/configuration/configuration.nix
+++ b/nix/configuration/configuration.nix
@@ -171,7 +171,7 @@
     pciutils # for lspci
     ripgrep
     strace
-    ltrace
+    # ltrace # Disabled because it uses more than 48GB of /tmp space during test phase.
     trace-cmd # ftrace
     tcpdump
     git-crypt
diff --git a/nix/configuration/roles/network/default.nix b/nix/configuration/roles/network/default.nix
index 1ba69d9..3d90f79 100644
--- a/nix/configuration/roles/network/default.nix
+++ b/nix/configuration/roles/network/default.nix
@@ -65,6 +65,7 @@
     ldns # for drill
     arp-scan # To find devices on the network
     wavemon
+    dhcpcd # For Android USB tethering.
   ];
 
   boot.extraModprobeConfig = ''
@@ -93,12 +94,12 @@
     # "net.ipv6.conf.default.use_tempaddr" = 2;
   };
 
-  nixpkgs.overlays = [
-    (final: prev: {
-      inherit (pkgs-dda3dcd3f)
-        linux-firmware
-        ;
-    })
-  ];
+  # nixpkgs.overlays = [
+  #   (final: prev: {
+  #     inherit (pkgs-dda3dcd3f)
+  #       linux-firmware
+  #       ;
+  #   })
+  # ];
 
 }