magic_rb/dotfiles
1
0
Fork 0
mirror of https://git.sr.ht/~magic_rb/dotfiles synced 2024-11-25 17:46:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Switch to nouveau by default on omen

Browse source 
Signed-off-by: magic_rb <magic_rb@redalder.org>
This commit is contained in:
magic_rb 2024-03-09 17:06:11 +01:00
parent 7b45388ab3
commit 5955a6d4af
No known key found for this signature in database
GPG key ID: 08D5287CC5DDCA0E
2 changed files with 22 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
nixos/systems/omen/hardware.nix
View file

@ -18,7 +18,7 @@
filter filter
; ;
kernelPackages = pkgs.linuxPackages_6_6; kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
in { in {
environment.systemPackages = [ environment.systemPackages = [
kernelPackages.turbostat kernelPackages.turbostat
@ -43,12 +43,7 @@ in {
kernelParams = [ kernelParams = [
"zfs.zfs_arc_max=8589934592" "zfs.zfs_arc_max=8589934592"
"zfs.zfs_arc_sys_free=3221225472" "zfs.zfs_arc_sys_free=3221225472"
"zfs.zfs_dmu_offset_next_sync=0" "nouveau.config=NvGspRm=1"
# "intel_pstate=active"
"nvidia.NVreg_EnableS0ixPowerManagement=1"
"nvidia.NVreg_S0ixPowerManagementVideoMemoryThreshold=2048"
# "nvme.noacpi=1"
"nvme_core.default_ps_max_latency_us=30000"
]; ];
kernelPackages = kernelPackages; kernelPackages = kernelPackages;
@ -57,44 +52,36 @@ in {
}; };
hardware.enableRedistributableFirmware = true; hardware.enableRedistributableFirmware = true;
hardware.nvidia.package = kernelPackages.nvidia_x11_beta;
hardware.tuxedo-keyboard.enable = true; hardware.tuxedo-keyboard.enable = true;
hardware.nvidia = { imports = [
nvidiaPersistenced = true; inputs'.chaotic-nyx.nixosModules.default
];
chaotic.mesa-git.enable = true;
powerManagement.enable = true; specialisation.nvidia.configuration = {
powerManagement.finegrained = true; environment.variables.NIXOS_SPECIALISATION = "nvidia";
prime.reverseSync.enable = false;
prime.offload.enable = true;
modesetting.enable = true;
};
specialisation.nouveau.configuration = {
environment.variables.NIXOS_SPECIALIZATION = "nouveau";
boot.loader.grub.enable = mkOverride 0 false; boot.loader.grub.enable = mkOverride 0 false;
boot.kernelPackages = mkForce config.boot.zfs.package.latestCompatibleLinuxPackages; boot.kernelPackages = mkForce pkgs.linuxPackages_6_6;
hardware.nvidia.package = pkgs.linuxPackages_6_6.nvidia_x11_beta;
boot.kernelParams = [ boot.kernelParams = [
"nouveau.config=NvGspRm=1" "nvidia.NVreg_EnableS0ixPowerManagement=1"
"nvidia.NVreg_S0ixPowerManagementVideoMemoryThreshold=2048"
]; ];
imports = [ hardware.nvidia = {
inputs'.chaotic-nyx.nixosModules.default nvidiaPersistenced = true;
];
chaotic.mesa-git.enable = true;
hardware.nvidia = mapAttrs (_: v: mkForce v) { powerManagement.enable = true;
powerManagement.enable = false; powerManagement.finegrained = true;
powerManagement.finegrained = false;
prime.offload.enableOffloadCmd = false;
prime.offload.enable = false;
nvidiaPersistenced = false;
prime.reverseSync.enable = false; prime.reverseSync.enable = false;
prime.offload.enable = true;
modesetting.enable = true;
}; };
services.xserver.videoDrivers = mkForce ["modesetting" "nouveau"];
services.xserver.videoDrivers = mkForce ["nvidia"];
}; };
} }

2
nixos/systems/omen/xserver.nix
View file

@ -12,7 +12,7 @@ in {
../../common/xserver.nix ../../common/xserver.nix
]; ];
services.xserver.videoDrivers = ["nvidia"]; services.xserver.videoDrivers = ["modesetting" "nouveau"];
services.xserver.libinput = { services.xserver.libinput = {
touchpad.clickMethod = "clickfinger"; touchpad.clickMethod = "clickfinger";