diff options
Diffstat (limited to 'hosts')
| -rw-r--r-- | hosts/ginaz/default.nix | 2 | ||||
| -rw-r--r-- | hosts/ginaz/hardware-configuration.nix | 30 |
2 files changed, 17 insertions, 15 deletions
diff --git a/hosts/ginaz/default.nix b/hosts/ginaz/default.nix index b9345ae..878f0ba 100644 --- a/hosts/ginaz/default.nix +++ b/hosts/ginaz/default.nix @@ -1,6 +1,6 @@ { config, inputs, outputs, pkgs, ... }: { boot = { - blacklistedKernelModules = [ "nouveau" ]; + #blacklistedKernelModules = [ "nouveau" ]; initrd.kernelModules = [ "amdgpu" "zfs" ]; kernelPackages = pkgs.kerneol.linuxPackages_7_0; loader = { diff --git a/hosts/ginaz/hardware-configuration.nix b/hosts/ginaz/hardware-configuration.nix index 591fae6..f7c9738 100644 --- a/hosts/ginaz/hardware-configuration.nix +++ b/hosts/ginaz/hardware-configuration.nix @@ -24,8 +24,8 @@ graphics = { enable = true; enable32Bit = true; - #extraPackages = [ pkgs.nvidia-vaapi-driver ]; - #extraPackages32 = [ pkgs.pkgsi686Linux.nvidia-vaapi-driver ]; + extraPackages = [ pkgs.nvidia-vaapi-driver ]; + extraPackages32 = [ pkgs.pkgsi686Linux.nvidia-vaapi-driver ]; #package = pkgs.master.mesa; #package32 = pkgs.master.driversi686Linux.mesa; }; @@ -35,17 +35,19 @@ # pkgAfterFbc = if builtins.hasAttr betaPkg.version pkgs.nvidia-patch-list.fbc then pkgs.nvidia-patch.patch-fbc betaPkg else betaPkg; # finalPkg = if builtins.hasAttr betaPkg.version pkgs.nvidia-patch-list.nvenc then pkgs.nvidia-patch.patch-nvenc pkgAfterFbc else pkgAfterFbc; #in { - # modesetting.enable = true; - # open = true; - # package = if finalPkg == betaPkg then betaPkg else finalPkg; - # prime = { - # amdgpuBusId = "PCI:4:0:0"; - # nvidiaBusId = "PCI:1:0:0"; - # offload = { - # enable = true; - # enableOffloadCmd = true; - # }; - # }; - #}; + nvidia = { + modesetting.enable = true; + open = true; + #package = if finalPkg == betaPkg then betaPkg else finalPkg; + package = config.boot.kernelPackages.nvidiaPackages.bleeding_edge; + prime = { + amdgpuBusId = "PCI:4:0:0"; + nvidiaBusId = "PCI:1:0:0"; + offload = { + enable = true; + enableOffloadCmd = true; + }; + }; + }; }; } |