From 504893e09108db7a0dfca0c3fab6f22476a8f4b3 Mon Sep 17 00:00:00 2001 From: Guanran928 <68757440+Guanran928@users.noreply.github.com> Date: Sun, 17 Sep 2023 13:06:35 -0600 Subject: [PATCH] chore: replace writeShellScriptBin in prime.nix with enableOffloadCmd introduced in this commit: https://github.com/NixOS/nixpkgs/commit/2a7130d13a032093f5394ef0961842d1e1928789 --- common/gpu/nvidia/prime.nix | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/common/gpu/nvidia/prime.nix b/common/gpu/nvidia/prime.nix index d2ba65b..c551389 100644 --- a/common/gpu/nvidia/prime.nix +++ b/common/gpu/nvidia/prime.nix @@ -1,22 +1,13 @@ { lib, pkgs, ... }: -# This creates a new 'nvidia-offload' program that runs the application passed to it on the GPU -# As per https://nixos.wiki/wiki/Nvidia -let - nvidia-offload = pkgs.writeShellScriptBin "nvidia-offload" '' - export __NV_PRIME_RENDER_OFFLOAD=1 - export __NV_PRIME_RENDER_OFFLOAD_PROVIDER=NVIDIA-G0 - export __GLX_VENDOR_LIBRARY_NAME=nvidia - export __VK_LAYER_NV_optimus=NVIDIA_only - exec "$@" - ''; -in { +{ imports = [ ./. ]; - environment.systemPackages = [ nvidia-offload ]; - hardware.nvidia.prime = { - offload.enable = lib.mkOverride 990 true; + offload = { + enable = lib.mkOverride 990 true; + enableOffloadCmd = true; # Provides `nvidia-offload` command. + }; # Hardware should specify the bus ID for intel/nvidia devices }; }