Switch to nouveau by default on omen

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

View file

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

View file

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