about summary refs log tree commit diff
path: root/nixos/modules/system
diff options
context:
space:
mode:
authorFranz Pletz <fpletz@fnordicwalking.de>2017-10-12 16:32:01 +0200
committerGitHub <noreply@github.com>2017-10-12 16:32:01 +0200
commite13d0c3435a60e6873cb639291f1ed52de59da73 (patch)
tree061e4acafc139de5211cd44dfacf1d2d7a7ef3ff /nixos/modules/system
parent4cf0b6ba5d5ab5eb20a88449e0612f4dad8e4c29 (diff)
parent3855b7977c3f987d6c09bc809e33073d64956f72 (diff)
downloadnixlib-e13d0c3435a60e6873cb639291f1ed52de59da73.tar
nixlib-e13d0c3435a60e6873cb639291f1ed52de59da73.tar.gz
nixlib-e13d0c3435a60e6873cb639291f1ed52de59da73.tar.bz2
nixlib-e13d0c3435a60e6873cb639291f1ed52de59da73.tar.lz
nixlib-e13d0c3435a60e6873cb639291f1ed52de59da73.tar.xz
nixlib-e13d0c3435a60e6873cb639291f1ed52de59da73.tar.zst
nixlib-e13d0c3435a60e6873cb639291f1ed52de59da73.zip
Merge pull request #30172 from mayflower/cleanup/firmware-modules
nixos: clean up wifi firmware & default kernel modules
Diffstat (limited to 'nixos/modules/system')
-rw-r--r--nixos/modules/system/boot/kernel.nix17
1 files changed, 1 insertions, 16 deletions
diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix
index cf70a891c0ca..4db9631743e3 100644
--- a/nixos/modules/system/boot/kernel.nix
+++ b/nixos/modules/system/boot/kernel.nix
@@ -193,11 +193,6 @@ in
         "sd_mod"
         "sr_mod"
 
-        # Standard IDE stuff.
-        "ide_cd"
-        "ide_disk"
-        "ide_generic"
-
         # SD cards and internal eMMC drives.
         "mmc_block"
 
@@ -211,21 +206,11 @@ in
         "xhci_hcd"
         "xhci_pci"
         "usbhid"
-        "hid_generic" "hid_lenovo"
-        "hid_apple" "hid_logitech_dj" "hid_lenovo_tpkbd" "hid_roccat"
+        "hid_generic" "hid_lenovo" "hid_apple" "hid_roccat"
 
         # Misc. keyboard stuff.
         "pcips2" "atkbd" "i8042"
 
-        # Temporary fix for https://github.com/NixOS/nixpkgs/issues/18451
-        # Remove as soon as upstream gets fixed - marking it:
-        # TODO
-        # FIXME
-        "i8042"
-
-        # To wait for SCSI devices to appear.
-        "scsi_wait_scan"
-
         # Needed by the stage 2 init script.
         "rtc_cmos"
       ];