nixos-unstable fixes

This commit is contained in:
Peder Bergebakken Sundt 2024-10-30 23:18:53 +01:00
parent 60b890b566
commit d998fd13f9
4 changed files with 23 additions and 3 deletions

View File

@ -63,6 +63,7 @@ lib.mkMerge [
#hardware.nvidia.powerManagement.enable = lib.mkDefault true; # Fix graphical corruption on suspend/resume #hardware.nvidia.powerManagement.enable = lib.mkDefault true; # Fix graphical corruption on suspend/resume
#hardware.nvidia.powerManagement.finegrained = lib.mkDefault false; # Turns off GPU when not in use, Turing or newer #hardware.nvidia.powerManagement.finegrained = lib.mkDefault false; # Turns off GPU when not in use, Turing or newer
# https://www.nvidia.com/en-us/drivers/unix/legacy-gpu/
# https://github.com/NixOS/nixpkgs/blob/nixos-unstable/pkgs/os-specific/linux/nvidia-x11/default.nix # https://github.com/NixOS/nixpkgs/blob/nixos-unstable/pkgs/os-specific/linux/nvidia-x11/default.nix
#hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.stable; #hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.stable;
#hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.production; #hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.production;

View File

@ -1,4 +1,6 @@
{ config, pkgs, lib, ... }: { config, pkgs, lib, ... }:
lib.mkMerge [
{ {
# enable opengl (headless) # enable opengl (headless)
@ -18,7 +20,11 @@
}; };
hardware.opengl.enable = true; hardware.opengl.enable = true;
}
(lib.optionalAttrs (lib.versionOlder (lib.versions.majorMinor lib.version) "24.11") {
hardware.opengl.driSupport = true; hardware.opengl.driSupport = true;
})
{
hardware.opengl.extraPackages = with pkgs; [ hardware.opengl.extraPackages = with pkgs; [
mesa.drivers mesa.drivers
intel-media-driver intel-media-driver
@ -34,3 +40,4 @@
(pkgs.nvtopPackages.intel or pkgs.nvtop-intel) (pkgs.nvtopPackages.intel or pkgs.nvtop-intel)
]; ];
} }
]

View File

@ -1,4 +1,5 @@
{ config, pkgs, lib, ... }: { config, pkgs, lib, ... }:
lib.mkMerge [
{ {
# TODO: gamemode? # TODO: gamemode?
@ -19,7 +20,7 @@
}) })
# ensure icons appear # ensure icons appear
pkgs.gnome3.adwaita-icon-theme pkgs.gnome.adwaita-icon-theme
pkgs.hicolor-icon-theme # pkgs.hicolor-icon-theme #
# Needed for some installers like League of Legends # Needed for some installers like League of Legends
@ -29,8 +30,13 @@
]; ];
hardware.opengl.enable = true; hardware.opengl.enable = true;
hardware.opengl.driSupport = true; }
(lib.optionalAttrs (lib.versionOlder (lib.versions.majorMinor lib.version) "24.11") {
hardware.opengl.driSupport = true;
})
{
hardware.opengl.driSupport32Bit = true; hardware.opengl.driSupport32Bit = true;
hardware.opengl.extraPackages32 = with pkgs.pkgsi686Linux; [ libva ]; hardware.opengl.extraPackages32 = with pkgs.pkgsi686Linux; [ libva ];
} }
]

View File

@ -1,4 +1,5 @@
{ config, pkgs, lib, ... }: { config, pkgs, lib, ... }:
lib.mkMerge [
{ {
programs.steam.enable = true; programs.steam.enable = true;
programs.steam.remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play programs.steam.remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
@ -66,7 +67,11 @@
#services.joycond.enable = true; #services.joycond.enable = true;
hardware.opengl.enable = true; hardware.opengl.enable = true;
hardware.opengl.driSupport = true; }
(lib.optionalAttrs (lib.versionOlder (lib.versions.majorMinor lib.version) "24.11") {
hardware.opengl.driSupport = true;
})
{
hardware.opengl.driSupport32Bit = true; hardware.opengl.driSupport32Bit = true;
hardware.opengl.extraPackages32 = with pkgs.pkgsi686Linux; [ libva ]; hardware.opengl.extraPackages32 = with pkgs.pkgsi686Linux; [ libva ];
@ -94,3 +99,4 @@
]; ];
} }
]