This commit is contained in:
dusk 2021-07-24 23:22:33 +03:00
parent 782e4de14b
commit 54c205202b
Signed by: dusk
GPG Key ID: 1D8F8FAF2294D6EA
2 changed files with 7 additions and 4 deletions

View File

@ -192,8 +192,10 @@ in
files = [ "/etc/machine-id" ]; files = [ "/etc/machine-id" ];
}; };
variables = { variables = {
VK_ICD_FILENAMES = "/run/opengl-driver/share/vulkan/icd.d/amd_icd64.json"; VK_ICD_FILENAMES = lib.mkForce "${pkgs.amdvlk}/share/vulkan/icd.d/amd_icd64.json:${pkgs.driversi686Linux.amdvlk}/share/vulkan/icd.d/amd_icd32.json";
LD_LIBRARY_PATH = lib.mkForce "${lib.makeLibraryPath (config.hardware.opengl.extraPackages ++ config.hardware.opengl.extraPackages32)}"; };
sessionVariables = {
VK_ICD_FILENAMES = lib.mkForce "${pkgs.amdvlk}/share/vulkan/icd.d/amd_icd64.json:${pkgs.driversi686Linux.amdvlk}/share/vulkan/icd.d/amd_icd32.json";
}; };
}; };
networking.interfaces.enp6s0.useDHCP = true; networking.interfaces.enp6s0.useDHCP = true;

View File

@ -23,10 +23,11 @@ in
xdg.portal = { xdg.portal = {
enable = true; enable = true;
gtkUsePortal = true; gtkUsePortal = true;
wlr.enable = true;
extraPortals = with pkgs; [ extraPortals = with pkgs; [
xdg-desktop-portal xdg-desktop-portal
xdg-desktop-portal-gtk xdg-desktop-portal-gtk
# xdg-desktop-portal-wlr xdg-desktop-portal-wlr
]; ];
}; };
@ -112,7 +113,7 @@ in
in in
pkgs.writeScriptBin "chromium-wayland" '' pkgs.writeScriptBin "chromium-wayland" ''
#!${pkgs.stdenv.shell} #!${pkgs.stdenv.shell}
chromium ${lib.concatStringsSep " " flags} VK_ICD_FILENAMES="${pkgs.amdvlk}/share/vulkan/icd.d/amd_icd64.json:${pkgs.driversi686Linux.amdvlk}/share/vulkan/icd.d/amd_icd32.json" chromium ${lib.concatStringsSep " " flags}
''; '';
vscodiumWayland = vscodiumWayland =
let let