diff --git a/85-wolf.rules b/85-wolf.rules index 81cd1d5a..baf2c110 100644 --- a/85-wolf.rules +++ b/85-wolf.rules @@ -1,6 +1,9 @@ -# Allows Wolf to acces /dev/uinput +# Allows Wolf to access /dev/uinput KERNEL=="uinput", SUBSYSTEM=="misc", MODE="0660", GROUP="input", OPTIONS+="static_node=uinput" +# Allows Wolf to access /dev/uhid +KERNEL=="uhid", TAG+="uaccess" + # Move virtual keyboard and mouse into a different seat SUBSYSTEMS=="input", ATTRS{id/vendor}=="ab00", MODE="0660", GROUP="input", ENV{ID_SEAT}="seat9" @@ -8,4 +11,4 @@ SUBSYSTEMS=="input", ATTRS{id/vendor}=="ab00", MODE="0660", GROUP="input", ENV{I SUBSYSTEMS=="input", ATTRS{name}=="Wolf X-Box One (virtual) pad", MODE="0660", GROUP="input" SUBSYSTEMS=="input", ATTRS{name}=="Wolf PS5 (virtual) pad", MODE="0660", GROUP="input" SUBSYSTEMS=="input", ATTRS{name}=="Wolf gamepad (virtual) motion sensors", MODE="0660", GROUP="input" -SUBSYSTEMS=="input", ATTRS{name}=="Wolf Nintendo (virtual) pad", MODE="0660", GROUP="input" \ No newline at end of file +SUBSYSTEMS=="input", ATTRS{name}=="Wolf Nintendo (virtual) pad", MODE="0660", GROUP="input" diff --git a/docker/wolf.Dockerfile b/docker/wolf.Dockerfile index 4c49a9f0..bd5e0f39 100644 --- a/docker/wolf.Dockerfile +++ b/docker/wolf.Dockerfile @@ -37,7 +37,7 @@ RUN <<_GST_WAYLAND_DISPLAY git clone https://github.com/games-on-whales/gst-wayland-display cd gst-wayland-display - git checkout 6c7d8cb + git checkout 4558c3e cargo install cargo-c cargo cinstall -p c-bindings --prefix=/usr/local --libdir=/usr/local/lib/ _GST_WAYLAND_DISPLAY diff --git a/src/moonlight-server/state/default/config.include.toml b/src/moonlight-server/state/default/config.include.toml index 949794fe..590636c3 100644 --- a/src/moonlight-server/state/default/config.include.toml +++ b/src/moonlight-server/state/default/config.include.toml @@ -23,6 +23,7 @@ name = "WolfFirefox" image = "ghcr.io/games-on-whales/firefox:edge" mounts = [] env = [ + "RUN_SWAY=1", "MOZ_ENABLE_WAYLAND=1", "GOW_REQUIRED_DEVICES=/dev/input/* /dev/dri/* /dev/nvidia*", ] @@ -101,15 +102,16 @@ base_create_json = """ """ [[apps]] -title = "EmulationStation DE" +title = "Pegasus" start_virtual_compositor = true [apps.runner] type = "docker" -name = "WolfES-DE" -image = "ghcr.io/games-on-whales/es-de:edge" +name = "WolfPegasus" +image = "ghcr.io/games-on-whales/pegasus:edge" mounts = [] env = [ + "RUN_SWAY=1", "RUN_GAMESCOPE=true", "GOW_REQUIRED_DEVICES=/dev/input/event* /dev/dri/* /dev/nvidia*", ] diff --git a/src/moonlight-server/state/default/config.v2.toml b/src/moonlight-server/state/default/config.v2.toml index 22dcdd80..3c7d0558 100644 --- a/src/moonlight-server/state/default/config.v2.toml +++ b/src/moonlight-server/state/default/config.v2.toml @@ -22,6 +22,7 @@ name = "WolfFirefox" image = "ghcr.io/games-on-whales/firefox:edge" mounts = [] env = [ + "RUN_SWAY=1", "MOZ_ENABLE_WAYLAND=1", "GOW_REQUIRED_DEVICES=/dev/input/* /dev/dri/* /dev/nvidia*", ] @@ -100,15 +101,16 @@ base_create_json = """ """ [[apps]] -title = "EmulationStation DE" +title = "Pegasus" start_virtual_compositor = true [apps.runner] type = "docker" -name = "WolfES-DE" -image = "ghcr.io/games-on-whales/es-de:edge" +name = "WolfPegasus" +image = "ghcr.io/games-on-whales/pegasus:edge" mounts = [] env = [ + "RUN_SWAY=1", "RUN_GAMESCOPE=true", "GOW_REQUIRED_DEVICES=/dev/input/event* /dev/dri/* /dev/nvidia*", ]