aires/nixos-hardware
aires/nixos-hardware
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

xps-15-9560: disable broken bumblebee for now

Browse source 
Looks like it fails to evaluate in nixpkgs just now
This commit is contained in:
Jörg Thalheim 2024-01-09 08:27:35 +01:00 committed by mergify[bot]
parent af21850d3d
commit b34a6075e9
1 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
dell/xps/15-9560/default.nix
View file

@ -1,13 +1,27 @@
{ lib, pkgs, ... }:
{ {
imports = [ imports = [
../../../common/cpu/intel ../../../common/cpu/intel
../../../common/cpu/intel/kaby-lake ../../../common/cpu/intel/kaby-lake
../../../common/pc/laptop ../../../common/pc/laptop
./xps-common.nix ./xps-common.nix
# FIXME: remove this when bumblebee works again
../../../common/gpu/nvidia/disable.nix
]; ];
/* Bumblebee seems to fail to evaluate:
(stack trace truncated; use '--show-trace' to show the full trace)
error: assertion '(useSettings -> (! libsOnly))' failed
at /home/joerg/git/nixpkgs/pkgs/os-specific/linux/nvidia-x11/generic.nix:61:1:
60|
61| assert useSettings -> !libsOnly;
| ^
62| assert !libsOnly -> kernel != null;
# This configuration makes intel default and optionaly applications could run nvidia with optirun. # This configuration makes intel default and optionaly applications could run nvidia with optirun.
# To Optimize for your use case import intel or nvidia only configuration instead # To Optimize for your use case import intel or nvidia only configuration instead
# xps-9560/intel # xps-9560/intel
@ -15,11 +29,11 @@
# xps-9560/nvidia # xps-9560/nvidia
##### bumblebee working, needs reboot to take affect and to use it run: optirun "<application>" ##### bumblebee working, needs reboot to take affect and to use it run: optirun "<application>"
services.xserver.videoDrivers = [ "intel" "nvidia" ]; services.xserver.videoDrivers = [ "intel" "nvidia" ];
boot.blacklistedKernelModules = [ "nouveau" "bbswitch" ]; boot.blacklistedKernelModules = [ "nouveau" "bbswitch" ];
boot.extraModulePackages = [ pkgs.linuxPackages.nvidia_x11 ]; boot.extraModulePackages = [ config.boot.kernelPackages.nvidia_x11 ];
hardware.bumblebee.enable = lib.mkDefault true; hardware.bumblebee.enable = lib.mkDefault true;
hardware.bumblebee.pmMethod = lib.mkDefault "none"; hardware.bumblebee.pmMethod = lib.mkDefault "none";
*/
} }