cnst/cnix
1
0
Fork 0
Code Issues Pull Requests Activity

ok too many changes

Browse Source
This commit is contained in:
cnst
2024-08-20 21:10:22 +02:00
parent 5e5837af11
commit aac3da7d89
3 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
home/users/toothpick/default.nix
View File

@@ -27,6 +27,7 @@
GBM_BACKEND = "nvidia-drm"; GBM_BACKEND = "nvidia-drm";
__GLX_VENDOR_LIBRARY_NAME = "nvidia"; __GLX_VENDOR_LIBRARY_NAME = "nvidia";
NVD_BACKEND = "direct"; NVD_BACKEND = "direct";
VK_DRIVER_FILES = "/run/opengl-driver/share/vulkan/icd.d/radeon_icd.x86_64.json";
}; };
}; };
# disable manuals as nmd fails to build often # disable manuals as nmd fails to build often

2
system/modules/hardware/graphics/amd/default.nix
View File

@@ -24,7 +24,7 @@ in {
# mesa # mesa
mesa mesa
# vulkan vulkan
# vulkan-tools # vulkan-tools
# vulkan-loader # vulkan-loader
# vulkan-validation-layers # vulkan-validation-layers

22
system/modules/hardware/graphics/nvidia/default.nix
View File

@@ -4,6 +4,19 @@
lib, lib,
... ...
}: let }: let
vulkanDriverFiles = [
"${config.hardware.nvidia.package}/share/vulkan/icd.d/nvidia_icd.x86_64.json"
"${config.hardware.nvidia.package.lib32}/share/vulkan/icd.d/nvidia_icd.i686.json"
];
nvidia-offload = pkgs.writeShellScriptBin "nvidia-offload" ''
export __NV_PRIME_RENDER_OFFLOAD=1
export __NV_PRIME_RENDER_OFFLOAD_PROVIDER=NVIDIA-G0
export __GLX_VENDOR_LIBRARY_NAME=nvidia
export __VK_LAYER_NV_optimus=NVIDIA_only
export VK_DRIVER_FILES="${builtins.concatStringsSep ":" vulkanDriverFiles}"
exec "$@"
'';
inherit (lib) types mkIf mkEnableOption mkOption; inherit (lib) types mkIf mkEnableOption mkOption;
cfg = config.modules.hardware.graphics.nvidia; cfg = config.modules.hardware.graphics.nvidia;
in { in {
@@ -29,7 +42,12 @@ in {
libvdpau-va-gl libvdpau-va-gl
intel-media-driver intel-media-driver
nvidia-vaapi-driver nvidia-vaapi-driver
egl-wayland nvidia-offload
vulkan-tools
];
extraPackages32 = with pkgs.pkgsi686Linux; [
vaapiVdpau
libvdpau-va-gl
]; ];
}; };
nvidia = { nvidia = {
@@ -42,7 +60,7 @@ in {
enable = false; enable = false;
finegrained = false; finegrained = false;
}; };
open = false; open = true;
nvidiaSettings = true; nvidiaSettings = true;
}; };
}; };