diff --git a/hosts/lungmen.nix b/hosts/lungmen.nix index 381d2ee..65d8af5 100644 --- a/hosts/lungmen.nix +++ b/hosts/lungmen.nix @@ -192,8 +192,10 @@ in files = [ "/etc/machine-id" ]; }; variables = { - VK_ICD_FILENAMES = "/run/opengl-driver/share/vulkan/icd.d/amd_icd64.json"; - LD_LIBRARY_PATH = lib.mkForce "${lib.makeLibraryPath (config.hardware.opengl.extraPackages ++ config.hardware.opengl.extraPackages32)}"; + VK_ICD_FILENAMES = lib.mkForce "${pkgs.amdvlk}/share/vulkan/icd.d/amd_icd64.json:${pkgs.driversi686Linux.amdvlk}/share/vulkan/icd.d/amd_icd32.json"; + }; + 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; diff --git a/users/patriot/default.nix b/users/patriot/default.nix index d8092ba..d554352 100644 --- a/users/patriot/default.nix +++ b/users/patriot/default.nix @@ -23,10 +23,11 @@ in xdg.portal = { enable = true; gtkUsePortal = true; + wlr.enable = true; extraPortals = with pkgs; [ xdg-desktop-portal xdg-desktop-portal-gtk - # xdg-desktop-portal-wlr + xdg-desktop-portal-wlr ]; }; @@ -112,7 +113,7 @@ in in pkgs.writeScriptBin "chromium-wayland" '' #!${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 = let