simplify levi video config

This commit is contained in:
Sean Buckley 2024-05-05 23:45:03 -04:00
parent 4bb0b8777d
commit 913896ec30

View file

@ -1,38 +1,8 @@
{ lib, pkgs, ... }: {
let
current-mode = "nvidia-mux";
constants = {
hardware.nvidia.prime.intelBusId = "PCI:0:2:0"; hardware.nvidia.prime.intelBusId = "PCI:0:2:0";
hardware.nvidia.prime.nvidiaBusId = "PCI:1:0:0"; hardware.nvidia.prime.nvidiaBusId = "PCI:1:0:0";
};
available-modes = { ### NVIDIA-only using MUX switch in BIOS.
nvidia = {
### "sync mode"
#
# good:
# max performance on external displays
# no BIOS settings change needed
#
# bad:
# graphics performance overhead on internal display
# internal display capped at 60hz
#
hardware.nvidia.prime.sync.enable = true;
hardware.nvidia.modesetting.enable = true;
services.xserver.displayManager.gdm.wayland = false;
services.xserver.videoDrivers = [ "nvidia" ];
# xrandr workaround for laptop panel not showing up with GDM. Reference:
# https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/hardware/video/nvidia.nix
services.xserver.displayManager.sessionCommands = ''
${pkgs.xorg.xrandr}/bin/xrandr --setprovideroutputsource modesetting NVIDIA-0
'';
};
nvidia-mux = {
### optimus disabled in BIOS with MUX switch.
# #
# good: # good:
# simple, always works. # simple, always works.
@ -47,46 +17,60 @@ let
services.xserver.screenSection = '' services.xserver.screenSection = ''
Option "metamodes" "DP-2: 2560x1440_165 +0+0 {AllowGSYNCCompatible=On}" Option "metamodes" "DP-2: 2560x1440_165 +0+0 {AllowGSYNCCompatible=On}"
''; '';
}; }
intel = { ################################################################################
### nvidia drivers disabled
#
# Not well tested. Possibly Incomplete.
# Won't allow external displays connected to nvidia GPU.
#
# Shutting off Nvidia GPU would theoretically save power.
# I do not think this actually powers down the Nvidia GPU, just stops using it.
#
boot.kernelParams = [ "module_blacklist=nouveau" ];
};
hybrid = { ### "sync mode"
### hybrid graphics #
# # good:
# Not well tested. Possibly Incomplete. # max performance on external displays
# Won't allow external displays connected to nvidia GPU. # no BIOS settings change needed
# #
# Everything would use intel by default, # bad:
# but specific apps would run on the nvidia GPU under the script. # graphics performance overhead on internal display
# # internal display capped at 60hz
hardware.nvidia.prime.offload.enable = true; #
services.xserver.videoDrivers = [ "nvidia" ]; # hardware.nvidia.prime.sync.enable = true;
environment.systemPackages = [ # hardware.nvidia.modesetting.enable = true;
(pkgs.writeShellScriptBin "nv" '' # services.xserver.displayManager.gdm.wayland = false;
export __NV_PRIME_RENDER_OFFLOAD=1 # services.xserver.videoDrivers = [ "nvidia" ];
export __NV_PRIME_RENDER_OFFLOAD_PROVIDER=NVIDIA-G0 # # xrandr workaround for laptop panel not showing up with GDM. Reference:
export __GLX_VENDOR_LIBRARY_NAME=nvidia # # https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/hardware/video/nvidia.nix
export __VK_LAYER_NV_optimus=NVIDIA_only # services.xserver.displayManager.sessionCommands = ''
exec "$@" # ${pkgs.xorg.xrandr}/bin/xrandr --setprovideroutputsource modesetting NVIDIA-0
'') # '';
];
};
}; ################################################################################
in ### nvidia drivers disabled
lib.mkMerge [ #
(constants) # Not well tested. Possibly Incomplete.
(available-modes.${current-mode}) # Won't allow external displays connected to nvidia GPU.
] #
# Shutting off Nvidia GPU would theoretically save power.
# I do not think this actually powers down the Nvidia GPU, just stops using it.
#
# boot.kernelParams = [ "module_blacklist=nouveau" ];
################################################################################
### hybrid graphics
#
# Not well tested. Possibly Incomplete.
# Won't allow external displays connected to nvidia GPU.
#
# Everything would use intel by default,
# but specific apps would run on the nvidia GPU under the script.
#
# hardware.nvidia.prime.offload.enable = true;
# services.xserver.videoDrivers = [ "nvidia" ];
# environment.systemPackages = [
# (pkgs.writeShellScriptBin "nv" ''
# 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 "$@"
# '')
# ];