diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2014-08-23 12:49:04 +0400 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2014-08-23 12:49:04 +0400 |
| commit | 0d95c5c647b7153e7d7d8d541ef01357b8cfdb33 (patch) | |
| tree | 09d0ac1f00a22dd40a6cfb92d118904652cb733b /nixos | |
| parent | a2f96adb3dddc66d51ce78ad20d8d5bb5204fdc9 (diff) | |
| parent | 02cb604fd6d77c2768df484219e752d7fbe5b877 (diff) | |
| download | nixlib-0d95c5c647b7153e7d7d8d541ef01357b8cfdb33.tar nixlib-0d95c5c647b7153e7d7d8d541ef01357b8cfdb33.tar.gz nixlib-0d95c5c647b7153e7d7d8d541ef01357b8cfdb33.tar.bz2 nixlib-0d95c5c647b7153e7d7d8d541ef01357b8cfdb33.tar.lz nixlib-0d95c5c647b7153e7d7d8d541ef01357b8cfdb33.tar.xz nixlib-0d95c5c647b7153e7d7d8d541ef01357b8cfdb33.tar.zst nixlib-0d95c5c647b7153e7d7d8d541ef01357b8cfdb33.zip | |
Merge pull request #3553 from vcunat/p/keyboards
initrd.availableKernelModules: add support for keyboards
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/profiles/all-hardware.nix | 4 | ||||
| -rw-r--r-- | nixos/modules/system/boot/kernel.nix | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/nixos/modules/profiles/all-hardware.nix b/nixos/modules/profiles/all-hardware.nix index 511c118e2bf5..6385ee69500f 100644 --- a/nixos/modules/profiles/all-hardware.nix +++ b/nixos/modules/profiles/all-hardware.nix @@ -8,7 +8,7 @@ { # The initrd has to contain any module that might be necessary for - # mounting the CD/DVD. + # supporting the most important parts of HW like drives. boot.initrd.availableKernelModules = [ # SATA/PATA support. "ahci" @@ -43,7 +43,7 @@ "virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon" "virtio_console" # Keyboards - "hid_apple" + "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 9beb7fabce12..79b173a6ead8 100644 --- a/nixos/modules/system/boot/kernel.nix +++ b/nixos/modules/system/boot/kernel.nix @@ -195,6 +195,7 @@ in "xhci_hcd" "usbhid" "hid_generic" + "hid_apple" "hid_logitech_dj" "hid_lenovo_tpkbd" "hid_roccat" # Unix domain sockets (needed by udev). "unix" |