From 9ad075ca00d5b757448c4af61a338949dbb7842a Mon Sep 17 00:00:00 2001
From: "Issam E. Maghni" <issam.e.maghni@mailbox.org>
Date: Thu, 19 Feb 2026 07:55:18 -0500
Subject: [PATCH] raspberry-pi: add `usbhid` to common modules

Raspberry Pi 2 will now have it too.
---
 raspberry-pi/3/default.nix      | 1 -
 raspberry-pi/4/default.nix      | 1 -
 raspberry-pi/5/default.nix      | 5 +----
 raspberry-pi/common/default.nix | 7 ++++++-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/raspberry-pi/3/default.nix b/raspberry-pi/3/default.nix
index 5911e3e0..333f2d3f 100644
--- a/raspberry-pi/3/default.nix
+++ b/raspberry-pi/3/default.nix
@@ -5,7 +5,6 @@
     kernelPackages = lib.mkDefault (
       pkgs.linuxPackagesFor (pkgs.callPackage ../common/kernel.nix { rpiVersion = 3; })
     );
-    initrd.availableKernelModules = [ "usbhid" ];
   };
 
   # fix the following error :
diff --git a/raspberry-pi/4/default.nix b/raspberry-pi/4/default.nix
index 0b010afa..cf71bc73 100644
--- a/raspberry-pi/4/default.nix
+++ b/raspberry-pi/4/default.nix
@@ -33,7 +33,6 @@
       pkgs.linuxPackagesFor (pkgs.callPackage ../common/kernel.nix { rpiVersion = 4; })
     );
     initrd.availableKernelModules = [
-      "usbhid"
       "vc4"
       "pcie-brcmstb" # required for the pcie bus to work
       "reset-raspberrypi" # required for vl805 firmware to load
diff --git a/raspberry-pi/5/default.nix b/raspberry-pi/5/default.nix
index 079285b0..1b83252d 100644
--- a/raspberry-pi/5/default.nix
+++ b/raspberry-pi/5/default.nix
@@ -12,10 +12,7 @@
     kernelPackages = lib.mkDefault (
       pkgs.linuxPackagesFor (pkgs.callPackage ../common/kernel.nix { rpiVersion = 5; })
     );
-    initrd.availableKernelModules = [
-      "nvme"
-      "usbhid"
-    ];
+    initrd.availableKernelModules = [ "nvme" ];
   };
 
   # Needed for Xorg to start (https://github.com/raspberrypi-ui/gldriver-test/blob/master/usr/lib/systemd/scripts/rp1_test.sh)
diff --git a/raspberry-pi/common/default.nix b/raspberry-pi/common/default.nix
index 332884b4..8bfa0161 100644
--- a/raspberry-pi/common/default.nix
+++ b/raspberry-pi/common/default.nix
@@ -1 +1,6 @@
-{ boot.initrd.availableKernelModules = [ "usb-storage" ]; }
+{
+  boot.initrd.availableKernelModules = [
+    "usb-storage"
+    "usbhid"
+  ];
+}