common/gpu/intel*: Migrate to common/gpu/intel/* and add disable
This commit is contained in:
parent
2a483ad9cd
commit
d7a5d6a29a
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./cpu-only.nix
|
./cpu-only.nix
|
||||||
../../gpu/intel.nix
|
../../gpu/intel
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,15 +1,11 @@
|
||||||
{ config, lib, pkgs, ... }:
|
|
||||||
|
|
||||||
{
|
{
|
||||||
boot.initrd.kernelModules = [ "i915" ];
|
imports = [ ./intel ];
|
||||||
|
|
||||||
environment.variables = {
|
warnings = [
|
||||||
VDPAU_DRIVER = lib.mkIf config.hardware.opengl.enable (lib.mkDefault "va_gl");
|
''
|
||||||
};
|
DEPRECATED: The <nixos-hardware/common/gpu/intel.nix> module has been deprecated.
|
||||||
|
|
||||||
hardware.opengl.extraPackages = with pkgs; [
|
Switch to using <nixos-hardware/common/gpu/intel> instead.
|
||||||
vaapiIntel
|
''
|
||||||
libvdpau-va-gl
|
|
||||||
intel-media-driver
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
15
common/gpu/intel/default.nix
Normal file
15
common/gpu/intel/default.nix
Normal file
|
@ -0,0 +1,15 @@
|
||||||
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
boot.initrd.kernelModules = [ "i915" ];
|
||||||
|
|
||||||
|
environment.variables = {
|
||||||
|
VDPAU_DRIVER = lib.mkIf config.hardware.opengl.enable (lib.mkDefault "va_gl");
|
||||||
|
};
|
||||||
|
|
||||||
|
hardware.opengl.extraPackages = with pkgs; [
|
||||||
|
vaapiIntel
|
||||||
|
libvdpau-va-gl
|
||||||
|
intel-media-driver
|
||||||
|
];
|
||||||
|
}
|
7
common/gpu/intel/disable.nix
Normal file
7
common/gpu/intel/disable.nix
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
{ lib, ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
boot.blacklistedKernelModules = lib.mkDefault [ "i915" ];
|
||||||
|
# KMS will load the module, regardless of blacklisting
|
||||||
|
boot.kernelParams = lib.mkDefault [ "i915.modeset=0" ];
|
||||||
|
}
|
|
@ -6,7 +6,7 @@ let
|
||||||
in {
|
in {
|
||||||
imports = [
|
imports = [
|
||||||
../../../common/cpu/intel
|
../../../common/cpu/intel
|
||||||
../../../common/gpu/intel.nix
|
../../../common/gpu/intel
|
||||||
../../../common/pc/laptop
|
../../../common/pc/laptop
|
||||||
../../../common/pc/laptop/acpi_call.nix
|
../../../common/pc/laptop/acpi_call.nix
|
||||||
../../../common/pc/ssd
|
../../../common/pc/ssd
|
||||||
|
|
|
@ -172,7 +172,8 @@
|
||||||
common-gpu-amd = import ./common/gpu/amd;
|
common-gpu-amd = import ./common/gpu/amd;
|
||||||
common-gpu-amd-sea-islands = import ./common/gpu/amd/sea-islands;
|
common-gpu-amd-sea-islands = import ./common/gpu/amd/sea-islands;
|
||||||
common-gpu-amd-southern-islands = import ./common/gpu/amd/southern-islands;
|
common-gpu-amd-southern-islands = import ./common/gpu/amd/southern-islands;
|
||||||
common-gpu-intel = import ./common/gpu/intel.nix;
|
common-gpu-intel = import ./common/gpu/intel;
|
||||||
|
common-gpu-intel-disable = import ./common/gpu/intel/disable.nix;
|
||||||
common-gpu-nvidia = import ./common/gpu/nvidia/prime.nix;
|
common-gpu-nvidia = import ./common/gpu/nvidia/prime.nix;
|
||||||
common-gpu-nvidia-nonprime = import ./common/gpu/nvidia;
|
common-gpu-nvidia-nonprime = import ./common/gpu/nvidia;
|
||||||
common-gpu-nvidia-disable = import ./common/gpu/nvidia/disable.nix;
|
common-gpu-nvidia-disable = import ./common/gpu/nvidia/disable.nix;
|
||||||
|
|
Loading…
Reference in a new issue