Merge 111d7c3baa into 52113c4f5c

Merge pull request #1668 from concatime/fix/rename-modules
Rename some modules to their correct names
2025-11-09 08:06:22 +01:00 · 2025-11-07 08:29:59 -05:00 · 2025-11-06 21:07:11 +00:00 · 2025-11-06 15:05:04 -05:00 · 2025-11-06 15:05:04 -05:00 · 2025-10-07 14:39:14 +02:00
8 changed files with 24 additions and 14 deletions
--- a/common/pc/laptop/default.nix
+++ b/common/pc/laptop/default.nix
@ -1,4 +1,9 @@
-{ config, lib, ... }:
+{
+  config,
+  lib,
+  options,
+  ...
+}:

 {
  imports = [ ../. ];
@ -7,7 +12,7 @@
  # However, these 2 services clash when enabled simultaneously.
  # https://github.com/NixOS/nixos-hardware/issues/260
  services.tlp.enable = lib.mkDefault (
-    (lib.versionOlder (lib.versions.majorMinor lib.version) "21.05")
-    || !config.services.power-profiles-daemon.enable
+    !(options.services ? power-profiles-daemon && config.services.power-profiles-daemon.enable)
+    && !(options.services ? tuned && config.services.tuned.enable)
  );
 }
--- a/dell/precision/7520/default.nix
+++ b/dell/precision/7520/default.nix
@ -15,7 +15,7 @@
  boot.initrd.availableKernelModules = [
    "xhci_pci"
    "ahci"
-    "usb_storage"
+    "usb-storage"
    "sd_mod"
    "rtsx_pci_sdmmc"
  ];
--- a/focus/m2/gen1/default.nix
+++ b/focus/m2/gen1/default.nix
@ -13,7 +13,7 @@
    "xhci_pci"
    "ahci"
    "nvme"
-    "usb_storage"
+    "usb-storage"
    "sd_mod"
    "rtsx_pci_sdmmc"
  ];
--- a/gpd/win-2/default.nix
+++ b/gpd/win-2/default.nix
@ -1,4 +1,9 @@
-{ config, lib, ... }:
+{
+  config,
+  lib,
+  options,
+  ...
+}:
 {
  imports = [
    ../../common/cpu/intel
@ -11,8 +16,8 @@
  ];

  services.tlp.enable = lib.mkDefault (
-    (lib.versionOlder (lib.versions.majorMinor lib.version) "21.05")
-    || !config.services.power-profiles-daemon.enable
+    !(options.services ? power-profiles-daemon && config.services.power-profiles-daemon.enable)
+    && !(options.services ? tuned && config.services.tuned.enable)
  );

  # Required for grub to properly display the boot menu.
--- a/purism/librem/5r4/initrd.nix
+++ b/purism/librem/5r4/initrd.nix
@ -14,7 +14,7 @@ lib.mkIf config.hardware.librem5.customInitrdModules {
      "tps6598x"
      "xhci_hcd"
      "usbcore"
-      "usb_storage"
+      "usb-storage"
      "uas"
      "xhci_plat_hcd"
    ];
@ -56,7 +56,7 @@ lib.mkIf config.hardware.librem5.customInitrdModules {
      "tps6598x"
      "xhci_hcd"
      "usbcore"
-      "usb_storage"
+      "usb-storage"
      "uas"
      "xhci_plat_hcd"
    ];
--- a/raspberry-pi/3/default.nix
+++ b/raspberry-pi/3/default.nix
@ -9,7 +9,7 @@
    kernelPackages = lib.mkDefault pkgs.linuxKernel.packages.linux_rpi3;
    initrd.availableKernelModules = [
      "usbhid"
-      "usb_storage"
+      "usb-storage"
    ];
  };

--- a/raspberry-pi/4/default.nix
+++ b/raspberry-pi/4/default.nix
@ -31,9 +31,9 @@
    kernelPackages = lib.mkDefault pkgs.linuxKernel.packages.linux_rpi4;
    initrd.availableKernelModules = [
      "usbhid"
-      "usb_storage"
+      "usb-storage"
      "vc4"
-      "pcie_brcmstb" # required for the pcie bus to work
+      "pcie-brcmstb" # required for the pcie bus to work
      "reset-raspberrypi" # required for vl805 firmware to load
    ]
    ++ lib.optional config.boot.initrd.network.enable "genet";
--- a/raspberry-pi/5/default.nix
+++ b/raspberry-pi/5/default.nix
@ -16,7 +16,7 @@ in
    initrd.availableKernelModules = [
      "nvme"
      "usbhid"
-      "usb_storage"
+      "usb-storage"
    ];
  };
Author	SHA1	Message	Date
Joaquín Triñanes	0ced18c940	Merge `111d7c3baa` into `52113c4f5c`	2025-11-07 08:29:59 -05:00
Jörg Thalheim	52113c4f5c	Merge pull request #1668 from concatime/fix/rename-modules Rename some modules to their correct names	2025-11-06 21:07:11 +00:00
Issam E. Maghni	fc4c7c6ec7	meta: rename module to pcie-brcmstb https://github.com/torvalds/linux/blob/v6.17/drivers/pci/controller/Makefile#L37	2025-11-06 15:05:04 -05:00
Issam E. Maghni	744975050f	meta: rename module to usb-storage https://github.com/torvalds/linux/blob/v6.17/drivers/usb/storage/Kconfig#L23-L24 > To compile this driver as a module, choose M here: the > module will be called usb-storage.	2025-11-06 15:05:04 -05:00
Joaquín Triñanes	111d7c3baa	laptop: check for tuned service before enabling tlp	2025-10-07 14:39:14 +02:00