From 860d801a12964a4ba563bf651a37d7e79f06dfc9 Mon Sep 17 00:00:00 2001
From: Aly Raffauf <aly@raffauflabs.com>
Date: Fri, 21 Jun 2024 16:33:54 -0400
Subject: [PATCH] move intel-vaapi-driver overrides to overlays

---
 hosts/fallarbor/hardware.nix          | 6 ------
 hosts/petalburg/hardware.nix          | 5 -----
 hosts/rustboro/hardware.nix           | 7 +------
 nixosModules/base/nixpkgs/default.nix | 5 +++--
 4 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/hosts/fallarbor/hardware.nix b/hosts/fallarbor/hardware.nix
index 68c29e8f..def7efdf 100644
--- a/hosts/fallarbor/hardware.nix
+++ b/hosts/fallarbor/hardware.nix
@@ -21,13 +21,7 @@
     kernelModules = ["kvm-intel"];
   };
 
-  # Intel drivers with accelerated video playback support.
   nixpkgs = {
-    config.packageOverrides = pkgs: {
-      intel-vaapi-driver =
-        pkgs.intel-vaapi-driver.override {enableHybridCodec = true;};
-    };
-
     hostPlatform = lib.mkDefault "x86_64-linux";
   };
 
diff --git a/hosts/petalburg/hardware.nix b/hosts/petalburg/hardware.nix
index 1949b962..b6af5e61 100644
--- a/hosts/petalburg/hardware.nix
+++ b/hosts/petalburg/hardware.nix
@@ -24,11 +24,6 @@
 
   # Intel drivers with accelerated video playback support.
   nixpkgs = {
-    config.packageOverrides = pkgs: {
-      intel-vaapi-driver =
-        pkgs.intel-vaapi-driver.override {enableHybridCodec = true;};
-    };
-
     hostPlatform = lib.mkDefault "x86_64-linux";
   };
 
diff --git a/hosts/rustboro/hardware.nix b/hosts/rustboro/hardware.nix
index 8e7fe474..59d39b4c 100644
--- a/hosts/rustboro/hardware.nix
+++ b/hosts/rustboro/hardware.nix
@@ -36,14 +36,9 @@
   };
 
   nixpkgs = {
-    config.packageOverrides = pkgs: {
-      # Intel drivers with accelerated video playback support.
-      intel-vaapi-driver =
-        pkgs.intel-vaapi-driver.override {enableHybridCodec = true;};
-    };
-
     hostPlatform = lib.mkDefault "x86_64-linux";
   };
+
   hardware = {
     cpu.intel.updateMicrocode =
       lib.mkDefault config.hardware.enableRedistributableFirmware;
diff --git a/nixosModules/base/nixpkgs/default.nix b/nixosModules/base/nixpkgs/default.nix
index 7c07947d..ea98a7f4 100644
--- a/nixosModules/base/nixpkgs/default.nix
+++ b/nixosModules/base/nixpkgs/default.nix
@@ -34,12 +34,12 @@
             accent = "mauve";
           };
           catppuccin-plymouth = prev.catppuccin-plymouth.override {variant = "frappe";};
-          nerdfonts = prev.nerdfonts.override {fonts = ["Noto"];};
           google-chrome = prev.google-chrome.override {commandLineArgs = "--gtk-version=4 --enable-wayland-ime";};
           hyprland = inputs.hyprland.packages.${pkgs.system}.hyprland;
           hyprnome = unstable.hyprnome;
           hyprshot = unstable.hyprshot;
-          xdg-desktop-portal-hyprland = inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland;
+          intel-vaapi-driver = prev.intel-vaapi-driver.override {enableHybridCodec = true;};
+          nerdfonts = prev.nerdfonts.override {fonts = ["Noto"];};
           obsidian = prev.obsidian.overrideAttrs (old: {
             installPhase =
               builtins.replaceStrings ["--ozone-platform=wayland"]
@@ -55,6 +55,7 @@
               ["--ozone-platform-hint=auto --enable-wayland-ime"]
               old.installPhase;
           });
+          xdg-desktop-portal-hyprland = inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland;
         })
       ];
     };