refactor: use nixos-hardware GPU configs

Replace custom GPU config with ones from nixos-hardware.
This commit is contained in:
Felix Schröter 2023-11-28 00:09:59 +01:00
parent 531a407c08
commit c4ada51f15
Signed by: felschr
GPG key ID: 671E39E6744C807D
7 changed files with 4 additions and 45 deletions

View file

@ -134,6 +134,7 @@ rec {
inputs.nixos-hardware.nixosModules.common-pc
inputs.nixos-hardware.nixosModules.common-pc-ssd
inputs.nixos-hardware.nixosModules.common-cpu-intel
inputs.nixos-hardware.nixosModules.common-gpu-intel
(self.lib.createSystem "pilot1" {
hardwareConfig = ./hardware/pilot1.nix;
config = ./hosts/work-pc.nix;
@ -154,6 +155,7 @@ rec {
inputs.nixos-hardware.nixosModules.common-pc
inputs.nixos-hardware.nixosModules.common-pc-ssd
inputs.nixos-hardware.nixosModules.common-cpu-intel-kaby-lake
inputs.nixos-hardware.nixosModules.common-gpu-intel
inputs.matrix-appservices.nixosModule
(self.lib.createSystem "home-server" {
hardwareConfig = ./hardware/lattepanda.nix;

View file

@ -1,14 +0,0 @@
{ pkgs, ... }:
{
boot.initrd.kernelModules = [ "amdgpu" ];
hardware.opengl = {
driSupport = true;
driSupport32Bit = true;
extraPackages = with pkgs; [ libvdpau-va-gl vaapiVdpau ];
extraPackages32 = with pkgs.driversi686Linux; [ libvdpau-va-gl vaapiVdpau ];
};
environment.systemPackages = with pkgs; [ glxinfo vulkan-tools ];
}

View file

@ -1,27 +0,0 @@
{ config, lib, pkgs, ... }:
{
boot.initrd.kernelModules = [ "i915" ];
# kaby lake
boot.kernelParams = [ "i915.enable_guc=3" ];
environment.variables = {
VDPAU_DRIVER =
lib.mkIf config.hardware.opengl.enable (lib.mkDefault "va_gl");
};
hardware.opengl = {
extraPackages = with pkgs; [
intel-vaapi-driver
intel-media-driver
intel-compute-runtime
libvdpau-va-gl
];
extraPackages32 = with pkgs.driversi686Linux; [
intel-vaapi-driver
intel-media-driver
libvdpau-va-gl
];
};
}

View file

@ -1,4 +1,4 @@
{ config, lib, pkgs, modulesPath, ... }:
{ config, lib, ... }:
{
boot.initrd.availableKernelModules = [
@ -13,6 +13,7 @@
];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.kernelParams = [ "i915.enable_guc=3" ];
boot.extraModulePackages = [ ];
fileSystems."/" = {

View file

@ -3,7 +3,6 @@
{
imports = [
../hardware/base.nix
../hardware/gpu-amd.nix
../hardware/bluetooth.nix
../hardware/xbox.nix
../hardware/steam.nix

View file

@ -11,7 +11,6 @@ let
in {
imports = [
../hardware/base.nix
../hardware/gpu-intel.nix
../desktop/x11.nix
../system/server.nix
../virtualisation/containers.nix

View file

@ -3,7 +3,6 @@
{
imports = [
../hardware/base.nix
../hardware/gpu-intel.nix
../hardware/bluetooth.nix
../system/desktop.nix
../system/printing/home.nix