From e7d17df90a40ecc4facd27bc3489d6df440d20ee Mon Sep 17 00:00:00 2001
From: "Chinmay D. Pai" <chinmaydpai@gmail.com>
Date: Wed, 9 Oct 2024 17:58:44 +0530
Subject: [PATCH] chore: remove chaotic/nyx from inputs and cleanup
 hardware.graphics

* remove unused graphics extraPackages from desktop installation
* rename vaapiIntel to intel-vaapi-driver
* remove chaotic mesa opencl library

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
---
 flake.nix                                       | 3 ---
 modules/nixos/desktop/default.nix               | 2 --
 modules/nixos/services/arr/jellyfin/default.nix | 2 +-
 systems/x86_64-linux/thonkpad/default.nix       | 5 -----
 4 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/flake.nix b/flake.nix
index 029bb6b..f98cbdf 100644
--- a/flake.nix
+++ b/flake.nix
@@ -19,7 +19,6 @@
 
       systems.modules.nixos = with inputs; [
         agenix.nixosModules.age
-        chaotic.nixosModules.default
         disko.nixosModules.disko
         srvos.nixosModules.common
         inputs.lanzaboote.nixosModules.lanzaboote
@@ -81,8 +80,6 @@
     agenix.inputs.nixpkgs.follows = "nixpkgs";
     agenix.inputs.home-manager.follows = "nixpkgs";
 
-    chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable";
-
     deploy-rs.url = "github:serokell/deploy-rs";
     deploy-rs.inputs.nixpkgs.follows = "nixpkgs";
 
diff --git a/modules/nixos/desktop/default.nix b/modules/nixos/desktop/default.nix
index d0a8b92..b8254d9 100644
--- a/modules/nixos/desktop/default.nix
+++ b/modules/nixos/desktop/default.nix
@@ -32,8 +32,6 @@
       enable = true;
       enable32Bit = true;
       extraPackages = with pkgs; [
-        vaapiIntel
-        libvdpau-va-gl
         vaapiVdpau
         intel-media-driver
       ];
diff --git a/modules/nixos/services/arr/jellyfin/default.nix b/modules/nixos/services/arr/jellyfin/default.nix
index 42a82cd..fe278eb 100644
--- a/modules/nixos/services/arr/jellyfin/default.nix
+++ b/modules/nixos/services/arr/jellyfin/default.nix
@@ -28,7 +28,7 @@
             withVpl = true;
           };
         };
-        vaapiIntel = pkgs.vaapiIntel.override {enableHybridCodec = true;};
+        intel-vaapi-driver = pkgs.intel-vaapi-driver.override {enableHybridCodec = true;};
       };
 
       environment.systemPackages = with pkgs; [
diff --git a/systems/x86_64-linux/thonkpad/default.nix b/systems/x86_64-linux/thonkpad/default.nix
index f6abc5a..e048e7c 100644
--- a/systems/x86_64-linux/thonkpad/default.nix
+++ b/systems/x86_64-linux/thonkpad/default.nix
@@ -6,13 +6,8 @@
 }: {
   imports = [./hardware.nix];
 
-  chaotic.mesa-git.enable = true;
-
   hardware.cpu.intel.updateMicrocode = true;
   hardware.enableRedistributableFirmware = true;
-  hardware.graphics.extraPackages = with pkgs; [
-    mesa_git.opencl
-  ];
 
   networking.hostName = "thonkpad";
   networking.interfaces.wlan0.useDHCP = lib.mkDefault false;