raspberry-pi: add usb-storage to common modules

Raspberry Pi 2 will now have it too.

raspberry-pi/2/default.nix

@@ -1,6 +1,8 @@
 { lib, pkgs, ... }:
 
 {
+  imports = [ ../common/default.nix ];
+
   boot = {
     consoleLogLevel = lib.mkDefault 7;
     kernelPackages = lib.mkDefault (

raspberry-pi/3/default.nix

@@ -5,10 +5,7 @@
     kernelPackages = lib.mkDefault (
       pkgs.linuxPackagesFor (pkgs.callPackage ../common/kernel.nix { rpiVersion = 3; })
     );
-    initrd.availableKernelModules = [
-      "usbhid"
-      "usb-storage"
-    ];
+    initrd.availableKernelModules = [ "usbhid" ];
   };
 
   # fix the following error :

raspberry-pi/4/default.nix

@@ -7,6 +7,7 @@
 
 {
   imports = [
+    ../common/default.nix
     ./audio.nix
     ./backlight.nix
     ./bluetooth.nix
@@ -33,7 +34,6 @@
     );
     initrd.availableKernelModules = [
       "usbhid"
-      "usb-storage"
       "vc4"
       "pcie-brcmstb" # required for the pcie bus to work
       "reset-raspberrypi" # required for vl805 firmware to load

raspberry-pi/5/default.nix

@@ -6,6 +6,8 @@
 }:
 
 {
+  imports = [ ../common/default.nix ];
+
   boot = {
     kernelPackages = lib.mkDefault (
       pkgs.linuxPackagesFor (pkgs.callPackage ../common/kernel.nix { rpiVersion = 5; })
@@ -13,7 +15,6 @@
     initrd.availableKernelModules = [
       "nvme"
       "usbhid"
-      "usb-storage"
     ];
   };
 

raspberry-pi/common/default.nix

@@ -0,0 +1 @@
+{ boot.initrd.availableKernelModules = [ "usb-storage" ]; }