diff options
author | Franz Pletz <fpletz@fnordicwalking.de> | 2017-10-07 01:42:52 +0200 |
---|---|---|
committer | Franz Pletz <fpletz@fnordicwalking.de> | 2017-10-07 01:48:03 +0200 |
commit | 3855b7977c3f987d6c09bc809e33073d64956f72 (patch) | |
tree | 831456e41e74dd14d422abb4de12085fc87b9b38 /nixos | |
parent | 3df126dbf742f984b226f974ecfa649c70eb634e (diff) | |
download | nixlib-3855b7977c3f987d6c09bc809e33073d64956f72.tar nixlib-3855b7977c3f987d6c09bc809e33073d64956f72.tar.gz nixlib-3855b7977c3f987d6c09bc809e33073d64956f72.tar.bz2 nixlib-3855b7977c3f987d6c09bc809e33073d64956f72.tar.lz nixlib-3855b7977c3f987d6c09bc809e33073d64956f72.tar.xz nixlib-3855b7977c3f987d6c09bc809e33073d64956f72.tar.zst nixlib-3855b7977c3f987d6c09bc809e33073d64956f72.zip |
nixos: clean up kernel modules
* the keyboard modules in all-hardware.nix are already defaults of boot.initrd.availableKernelModules * ide modules, hid_lenovo_tpkbd and scsi_wait_scan have been removed because they're not available anymore * i8042 was a duplicate (see few lines abowe)
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/profiles/all-hardware.nix | 5 | ||||
-rw-r--r-- | nixos/modules/system/boot/kernel.nix | 17 |
2 files changed, 2 insertions, 20 deletions
diff --git a/nixos/modules/profiles/all-hardware.nix b/nixos/modules/profiles/all-hardware.nix index 6e6ae98e19fc..3c7e516c497f 100644 --- a/nixos/modules/profiles/all-hardware.nix +++ b/nixos/modules/profiles/all-hardware.nix @@ -41,15 +41,12 @@ # Virtio (QEMU, KVM etc.) support. "virtio_net" "virtio_pci" "virtio_blk" "virtio_scsi" "virtio_balloon" "virtio_console" - + # VMware support. "mptspi" "vmw_balloon" "vmwgfx" "vmw_vmci" "vmw_vsock_vmci_transport" "vmxnet3" "vsock" # Hyper-V support. "hv_storvsc" - - # Keyboards - "usbhid" "hid_apple" "hid_logitech_dj" "hid_lenovo_tpkbd" "hid_roccat" ]; # Include lots of firmware. 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" ]; |