fixup! uvms: churn
This commit is contained in:
parent
add1c4f6bd
commit
f8cc57f146
2 changed files with 7 additions and 4 deletions
|
|
@ -354,7 +354,7 @@ class Processes:
|
||||||
"--wayland-sock",
|
"--wayland-sock",
|
||||||
f'{PASSTHRU_ENV["XDG_RUNTIME_DIR"]}/{PASSTHRU_ENV["WAYLAND_DISPLAY"]}', # noqa: E501
|
f'{PASSTHRU_ENV["XDG_RUNTIME_DIR"]}/{PASSTHRU_ENV["WAYLAND_DISPLAY"]}', # noqa: E501
|
||||||
"--params",
|
"--params",
|
||||||
'{ "context-types": "cross-domain" }',
|
'{ "context-types": "cross-domain:virgl2" }',
|
||||||
]
|
]
|
||||||
with self.popen(
|
with self.popen(
|
||||||
*args,
|
*args,
|
||||||
|
|
|
||||||
|
|
@ -16,6 +16,7 @@ let
|
||||||
kernelTarget = pkgs.stdenv.hostPlatform.linux-kernel.target;
|
kernelTarget = pkgs.stdenv.hostPlatform.linux-kernel.target;
|
||||||
waylandSock = "/run/user/1000/wayland-1";
|
waylandSock = "/run/user/1000/wayland-1";
|
||||||
env = {
|
env = {
|
||||||
|
DBUS_SESSION_BUS_ADDRESS = "unix:path=/run/user/1000/bus";
|
||||||
XDG_RUNTIME_DIR = "/run/user/1000";
|
XDG_RUNTIME_DIR = "/run/user/1000";
|
||||||
WAYLAND_DISPLAY = "wayland-1";
|
WAYLAND_DISPLAY = "wayland-1";
|
||||||
|
|
||||||
|
|
@ -104,6 +105,7 @@ in
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
programs.dconf.enable = true;
|
||||||
systemd.mounts = [
|
systemd.mounts = [
|
||||||
{
|
{
|
||||||
type = "virtiofs";
|
type = "virtiofs";
|
||||||
|
|
@ -210,6 +212,7 @@ in
|
||||||
};
|
};
|
||||||
|
|
||||||
environment.profileRelativeSessionVariables.PATH = lib.mkForce [ "/bin\${PATH:+:}$PATH" ];
|
environment.profileRelativeSessionVariables.PATH = lib.mkForce [ "/bin\${PATH:+:}$PATH" ];
|
||||||
|
environment.sessionVariables = env;
|
||||||
environment.variables = env;
|
environment.variables = env;
|
||||||
systemd.globalEnvironment = env;
|
systemd.globalEnvironment = env;
|
||||||
|
|
||||||
|
|
@ -302,9 +305,9 @@ in
|
||||||
uvms.ch.settings = mkOption {
|
uvms.ch.settings = mkOption {
|
||||||
default = { };
|
default = { };
|
||||||
type = types.submodule (
|
type = types.submodule (
|
||||||
let
|
let
|
||||||
osConfig = config;
|
osConfig = config;
|
||||||
in
|
in
|
||||||
{ config, ... }:
|
{ config, ... }:
|
||||||
{
|
{
|
||||||
freeformType = jsonType;
|
freeformType = jsonType;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue