From b45bd0353ae2857ca6d0990860c0bf5c4bdb6f53 Mon Sep 17 00:00:00 2001
From: ChaosAttractor <lostattractor@gmail.com>
Date: Thu, 9 Feb 2023 12:41:39 +0800
Subject: [PATCH] Change lib.mkDefault to lib.mkOverride 990 for 
 hardware.nvidia.prime.offload.enable

Fix conflict to https://github.com/NixOS/nixpkgs/commit/2a7130d13a032093f5394ef0961842d1e1928789
---
 asus/rog-strix/g733qs/default.nix | 1 -
 common/gpu/nvidia/prime.nix       | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/asus/rog-strix/g733qs/default.nix b/asus/rog-strix/g733qs/default.nix
index b981aef..1515285 100644
--- a/asus/rog-strix/g733qs/default.nix
+++ b/asus/rog-strix/g733qs/default.nix
@@ -22,7 +22,6 @@
   boot.kernelPackages = lib.mkIf (lib.versionOlder pkgs.linux.version "5.12") (lib.mkDefault pkgs.linuxPackages_latest);
 
   hardware.nvidia.prime = {
-    offload.enable = lib.mkDefault true;
     amdgpuBusId = "PCI:5:0:0";
     nvidiaBusId = "PCI:1:0:1";
   };
diff --git a/common/gpu/nvidia/prime.nix b/common/gpu/nvidia/prime.nix
index 79cf9fd..d2ba65b 100644
--- a/common/gpu/nvidia/prime.nix
+++ b/common/gpu/nvidia/prime.nix
@@ -16,7 +16,7 @@ in {
   environment.systemPackages = [ nvidia-offload ];
 
   hardware.nvidia.prime = {
-    offload.enable = lib.mkDefault true;
+    offload.enable = lib.mkOverride 990 true;
     # Hardware should specify the bus ID for intel/nvidia devices
   };
 }