diff --git a/nixos/modules/hardware/all-hardware.nix b/nixos/modules/hardware/all-hardware.nix new file mode 100644 index 000000000000..6ffd8b677686 --- /dev/null +++ b/nixos/modules/hardware/all-hardware.nix @@ -0,0 +1,174 @@ +# This module enables all hardware supported by NixOS: i.e., all +# firmware is included, and all devices from which one may boot are +# enabled in the initrd. Its primary use is in the NixOS installation +# CDs. + +{ + config, + lib, + pkgs, + ... +}: +let + platform = pkgs.stdenv.hostPlatform; +in +{ + + options = { + hardware.enableAllHardware = lib.mkEnableOption "Enable support for most hardware"; + }; + + config = lib.mkIf config.hardware.enableAllHardware { + + # The initrd has to contain any module that might be necessary for + # supporting the most important parts of HW like drives. + boot.initrd.availableKernelModules = + [ + # SATA/PATA support. + "ahci" + + "ata_piix" + + "sata_inic162x" + "sata_nv" + "sata_promise" + "sata_qstor" + "sata_sil" + "sata_sil24" + "sata_sis" + "sata_svw" + "sata_sx4" + "sata_uli" + "sata_via" + "sata_vsc" + + "pata_ali" + "pata_amd" + "pata_artop" + "pata_atiixp" + "pata_efar" + "pata_hpt366" + "pata_hpt37x" + "pata_hpt3x2n" + "pata_hpt3x3" + "pata_it8213" + "pata_it821x" + "pata_jmicron" + "pata_marvell" + "pata_mpiix" + "pata_netcell" + "pata_ns87410" + "pata_oldpiix" + "pata_pcmcia" + "pata_pdc2027x" + "pata_qdi" + "pata_rz1000" + "pata_serverworks" + "pata_sil680" + "pata_sis" + "pata_sl82c105" + "pata_triflex" + "pata_via" + "pata_winbond" + + # SCSI support (incomplete). + "3w-9xxx" + "3w-xxxx" + "aic79xx" + "aic7xxx" + "arcmsr" + "hpsa" + + # USB support, especially for booting from USB CD-ROM + # drives. + "uas" + + # SD cards. + "sdhci_pci" + + # NVMe drives + "nvme" + + # Firewire support. Not tested. + "ohci1394" + "sbp2" + + # Virtio (QEMU, KVM etc.) support. + "virtio_net" + "virtio_pci" + "virtio_mmio" + "virtio_blk" + "virtio_scsi" + "virtio_balloon" + "virtio_console" + + # VMware support. + "mptspi" + "vmxnet3" + "vsock" + ] + ++ lib.optional platform.isx86 "vmw_balloon" + ++ lib.optionals (pkgs.stdenv.hostPlatform.isi686 || pkgs.stdenv.hostPlatform.isx86_64) [ + "vmw_vmci" + "vmwgfx" + "vmw_vsock_vmci_transport" + + # Hyper-V support. + "hv_storvsc" + ] + ++ lib.optionals pkgs.stdenv.hostPlatform.isAarch [ + # Allwinner support + # Required for early KMS + "sun4i-drm" + "sun8i-mixer" # Audio, but required for kms + + # PWM for the backlight + "pwm-sun4i" + + # Broadcom + "vc4" + ] + ++ lib.optionals pkgs.stdenv.hostPlatform.isAarch64 [ + # Most of the following falls into two categories: + # - early KMS / early display + # - early storage (e.g. USB) support + + # Broadcom + + "pcie-brcmstb" + + # Rockchip + "dw-hdmi" + "dw-mipi-dsi" + "rockchipdrm" + "rockchip-rga" + "phy-rockchip-pcie" + "pcie-rockchip-host" + + # Misc. uncategorized hardware + + # Used for some platform's integrated displays + "panel-simple" + "pwm-bl" + + # Power supply drivers, some platforms need them for USB + "axp20x-ac-power" + "axp20x-battery" + "pinctrl-axp209" + "mp8859" + + # USB drivers + "xhci-pci-renesas" + + # Reset controllers + "reset-raspberrypi" # Triggers USB chip firmware load. + + # Misc "weak" dependencies + "analogix-dp" + "analogix-anx6345" # For DP or eDP (e.g. integrated display) + ]; + + # Include lots of firmware. + hardware.enableRedistributableFirmware = true; + }; +} diff --git a/nixos/modules/installer/cd-dvd/installation-cd-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-base.nix index 15304c995f10..90d49255b501 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-base.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-base.nix @@ -6,11 +6,12 @@ [ ./iso-image.nix # Profiles of this basic installation CD. - ../../profiles/all-hardware.nix ../../profiles/base.nix ../../profiles/installation-device.nix ]; + hardware.enableAllHardware = true; + # Adds terminus_font for people with HiDPI displays console.packages = options.console.packages.default ++ [ pkgs.terminus_font ]; diff --git a/nixos/modules/installer/netboot/netboot-base.nix b/nixos/modules/installer/netboot/netboot-base.nix index b969d2de6b67..360ef5646996 100644 --- a/nixos/modules/installer/netboot/netboot-base.nix +++ b/nixos/modules/installer/netboot/netboot-base.nix @@ -10,8 +10,9 @@ with lib; ./netboot.nix # Profiles of this basic netboot media - ../../profiles/all-hardware.nix ../../profiles/base.nix ../../profiles/installation-device.nix ]; + + hardware.enableAllHardware = true; } diff --git a/nixos/modules/installer/sd-card/sd-image.nix b/nixos/modules/installer/sd-card/sd-image.nix index 0e717a2b6a7a..3cf2b98ec9d7 100644 --- a/nixos/modules/installer/sd-card/sd-image.nix +++ b/nixos/modules/installer/sd-card/sd-image.nix @@ -29,7 +29,6 @@ in imports = [ (mkRemovedOptionModule [ "sdImage" "bootPartitionID" ] "The FAT partition for SD image now only holds the Raspberry Pi firmware files. Use firmwarePartitionID to configure that partition's ID.") (mkRemovedOptionModule [ "sdImage" "bootSize" ] "The boot files for SD image have been moved to the main ext4 partition. The FAT partition now only holds the Raspberry Pi firmware files. Changing its size may not be required.") - ../../profiles/all-hardware.nix ]; options.sdImage = { @@ -162,6 +161,8 @@ in }; config = { + hardware.enableAllHardware = true; + fileSystems = { "/boot/firmware" = { device = "/dev/disk/by-label/${config.sdImage.firmwarePartitionName}"; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 8a3e8b898a9a..a16837df3b92 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -48,6 +48,7 @@ ./config/zram.nix ./hardware/acpilight.nix ./hardware/all-firmware.nix + ./hardware/all-hardware.nix ./hardware/apple-touchbar.nix ./hardware/bladeRF.nix ./hardware/brillo.nix diff --git a/nixos/modules/profiles/all-hardware.nix b/nixos/modules/profiles/all-hardware.nix index 970b76cfbfdf..fac333b09ea8 100644 --- a/nixos/modules/profiles/all-hardware.nix +++ b/nixos/modules/profiles/all-hardware.nix @@ -1,117 +1,5 @@ -# This module enables all hardware supported by NixOS: i.e., all -# firmware is included, and all devices from which one may boot are -# enabled in the initrd. Its primary use is in the NixOS installation -# CDs. - -{ pkgs, lib,... }: -let - platform = pkgs.stdenv.hostPlatform; -in +# Set `hardware.enableAllHardware = true` instead of importing this file. +# This file provides backwards compatibility for older configurations. { - - # The initrd has to contain any module that might be necessary for - # supporting the most important parts of HW like drives. - boot.initrd.availableKernelModules = - [ # SATA/PATA support. - "ahci" - - "ata_piix" - - "sata_inic162x" "sata_nv" "sata_promise" "sata_qstor" - "sata_sil" "sata_sil24" "sata_sis" "sata_svw" "sata_sx4" - "sata_uli" "sata_via" "sata_vsc" - - "pata_ali" "pata_amd" "pata_artop" "pata_atiixp" "pata_efar" - "pata_hpt366" "pata_hpt37x" "pata_hpt3x2n" "pata_hpt3x3" - "pata_it8213" "pata_it821x" "pata_jmicron" "pata_marvell" - "pata_mpiix" "pata_netcell" "pata_ns87410" "pata_oldpiix" - "pata_pcmcia" "pata_pdc2027x" "pata_qdi" "pata_rz1000" - "pata_serverworks" "pata_sil680" "pata_sis" - "pata_sl82c105" "pata_triflex" "pata_via" - "pata_winbond" - - # SCSI support (incomplete). - "3w-9xxx" "3w-xxxx" "aic79xx" "aic7xxx" "arcmsr" "hpsa" - - # USB support, especially for booting from USB CD-ROM - # drives. - "uas" - - # SD cards. - "sdhci_pci" - - # NVMe drives - "nvme" - - # Firewire support. Not tested. - "ohci1394" "sbp2" - - # Virtio (QEMU, KVM etc.) support. - "virtio_net" "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_scsi" "virtio_balloon" "virtio_console" - - # VMware support. - "mptspi" "vmxnet3" "vsock" - ] ++ lib.optional platform.isx86 "vmw_balloon" - ++ lib.optionals (pkgs.stdenv.hostPlatform.isi686 || pkgs.stdenv.hostPlatform.isx86_64) [ - "vmw_vmci" "vmwgfx" "vmw_vsock_vmci_transport" - - # Hyper-V support. - "hv_storvsc" - ] ++ lib.optionals pkgs.stdenv.hostPlatform.isAarch [ - # Allwinner support - # Required for early KMS - "sun4i-drm" - "sun8i-mixer" # Audio, but required for kms - - # PWM for the backlight - "pwm-sun4i" - - # Broadcom - "vc4" - ] ++ lib.optionals pkgs.stdenv.hostPlatform.isAarch64 [ - # Most of the following falls into two categories: - # - early KMS / early display - # - early storage (e.g. USB) support - - # Broadcom - - "pcie-brcmstb" - - # Rockchip - "dw-hdmi" - "dw-mipi-dsi" - "rockchipdrm" - "rockchip-rga" - "phy-rockchip-pcie" - "pcie-rockchip-host" - - # Misc. uncategorized hardware - - # Used for some platform's integrated displays - "panel-simple" - "pwm-bl" - - # Power supply drivers, some platforms need them for USB - "axp20x-ac-power" - "axp20x-battery" - "pinctrl-axp209" - "mp8859" - - # USB drivers - "xhci-pci-renesas" - - # Reset controllers - "reset-raspberrypi" # Triggers USB chip firmware load. - - # Misc "weak" dependencies - "analogix-dp" - "analogix-anx6345" # For DP or eDP (e.g. integrated display) - ]; - - # Include lots of firmware. - hardware.enableRedistributableFirmware = true; - - imports = - [ ../hardware/network/zydas-zd1211.nix ]; - + hardware.enableAllHardware = true; }