From 980099f1ff81679c224b3f9ecd79ac5e50dfbcd2 Mon Sep 17 00:00:00 2001
From: Cian Hughes <chughes000@gmail.com>
Date: Mon, 14 Apr 2025 10:36:41 +0100
Subject: [PATCH] Updated graphics settings

---
 nixos/worklaptop/configuration.nix | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/nixos/worklaptop/configuration.nix b/nixos/worklaptop/configuration.nix
index b3ba300..f41cbd8 100644
--- a/nixos/worklaptop/configuration.nix
+++ b/nixos/worklaptop/configuration.nix
@@ -16,7 +16,22 @@
   nixpkgs.config.allowUnfree = true;
   nixpkgs.config.cudaSupport = true;
 
-  hardware.graphics.enable = true;
+  boot.blacklistedKernelModules = ["nouveau"];
+  hardware.enableRedistributableFirmware = true;
+  hardware.graphics = {
+    enable = true;
+    enable32Bit = true;
+    extraPackages = with pkgs; [
+      intel-compute-runtime
+      intel-media-driver
+      libglvnd
+      libvdpau-va-gl
+      mesa
+      nvidia-vaapi-driver
+      vaapiIntel
+      vaapiVdpau
+    ];
+  };
   hardware.nvidia = {
     # Modesetting is required.
     modesetting.enable = true;
@@ -32,6 +47,11 @@
     };
   };
   hardware.nvidia-container-toolkit.enable = true;
+  environment.sessionVariables = {
+    LIBVA_DRIVER_NAME = "iHD";
+    NIXOS_OZONE_WL = "1";
+    ELECTRON_OZONE_PLATFORM_HINT = "wayland";
+  };
 
   # Bootloader.
   boot = {
@@ -269,7 +289,6 @@
     withRuby = true;
   };
   programs.waybar.enable = true;
-  environment.sessionVariables.NIXOS_OZONE_WL = "1";
 
   # Enable my preferred DE utilities
   programs.thunar.enable = true;