commit 08783a39b0fcf8d257fb2c3a708f29d5e3fad04f · pyrox.dev/nixpkgs

+86 -79

nixos/modules/hardware/all-hardware.nix

···

       3
       3
        
       # enabled in the initrd.  Its primary use is in the NixOS installation

     

       4
       4
        
       # CDs.

     

       5
       5
        
       

     

       6
       6
       -
       { pkgs, lib,... }:

     

       6
       6
       +
       { config, lib, pkgs, ... }:

     

       7
       7
        
       let

     

       8
       8
        
         platform = pkgs.stdenv.hostPlatform;

     

       9
       9
        
       in

     

       10
       10
        
       {

     

       11
       11
        
       

     

       12
       12
       -
         # The initrd has to contain any module that might be necessary for

     

       13
       13
       -
         # supporting the most important parts of HW like drives.

     

       14
       14
       -
         boot.initrd.availableKernelModules =

     

       15
       15
       -
           [ # SATA/PATA support.

     

       16
       16
       -
             "ahci"

     

       12
       12
       +
         options = {

     

       13
       13
       +
           hardware.enableAllHardware = lib.mkEnableOption "Enable support for most hardware";

     

       14
       14
       +
         };

     

       17
       15
        
       

     

       18
       18
       -
             "ata_piix"

     

       16
       16
       +
         config = lib.mkIf config.hardware.enableAllHardware {

     

       19
       17
        
       

     

       20
       20
       -
             "sata_inic162x" "sata_nv" "sata_promise" "sata_qstor"

     

       21
       21
       -
             "sata_sil" "sata_sil24" "sata_sis" "sata_svw" "sata_sx4"

     

       22
       22
       -
             "sata_uli" "sata_via" "sata_vsc"

     

       18
       18
       +
           # The initrd has to contain any module that might be necessary for

     

       19
       19
       +
           # supporting the most important parts of HW like drives.

     

       20
       20
       +
           boot.initrd.availableKernelModules =

     

       21
       21
       +
             [ # SATA/PATA support.

     

       22
       22
       +
               "ahci"

     

       23
       23
        
       

     

       24
       24
       -
             "pata_ali" "pata_amd" "pata_artop" "pata_atiixp" "pata_efar"

     

       25
       25
       -
             "pata_hpt366" "pata_hpt37x" "pata_hpt3x2n" "pata_hpt3x3"

     

       26
       26
       -
             "pata_it8213" "pata_it821x" "pata_jmicron" "pata_marvell"

     

       27
       27
       -
             "pata_mpiix" "pata_netcell" "pata_ns87410" "pata_oldpiix"

     

       28
       28
       -
             "pata_pcmcia" "pata_pdc2027x" "pata_qdi" "pata_rz1000"

     

       29
       29
       -
             "pata_serverworks" "pata_sil680" "pata_sis"

     

       30
       30
       -
             "pata_sl82c105" "pata_triflex" "pata_via"

     

       31
       31
       -
             "pata_winbond"

     

       24
       24
       +
               "ata_piix"

     

       25
       25
       +
       

     

       26
       26
       +
               "sata_inic162x" "sata_nv" "sata_promise" "sata_qstor"

     

       27
       27
       +
               "sata_sil" "sata_sil24" "sata_sis" "sata_svw" "sata_sx4"

     

       28
       28
       +
               "sata_uli" "sata_via" "sata_vsc"

     

       29
       29
       +
       

     

       30
       30
       +
               "pata_ali" "pata_amd" "pata_artop" "pata_atiixp" "pata_efar"

     

       31
       31
       +
               "pata_hpt366" "pata_hpt37x" "pata_hpt3x2n" "pata_hpt3x3"

     

       32
       32
       +
               "pata_it8213" "pata_it821x" "pata_jmicron" "pata_marvell"

     

       33
       33
       +
               "pata_mpiix" "pata_netcell" "pata_ns87410" "pata_oldpiix"

     

       34
       34
       +
               "pata_pcmcia" "pata_pdc2027x" "pata_qdi" "pata_rz1000"

     

       35
       35
       +
               "pata_serverworks" "pata_sil680" "pata_sis"

     

       36
       36
       +
               "pata_sl82c105" "pata_triflex" "pata_via"

     

       37
       37
       +
               "pata_winbond"

     

       32
       38
        
       

     

       33
       33
       -
             # SCSI support (incomplete).

     

       34
       34
       -
             "3w-9xxx" "3w-xxxx" "aic79xx" "aic7xxx" "arcmsr" "hpsa"

     

       39
       39
       +
               # SCSI support (incomplete).

     

       40
       40
       +
               "3w-9xxx" "3w-xxxx" "aic79xx" "aic7xxx" "arcmsr" "hpsa"

     

       35
       41
        
       

     

       36
       36
       -
             # USB support, especially for booting from USB CD-ROM

     

       37
       37
       -
             # drives.

     

       38
       38
       -
             "uas"

     

       42
       42
       +
               # USB support, especially for booting from USB CD-ROM

     

       43
       43
       +
               # drives.

     

       44
       44
       +
               "uas"

     

       39
       45
        
       

     

       40
       40
       -
             # SD cards.

     

       41
       41
       -
             "sdhci_pci"

     

       46
       46
       +
               # SD cards.

     

       47
       47
       +
               "sdhci_pci"

     

       42
       48
        
       

     

       43
       43
       -
             # NVMe drives

     

       44
       44
       -
             "nvme"

     

       49
       49
       +
               # NVMe drives

     

       50
       50
       +
               "nvme"

     

       45
       51
        
       

     

       46
       46
       -
             # Firewire support.  Not tested.

     

       47
       47
       -
             "ohci1394" "sbp2"

     

       52
       52
       +
               # Firewire support.  Not tested.

     

       53
       53
       +
               "ohci1394" "sbp2"

     

       48
       54
        
       

     

       49
       49
       -
             # Virtio (QEMU, KVM etc.) support.

     

       50
       50
       -
             "virtio_net" "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_scsi" "virtio_balloon" "virtio_console"

     

       55
       55
       +
               # Virtio (QEMU, KVM etc.) support.

     

       56
       56
       +
               "virtio_net" "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_scsi" "virtio_balloon" "virtio_console"

     

       51
       57
        
       

     

       52
       52
       -
             # VMware support.

     

       53
       53
       -
             "mptspi" "vmxnet3" "vsock"

     

       54
       54
       -
           ] ++ lib.optional platform.isx86 "vmw_balloon"

     

       55
       55
       -
           ++ lib.optionals (pkgs.stdenv.hostPlatform.isi686 || pkgs.stdenv.hostPlatform.isx86_64) [

     

       56
       56
       -
             "vmw_vmci" "vmwgfx" "vmw_vsock_vmci_transport"

     

       58
       58
       +
               # VMware support.

     

       59
       59
       +
               "mptspi" "vmxnet3" "vsock"

     

       60
       60
       +
             ] ++ lib.optional platform.isx86 "vmw_balloon"

     

       61
       61
       +
             ++ lib.optionals (pkgs.stdenv.hostPlatform.isi686 || pkgs.stdenv.hostPlatform.isx86_64) [

     

       62
       62
       +
               "vmw_vmci" "vmwgfx" "vmw_vsock_vmci_transport"

     

       57
       63
        
       

     

       58
       58
       -
             # Hyper-V support.

     

       59
       59
       -
             "hv_storvsc"

     

       60
       60
       -
           ] ++ lib.optionals pkgs.stdenv.hostPlatform.isAarch [

     

       61
       61
       -
             # Allwinner support

     

       62
       62
       -
             # Required for early KMS

     

       63
       63
       -
             "sun4i-drm"

     

       64
       64
       -
             "sun8i-mixer" # Audio, but required for kms

     

       64
       64
       +
               # Hyper-V support.

     

       65
       65
       +
               "hv_storvsc"

     

       66
       66
       +
             ] ++ lib.optionals pkgs.stdenv.hostPlatform.isAarch [

     

       67
       67
       +
               # Allwinner support

     

       68
       68
       +
               # Required for early KMS

     

       69
       69
       +
               "sun4i-drm"

     

       70
       70
       +
               "sun8i-mixer" # Audio, but required for kms

     

       65
       71
        
       

     

       66
       66
       -
             # PWM for the backlight

     

       67
       67
       -
             "pwm-sun4i"

     

       72
       72
       +
               # PWM for the backlight

     

       73
       73
       +
               "pwm-sun4i"

     

       68
       74
        
       

     

       69
       69
       -
             # Broadcom

     

       70
       70
       -
             "vc4"

     

       71
       71
       -
           ] ++ lib.optionals pkgs.stdenv.hostPlatform.isAarch64 [

     

       72
       72
       -
             # Most of the following falls into two categories:

     

       73
       73
       -
             #  - early KMS / early display

     

       74
       74
       -
             #  - early storage (e.g. USB) support

     

       75
       75
       +
               # Broadcom

     

       76
       76
       +
               "vc4"

     

       77
       77
       +
             ] ++ lib.optionals pkgs.stdenv.hostPlatform.isAarch64 [

     

       78
       78
       +
               # Most of the following falls into two categories:

     

       79
       79
       +
               #  - early KMS / early display

     

       80
       80
       +
               #  - early storage (e.g. USB) support

     

       75
       81
        
       

     

       76
       76
       -
             # Broadcom

     

       82
       82
       +
               # Broadcom

     

       77
       83
        
       

     

       78
       78
       -
             "pcie-brcmstb"

     

       84
       84
       +
               "pcie-brcmstb"

     

       79
       85
        
       

     

       80
       80
       -
             # Rockchip

     

       81
       81
       -
             "dw-hdmi"

     

       82
       82
       -
             "dw-mipi-dsi"

     

       83
       83
       -
             "rockchipdrm"

     

       84
       84
       -
             "rockchip-rga"

     

       85
       85
       -
             "phy-rockchip-pcie"

     

       86
       86
       -
             "pcie-rockchip-host"

     

       86
       86
       +
               # Rockchip

     

       87
       87
       +
               "dw-hdmi"

     

       88
       88
       +
               "dw-mipi-dsi"

     

       89
       89
       +
               "rockchipdrm"

     

       90
       90
       +
               "rockchip-rga"

     

       91
       91
       +
               "phy-rockchip-pcie"

     

       92
       92
       +
               "pcie-rockchip-host"

     

       87
       93
        
       

     

       88
       88
       -
             # Misc. uncategorized hardware

     

       94
       94
       +
               # Misc. uncategorized hardware

     

       89
       95
        
       

     

       90
       90
       -
             # Used for some platform's integrated displays

     

       91
       91
       -
             "panel-simple"

     

       92
       92
       -
             "pwm-bl"

     

       96
       96
       +
               # Used for some platform's integrated displays

     

       97
       97
       +
               "panel-simple"

     

       98
       98
       +
               "pwm-bl"

     

       93
       99
        
       

     

       94
       94
       -
             # Power supply drivers, some platforms need them for USB

     

       95
       95
       -
             "axp20x-ac-power"

     

       96
       96
       -
             "axp20x-battery"

     

       97
       97
       -
             "pinctrl-axp209"

     

       98
       98
       -
             "mp8859"

     

       100
       100
       +
               # Power supply drivers, some platforms need them for USB

     

       101
       101
       +
               "axp20x-ac-power"

     

       102
       102
       +
               "axp20x-battery"

     

       103
       103
       +
               "pinctrl-axp209"

     

       104
       104
       +
               "mp8859"

     

       99
       105
        
       

     

       100
       100
       -
             # USB drivers

     

       101
       101
       -
             "xhci-pci-renesas"

     

       106
       106
       +
               # USB drivers

     

       107
       107
       +
               "xhci-pci-renesas"

     

       102
       108
        
       

     

       103
       103
       -
             # Reset controllers

     

       104
       104
       -
             "reset-raspberrypi" # Triggers USB chip firmware load.

     

       109
       109
       +
               # Reset controllers

     

       110
       110
       +
               "reset-raspberrypi" # Triggers USB chip firmware load.

     

       105
       111
        
       

     

       106
       106
       -
             # Misc "weak" dependencies

     

       107
       107
       -
             "analogix-dp"

     

       108
       108
       -
             "analogix-anx6345" # For DP or eDP (e.g. integrated display)

     

       109
       109
       -
           ];

     

       112
       112
       +
               # Misc "weak" dependencies

     

       113
       113
       +
               "analogix-dp"

     

       114
       114
       +
               "analogix-anx6345" # For DP or eDP (e.g. integrated display)

     

       115
       115
       +
             ];

     

       110
       116
        
       

     

       111
       111
       -
         # Include lots of firmware.

     

       112
       112
       -
         hardware.enableRedistributableFirmware = true;

     

       117
       117
       +
           # Include lots of firmware.

     

       118
       118
       +
           hardware.enableRedistributableFirmware = true;

     

       119
       119
       +
         };

     

       113
       120
        
       }

