tobias/nixos-hardware
1
0
Fork 0
mirror of https://github.com/NixOS/nixos-hardware.git synced 2025-11-09 16:16:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: tobias:4996a18d7504ea0435a1a7ee7511deb3bd03b3de
Branches Tags
tobias:master
tobias:tlp
tobias:feat/ucm-imx95-platform
tobias:bubuntux-master
tobias:lenovo-thinkpad-p14s-intel-gen2
tobias:497a-master
tobias:feat/system76-thelio-mega
tobias:steeb-k-master
tobias:ccritter-master
tobias:mergify/merge-queue/574e510513
tobias:redmibook-16-pro-2024
tobias:merge-when-green-joerg
tobias:raspberry-pi-5
tobias:libinput-x
tobias:yoga-slim-7
tobias:staging
tobias:trying
tobias:t14s-amd-deep-sleep
tobias:add-xps-9570
tobias:rpi
tobias:201810/x230-coreboot
tobias:yegortimoshenko-patch-1
tobias:20180406.101256/builtins.fetchGit
tobias:ci-better-tests
tobias:mnt-reform2-nitrogen8m-v1
tobias:not-a-release
...
compare: tobias:0ced18c9405a868127dbb7f293484b8ff2af065a
Branches Tags
tobias:master
tobias:tlp
tobias:feat/ucm-imx95-platform
tobias:bubuntux-master
tobias:lenovo-thinkpad-p14s-intel-gen2
tobias:497a-master
tobias:feat/system76-thelio-mega
tobias:steeb-k-master
tobias:ccritter-master
tobias:mergify/merge-queue/574e510513
tobias:redmibook-16-pro-2024
tobias:merge-when-green-joerg
tobias:raspberry-pi-5
tobias:libinput-x
tobias:yoga-slim-7
tobias:staging
tobias:trying
tobias:t14s-amd-deep-sleep
tobias:add-xps-9570
tobias:rpi
tobias:201810/x230-coreboot
tobias:yegortimoshenko-patch-1
tobias:20180406.101256/builtins.fetchGit
tobias:ci-better-tests
tobias:mnt-reform2-nitrogen8m-v1
tobias:not-a-release

5 commits
4996a18d75 ... 0ced18c940

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
8 changed files with 24 additions and 14 deletions
Show stats Expand all files Collapse all files

11
common/pc/laptop/default.nix
View file

@ -1,4 +1,9 @@
{ config, lib, ... }: {
config,
lib,
options,
...
}:
{ {
imports = [ ../. ]; imports = [ ../. ];
@ -7,7 +12,7 @@
# However, these 2 services clash when enabled simultaneously. # However, these 2 services clash when enabled simultaneously.
# https://github.com/NixOS/nixos-hardware/issues/260 # https://github.com/NixOS/nixos-hardware/issues/260
services.tlp.enable = lib.mkDefault ( services.tlp.enable = lib.mkDefault (
(lib.versionOlder (lib.versions.majorMinor lib.version) "21.05") !(options.services ? power-profiles-daemon && config.services.power-profiles-daemon.enable)
|| !config.services.power-profiles-daemon.enable && !(options.services ? tuned && config.services.tuned.enable)
); );
} }

2
dell/precision/7520/default.nix
View file

@ -15,7 +15,7 @@
boot.initrd.availableKernelModules = [ boot.initrd.availableKernelModules = [
"xhci_pci" "xhci_pci"
"ahci" "ahci"
"usb_storage" "usb-storage"
"sd_mod" "sd_mod"
"rtsx_pci_sdmmc" "rtsx_pci_sdmmc"
]; ];

2
focus/m2/gen1/default.nix
View file

@ -13,7 +13,7 @@
"xhci_pci" "xhci_pci"
"ahci" "ahci"
"nvme" "nvme"
"usb_storage" "usb-storage"
"sd_mod" "sd_mod"
"rtsx_pci_sdmmc" "rtsx_pci_sdmmc"
]; ];

11
gpd/win-2/default.nix
View file

@ -1,4 +1,9 @@
{ config, lib, ... }: {
config,
lib,
options,
...
}:
{ {
imports = [ imports = [
../../common/cpu/intel ../../common/cpu/intel
@ -11,8 +16,8 @@
]; ];
services.tlp.enable = lib.mkDefault ( services.tlp.enable = lib.mkDefault (
(lib.versionOlder (lib.versions.majorMinor lib.version) "21.05") !(options.services ? power-profiles-daemon && config.services.power-profiles-daemon.enable)
|| !config.services.power-profiles-daemon.enable && !(options.services ? tuned && config.services.tuned.enable)
); );
# Required for grub to properly display the boot menu. # Required for grub to properly display the boot menu.

4
purism/librem/5r4/initrd.nix
View file

@ -14,7 +14,7 @@ lib.mkIf config.hardware.librem5.customInitrdModules {
"tps6598x" "tps6598x"
"xhci_hcd" "xhci_hcd"
"usbcore" "usbcore"
"usb_storage" "usb-storage"
"uas" "uas"
"xhci_plat_hcd" "xhci_plat_hcd"
]; ];
@ -56,7 +56,7 @@ lib.mkIf config.hardware.librem5.customInitrdModules {
"tps6598x" "tps6598x"
"xhci_hcd" "xhci_hcd"
"usbcore" "usbcore"
"usb_storage" "usb-storage"
"uas" "uas"
"xhci_plat_hcd" "xhci_plat_hcd"
]; ];

2
raspberry-pi/3/default.nix
View file

@ -9,7 +9,7 @@
kernelPackages = lib.mkDefault pkgs.linuxKernel.packages.linux_rpi3; kernelPackages = lib.mkDefault pkgs.linuxKernel.packages.linux_rpi3;
initrd.availableKernelModules = [ initrd.availableKernelModules = [
"usbhid" "usbhid"
"usb_storage" "usb-storage"
]; ];
}; };

4
raspberry-pi/4/default.nix
View file

@ -31,9 +31,9 @@
kernelPackages = lib.mkDefault pkgs.linuxKernel.packages.linux_rpi4; kernelPackages = lib.mkDefault pkgs.linuxKernel.packages.linux_rpi4;
initrd.availableKernelModules = [ initrd.availableKernelModules = [
"usbhid" "usbhid"
"usb_storage" "usb-storage"
"vc4" "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 "reset-raspberrypi" # required for vl805 firmware to load
] ]
++ lib.optional config.boot.initrd.network.enable "genet"; ++ lib.optional config.boot.initrd.network.enable "genet";

2
raspberry-pi/5/default.nix
View file

@ -16,7 +16,7 @@ in
initrd.availableKernelModules = [ initrd.availableKernelModules = [
"nvme" "nvme"
"usbhid" "usbhid"
"usb_storage" "usb-storage"
]; ];
}; };