From 291c3ee610d94e39fa40f1051ebb14b56a57a5d9 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 13 Jun 2024 09:51:03 +0300 Subject: [PATCH] treewide: drop hardware.amdgpu.amdvlk option This is now provided in nixpkgs (see https://github.com/NixOS/nixpkgs/pull/318175). --- common/gpu/amd/default.nix | 12 ------------ lenovo/legion/15ach6h/nvidia/default.nix | 15 +++------------ lenovo/legion/16ach6h/nvidia/default.nix | 15 +++------------ lenovo/legion/16achg6/nvidia/default.nix | 7 ++----- 4 files changed, 8 insertions(+), 41 deletions(-) diff --git a/common/gpu/amd/default.nix b/common/gpu/amd/default.nix index 1347e82..26cd833 100644 --- a/common/gpu/amd/default.nix +++ b/common/gpu/amd/default.nix @@ -6,9 +6,6 @@ ) // { default = true; }; - options.hardware.amdgpu.amdvlk = lib.mkEnableOption (lib.mdDoc - "use amdvlk drivers instead mesa radv drivers" - ); options.hardware.amdgpu.opencl = lib.mkEnableOption (lib.mdDoc "rocm opencl runtime (Install rocmPackages.clr and rocmPackages.clr.icd)" ) // { @@ -27,15 +24,6 @@ (lib.mkIf config.hardware.amdgpu.loadInInitrd { boot.initrd.kernelModules = [ "amdgpu" ]; }) - (lib.mkIf config.hardware.amdgpu.amdvlk { - hardware.opengl.extraPackages = with pkgs; [ - amdvlk - ]; - - hardware.opengl.extraPackages32 = with pkgs; [ - driversi686Linux.amdvlk - ]; - }) (lib.mkIf config.hardware.amdgpu.opencl { hardware.opengl.extraPackages = if pkgs ? rocmPackages.clr diff --git a/lenovo/legion/15ach6h/nvidia/default.nix b/lenovo/legion/15ach6h/nvidia/default.nix index 31de5c1..ad62415 100644 --- a/lenovo/legion/15ach6h/nvidia/default.nix +++ b/lenovo/legion/15ach6h/nvidia/default.nix @@ -9,18 +9,9 @@ # because when writing the specialization of Dual-Direct GFX, I did not completely # remove all packages for amd igpu. I only removed amdgpu from # services.xserver.videoDrivers by overriding. This is because the specialization - # of nix cannot implement such an operation as canceling an import. In the end, if - # it is enabled in Dual-Direct GFX In the absence of amd igpu, the amdvlk package - # caused the proton to crash. In order to solve this problem, I add the option of - # whether to enable amdvlk to the configuration file of amd gpu, and open it by - # default, and turn it off in specialization, so as to delete amdvlk package and - # other packages for amd igpu in specialization. At the same time, I also added an - # option to amdgpu's opencl runtime. + # of nix cannot implement such an operation as canceling an import. hardware = { nvidia.prime.offload.enable = false; - amdgpu = { - amdvlk = false; - opencl = false; - }; + amdgpu.opencl = false; }; -} \ No newline at end of file +} diff --git a/lenovo/legion/16ach6h/nvidia/default.nix b/lenovo/legion/16ach6h/nvidia/default.nix index 31de5c1..ad62415 100644 --- a/lenovo/legion/16ach6h/nvidia/default.nix +++ b/lenovo/legion/16ach6h/nvidia/default.nix @@ -9,18 +9,9 @@ # because when writing the specialization of Dual-Direct GFX, I did not completely # remove all packages for amd igpu. I only removed amdgpu from # services.xserver.videoDrivers by overriding. This is because the specialization - # of nix cannot implement such an operation as canceling an import. In the end, if - # it is enabled in Dual-Direct GFX In the absence of amd igpu, the amdvlk package - # caused the proton to crash. In order to solve this problem, I add the option of - # whether to enable amdvlk to the configuration file of amd gpu, and open it by - # default, and turn it off in specialization, so as to delete amdvlk package and - # other packages for amd igpu in specialization. At the same time, I also added an - # option to amdgpu's opencl runtime. + # of nix cannot implement such an operation as canceling an import. hardware = { nvidia.prime.offload.enable = false; - amdgpu = { - amdvlk = false; - opencl = false; - }; + amdgpu.opencl = false; }; -} \ No newline at end of file +} diff --git a/lenovo/legion/16achg6/nvidia/default.nix b/lenovo/legion/16achg6/nvidia/default.nix index af0f2d6..aa292cd 100644 --- a/lenovo/legion/16achg6/nvidia/default.nix +++ b/lenovo/legion/16achg6/nvidia/default.nix @@ -5,9 +5,6 @@ services.xserver.videoDrivers = [ "nvidia" ]; hardware = { nvidia.prime.offload.enable = false; - amdgpu = { - amdvlk = false; - opencl = false; - }; + amdgpu.opencl = false; }; -} \ No newline at end of file +}