+2 -1

nixos/modules/installer/cd-dvd/installation-cd-base.nix

···

       6
       6
        
           [ ./iso-image.nix

     

       7
       7
        
       

     

       8
       8
        
             # Profiles of this basic installation CD.

     

       9
       9
       -
             ../../profiles/all-hardware.nix

     

       10
       9
        
             ../../profiles/base.nix

     

       11
       10
        
             ../../profiles/installation-device.nix

     

       12
       11
        
           ];

     

       12
       12
       +
       

     

       13
       13
       +
         hardware.enableAllHardware = true;

     

       13
       14
        
       

     

       14
       15
        
         # Adds terminus_font for people with HiDPI displays

     

       15
       16
        
         console.packages = options.console.packages.default ++ [ pkgs.terminus_font ];

+2 -1

nixos/modules/installer/netboot/netboot-base.nix

···

       10
       10
        
           ./netboot.nix

     

       11
       11
        
       

     

       12
       12
        
           # Profiles of this basic netboot media

     

       13
       13
       -
           ../../profiles/all-hardware.nix

     

       14
       13
        
           ../../profiles/base.nix

     

       15
       14
        
           ../../profiles/installation-device.nix

     

       16
       15
        
         ];

     

       16
       16
       +
       

     

       17
       17
       +
         hardware.enableAllHardware = true;

     

       17
       18
        
       }

