From 5a108052878d64c9bc7486b532a9806424b5d486 Mon Sep 17 00:00:00 2001
From: colin <colin@uninsane.org>
Date: Sat, 2 Jul 2022 23:53:55 -0700
Subject: [PATCH] hardware.opengl.extraPackages: move to machine-specific files

---
 machines/desko/default.nix  |  6 ++++++
 machines/lappy/default.nix  |  7 +++++++
 modules/hardware/x86_64.nix | 11 -----------
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/machines/desko/default.nix b/machines/desko/default.nix
index a2c0ec49..e9429ea7 100644
--- a/machines/desko/default.nix
+++ b/machines/desko/default.nix
@@ -15,6 +15,12 @@
   boot.loader.efi.canTouchEfiVariables = false;
   colinsane.image.extraBootFiles = [ pkgs.bootpart-uefi-x86_64 ];
 
+  hardware.opengl.extraPackages = with pkgs; [
+    rocm-opencl-icd
+    rocm-opencl-runtime
+    amdvlk
+  ];
+
   # needed to use libimobiledevice/ifuse, for iphone sync
   services.usbmuxd.enable = true;
 
diff --git a/machines/lappy/default.nix b/machines/lappy/default.nix
index 9c6b4a76..22063251 100644
--- a/machines/lappy/default.nix
+++ b/machines/lappy/default.nix
@@ -10,6 +10,13 @@
   boot.loader.efi.canTouchEfiVariables = false;
   colinsane.image.extraBootFiles = [ pkgs.bootpart-uefi-x86_64 ];
 
+  hardware.opengl.extraPackages = with pkgs; [
+    intel-compute-runtime
+    intel-media-driver  # new
+    libvdpau-va-gl      # new
+    vaapiIntel
+  ];
+
   # default config: https://man.archlinux.org/man/snapper-configs.5
   # defaults to something like:
   #   - hourly snapshots
diff --git a/modules/hardware/x86_64.nix b/modules/hardware/x86_64.nix
index 7e49ad1c..085b6bc0 100644
--- a/modules/hardware/x86_64.nix
+++ b/modules/hardware/x86_64.nix
@@ -40,17 +40,6 @@ with lib;
     # powertop will default to putting USB devices -- including HID -- to sleep after TWO SECONDS
     powerManagement.powertop.enable = false;
 
-    hardware.opengl.extraPackages = with pkgs; [
-      # laptop
-      intel-compute-runtime
-      intel-media-driver  # new
-      libvdpau-va-gl      # new
-      vaapiIntel
-      # desktop
-      rocm-opencl-icd
-      rocm-opencl-runtime
-      amdvlk
-    ];
     hardware.opengl.driSupport = true;
     # For 32 bit applications
     hardware.opengl.driSupport32Bit = true;