diff --git a/pkgs/uvms/uvms.py b/pkgs/uvms/uvms.py index ec4a139..d58fb28 100644 --- a/pkgs/uvms/uvms.py +++ b/pkgs/uvms/uvms.py @@ -354,7 +354,7 @@ class Processes: "--wayland-sock", f'{PASSTHRU_ENV["XDG_RUNTIME_DIR"]}/{PASSTHRU_ENV["WAYLAND_DISPLAY"]}', # noqa: E501 "--params", - '{ "context-types": "cross-domain" }', + '{ "context-types": "cross-domain:virgl2" }', ] with self.popen( *args, diff --git a/profiles/baseImage.nix b/profiles/baseImage.nix index 683f061..294c58e 100644 --- a/profiles/baseImage.nix +++ b/profiles/baseImage.nix @@ -16,6 +16,7 @@ let kernelTarget = pkgs.stdenv.hostPlatform.linux-kernel.target; waylandSock = "/run/user/1000/wayland-1"; env = { + DBUS_SESSION_BUS_ADDRESS = "unix:path=/run/user/1000/bus"; XDG_RUNTIME_DIR = "/run/user/1000"; WAYLAND_DISPLAY = "wayland-1"; @@ -104,6 +105,7 @@ in }; }; + programs.dconf.enable = true; systemd.mounts = [ { type = "virtiofs"; @@ -210,6 +212,7 @@ in }; environment.profileRelativeSessionVariables.PATH = lib.mkForce [ "/bin\${PATH:+:}$PATH" ]; + environment.sessionVariables = env; environment.variables = env; systemd.globalEnvironment = env; @@ -302,9 +305,9 @@ in uvms.ch.settings = mkOption { default = { }; type = types.submodule ( - let - osConfig = config; - in + let + osConfig = config; + in { config, ... }: { freeformType = jsonType;