aires/nixos-hardware
aires/nixos-hardware
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge #571

Browse source 
571: common/gpu/intel*: Migrate to common/gpu/intel/* and add disable r=Mic92 a=Kiskae



Co-authored-by: Kiskae <Kiskae@users.noreply.github.com>
This commit is contained in:
bors[bot] 2023-02-28 13:40:39 +00:00 committed by GitHub
parent 0d55271b4f d7a5d6a29a
commit 77de4cd09d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 32 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/cpu/intel/default.nix
View file

@ -1,6 +1,6 @@
{ {
imports = [ imports = [
./cpu-only.nix ./cpu-only.nix
../../gpu/intel.nix ../../gpu/intel
]; ];
} }

16
common/gpu/intel.nix
View file

@ -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
View 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
View 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" ];
}

2
dell/xps/13-9300/default.nix
View file

@ -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

3
flake.nix
View file

@ -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;