+2 -1

nixos/modules/installer/sd-card/sd-image.nix

···

       29
       29
        
         imports = [

     

       30
       30
        
           (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.")

     

       31
       31
        
           (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.")

     

       32
       32
       -
           ../../profiles/all-hardware.nix

     

       33
       32
        
         ];

     

       34
       33
        
       

     

       35
       34
        
         options.sdImage = {

     
···

       162
       161
        
         };

     

       163
       162
        
       

     

       164
       163
        
         config = {

     

       164
       164
       +
           hardware.enableAllHardware = true;

     

       165
       165
       +
       

     

       165
       166
        
           fileSystems = {

     

       166
       167
        
             "/boot/firmware" = {

     

       167
       168
        
               device = "/dev/disk/by-label/${config.sdImage.firmwarePartitionName}";

nixos/modules/module-list.nix

···

       48
       48
        
         ./config/zram.nix

     

       49
       49
        
         ./hardware/acpilight.nix

     

       50
       50
        
         ./hardware/all-firmware.nix

     

       51
       51
       +
         ./hardware/all-hardware.nix

     

       51
       52
        
         ./hardware/apple-touchbar.nix

     

       52
       53
        
         ./hardware/bladeRF.nix

     

       53
       54
        
         ./hardware/brillo.nix

nixos/modules/profiles/all-hardware.nix

···

       1
       1
       +
       # Set `hardware.enableAllHardware = true` instead of importing this file.

     

       2
       2
       +
       # This file provides backwards compatibility for older configurations.

     

       3
       3
       +
       {

     

       4
       4
       +
         hardware.enableAllHardware = true;

     

       5
       5
       +
       }