From 1156f4d66eadbe2de96be3b3fabb6c39b94ebf5e Mon Sep 17 00:00:00 2001
From: Martino Fontana <tinozzo123@tutanota.com>
Date: Fri, 17 Feb 2023 15:27:13 +0100
Subject: [PATCH 1/2] AMD: disable amdvlk install by default Nobody recommends
 using amdvlk over RADV. Also don't set environment variable that sets the use
 of RADV when installing amdvlk

---
 common/gpu/amd/default.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/common/gpu/amd/default.nix b/common/gpu/amd/default.nix
index e86bb01..f213ba9 100644
--- a/common/gpu/amd/default.nix
+++ b/common/gpu/amd/default.nix
@@ -8,9 +8,7 @@
   };
   options.hardware.amdgpu.amdvlk = lib.mkEnableOption (lib.mdDoc 
     "use amdvlk drivers instead mesa radv drivers"
-  ) // {
-    default = true;
-  };
+  );
   options.hardware.amdgpu.opencl = lib.mkEnableOption (lib.mdDoc 
     "rocm opencl runtime (Install rocm-opencl-icd and rocm-opencl-runtime)"
   ) // {
@@ -39,8 +37,6 @@
       hardware.opengl.extraPackages32 = with pkgs; [
         driversi686Linux.amdvlk
       ];
-      
-      environment.variables.AMD_VULKAN_ICD = lib.mkDefault "RADV";
     })
     (lib.mkIf config.hardware.amdgpu.opencl {
       hardware.opengl.extraPackages = with pkgs; [

From b4bf2550b36654399b26fcf436744f198658d203 Mon Sep 17 00:00:00 2001
From: Martino Fontana <tinozzo123@tutanota.com>
Date: Fri, 17 Feb 2023 15:28:07 +0100
Subject: [PATCH 2/2] AMD: don't install OpenCL by enabling amdvlk

---
 common/gpu/amd/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/common/gpu/amd/default.nix b/common/gpu/amd/default.nix
index f213ba9..c3b38c2 100644
--- a/common/gpu/amd/default.nix
+++ b/common/gpu/amd/default.nix
@@ -29,8 +29,6 @@
     })
     (lib.mkIf config.hardware.amdgpu.amdvlk {
       hardware.opengl.extraPackages = with pkgs; [
-        rocm-opencl-icd
-        rocm-opencl-runtime
         amdvlk
       ];