better UI + AppIcon

## Description

Next step would be having full DE environment variant I guess? I'll see
later if it's doable in this PR or if I'll do separate one for keeping
things small and manageable for once 😅

- Added easily doable variants for runners, with simple CI build matrix.
- Added playsite in CI builds finally.
- Some CI formatting and naming fixes.
- Removed PR full runner builds as they kept failing due to lack of disk
space on GH runner.


<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit

* **New Features**
* New dedicated runner images for Steam, Heroic, and Minecraft plus a
common runtime and builder images.
* **Chores**
* CI/workflow reorganization to build and publish more runner variants
and base images.
* Installer and package tweaks (package manager flags, CUDA enablement)
and updated build tooling.
* Unified startup to use a constructed launch command; removed two
default environment exports.
  * Added container ignore patterns.

<sub>✏️ Tip: You can customize this high-level summary in your review
settings.</sub>
<!-- end of auto-generated comment: release notes by coderabbit.ai -->

---------

Co-authored-by: DatCaptainHorse <DatCaptainHorse@users.noreply.github.com>

.github/workflows/docker-bake.hcl

@@ -3,14 +3,14 @@ variable "BASE_IMAGE" {
 }
 
 group "default" {
-  targets = ["runner"]
+  targets = ["runner-base", "runner-builder"]
 }
 
 target "runner-base" {
   dockerfile = "containerfiles/runner-base.Containerfile"
   context    = "."
   args = {
-    BASE_IMAGE = "${BASE_IMAGE}"
+    BASE_IMAGE = BASE_IMAGE
   }
   cache-from = ["type=gha,scope=runner-base-pr"]
   cache-to = ["type=gha,scope=runner-base-pr,mode=max"]
@@ -30,19 +30,3 @@ target "runner-builder" {
     runner-base = "target:runner-base"
   }
 }
-
-target "runner" {
-  dockerfile = "containerfiles/runner.Containerfile"
-  context    = "."
-  args = {
-    RUNNER_BASE_IMAGE    = "runner-base:latest"
-    RUNNER_BUILDER_IMAGE = "runner-builder:latest"
-  }
-  cache-from = ["type=gha,scope=runner-pr"]
-  cache-to = ["type=gha,scope=runner-pr,mode=max"]
-  tags = ["nestri-runner"]
-  contexts = {
-    runner-base    = "target:runner-base"
-    runner-builder = "target:runner-builder"
-  }
-}

.github/workflows/play-standalone.yml

@@ -0,0 +1,81 @@
+name: Build Nestri standalone playsite
+
+on:
+  pull_request:
+    paths:
+      - "containerfiles/playsite.Containerfile"
+      - ".github/workflows/play-standalone.yml"
+      - "packages/play-standalone/**"
+  push:
+    branches: [ dev, production ]
+    paths:
+      - "containerfiles/playsite.Containerfile"
+      - ".github/workflows/play-standalone.yml"
+      - "packages/play-standalone/**"
+    tags:
+      - v*.*.*
+  release:
+    types: [ created ]
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: nestrilabs/nestri
+  BASE_TAG_PREFIX: playsite
+
+jobs:
+  build-docker-pr:
+    name: Build image on PR
+    runs-on: ubuntu-latest
+    if: ${{ github.event_name == 'pull_request' }}
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+      - name: Setup Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Build Docker image
+        uses: docker/build-push-action@v5
+        with:
+          file: containerfiles/playsite.Containerfile
+          context: ./
+          push: false
+          load: true
+          tags: nestri:playsite
+
+  build-and-push-docker:
+    name: Build and push image
+    if: ${{ github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/production' }}
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+      - name: Log into registry ${{ env.REGISTRY }}
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ github.token }}
+      - name: Extract Container metadata
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/${{ env.BASE_TAG_PREFIX }}
+          #
+          #tag on release, and a nightly build for 'dev'
+          tags: |
+            type=raw,value=nightly,enable={{is_default_branch}}
+            type=raw,value={{branch}}
+            type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'production') }}
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
+      - name: Build Docker image
+        uses: docker/build-push-action@v5
+        with:
+          file: containerfiles/playsite.Containerfile
+          context: ./
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

.github/workflows/relay.yml

@@ -1,6 +1,5 @@
-#Tabs not spaces, you moron :)
+name: Build Nestri relay
 
-name: Build nestri:relay
 on:
     pull_request:
         paths:

.github/workflows/runner-bases.yml

@@ -0,0 +1,73 @@
+name: Build Nestri runner base images
+
+on: [ workflow_call ]
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: nestrilabs/nestri
+  BASE_IMAGE: docker.io/cachyos/cachyos:latest
+
+jobs:
+  build-and-push-bases:
+    name: Build and push images
+    if: ${{ github.ref == 'refs/heads/production' || github.ref == 'refs/heads/dev' }}
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    strategy:
+      matrix:
+        variant:
+          - { suffix: "v2", base: "docker.io/cachyos/cachyos:latest" }
+          - { suffix: "v3", base: "docker.io/cachyos/cachyos-v3:latest" }
+          #- { suffix: "v4", base: "docker.io/cachyos/cachyos-v4:latest" } # Disabled until GHA has this
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+      - name: Log into registry ${{ env.REGISTRY }}
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ github.token }}
+      - name: Setup Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Set Swap Space
+        uses: pierotofy/set-swap-space@master
+        with:
+          swap-size-gb: 20
+      - name: Build and push runner-base image
+        uses: docker/build-push-action@v6
+        with:
+          file: containerfiles/runner-base.Containerfile
+          context: ./
+          push: true
+          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/runner-base:latest-${{ matrix.variant.suffix }}
+          build-args: |
+            BASE_IMAGE=${{ matrix.variant.base }}
+          cache-from: type=gha,scope=runner-base-${{ matrix.variant.suffix }},mode=max
+          cache-to: type=gha,scope=runner-base-${{ matrix.variant.suffix }},mode=max
+          pull: true
+      - name: Build and push runner-builder image
+        uses: docker/build-push-action@v6
+        with:
+          file: containerfiles/runner-builder.Containerfile
+          context: ./
+          push: true
+          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/runner-builder:latest-${{ matrix.variant.suffix }}
+          build-args: |
+            RUNNER_BASE_IMAGE=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/runner-base:latest-${{ matrix.variant.suffix }}
+          cache-from: type=gha,scope=runner-builder-${{ matrix.variant.suffix }},mode=max
+          cache-to: type=gha,scope=runner-builder-${{ matrix.variant.suffix }},mode=max
+      - name: Build and push runner-common image
+        uses: docker/build-push-action@v6
+        with:
+          file: containerfiles/runner-common.Containerfile
+          context: ./
+          push: true
+          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/runner-common:latest-${{ matrix.variant.suffix }}
+          build-args: |
+            RUNNER_BASE_IMAGE=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/runner-base:latest-${{ matrix.variant.suffix }}
+            RUNNER_BUILDER_IMAGE=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/runner-builder:latest-${{ matrix.variant.suffix }}
+          cache-from: type=gha,scope=runner-common-${{ matrix.variant.suffix }},mode=max
+          cache-to: type=gha,scope=runner-common-${{ matrix.variant.suffix }},mode=max

.github/workflows/runner-variants.yml

@@ -0,0 +1,86 @@
+name: Build Nestri runner image variants
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: 7 0 * * 1,3,6  # Nightlies
+  push:
+    branches: [ dev, production ]
+    paths:
+      - "containerfiles/*runner.Containerfile"
+      - ".github/workflows/runner-variants.yml"
+      - "packages/scripts/**"
+      - "packages/configs/**"
+    tags:
+      - v*.*.*
+  release:
+    types: [ created ]
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: nestrilabs/nestri
+
+jobs:
+  bases:
+    uses: ./.github/workflows/runner-bases.yml
+    permissions:
+      contents: read
+      packages: write
+  build-and-push-variants:
+    needs: [ bases ]
+    name: Build and push images
+    if: ${{ github.ref == 'refs/heads/production' || github.ref == 'refs/heads/dev' }}
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    strategy:
+      matrix:
+        variant:
+          - { suffix: "v2", base: "docker.io/cachyos/cachyos:latest" }
+          - { suffix: "v3", base: "docker.io/cachyos/cachyos-v3:latest" }
+          #- { suffix: "v4", base: "docker.io/cachyos/cachyos-v4:latest" } # Disabled until GHA has this
+        runner:
+          - steam
+          - heroic
+          - minecraft
+          # ADD MORE HERE AS NEEDED #
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+      - name: Log into registry ${{ env.REGISTRY }}
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ github.token }}
+      - name: Extract runner metadata
+        id: meta-runner
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/runner
+          tags: |
+            type=raw,value=nightly-${{ matrix.runner }}-${{ matrix.variant.suffix }},enable={{is_default_branch}}
+            type=raw,value={{branch}}-${{ matrix.runner }}-${{ matrix.variant.suffix }}
+            type=raw,value=latest-${{ matrix.runner }}-${{ matrix.variant.suffix }},enable=${{ github.ref == format('refs/heads/{0}', 'production') }}
+            type=semver,pattern={{version}}-${{ matrix.runner }}-${{ matrix.variant.suffix }}
+            type=semver,pattern={{major}}.{{minor}}-${{ matrix.runner }}-${{ matrix.variant.suffix }}
+            type=semver,pattern={{major}}-${{ matrix.runner }}-${{ matrix.variant.suffix }}
+      - name: Setup Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Set Swap Space
+        uses: pierotofy/set-swap-space@master
+        with:
+          swap-size-gb: 20
+      - name: Build and push runner image
+        uses: docker/build-push-action@v6
+        with:
+          file: containerfiles/${{ matrix.runner }}-runner.Containerfile
+          context: ./
+          push: true
+          tags: ${{ steps.meta-runner.outputs.tags }}
+          labels: ${{ steps.meta-runner.outputs.labels }}
+          build-args: |
+            RUNNER_COMMON_IMAGE=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/runner-common:latest-${{ matrix.variant.suffix }}
+          cache-from: type=gha,scope=runner-${{ matrix.runner }}-${{ matrix.variant.suffix }},mode=max
+          cache-to: type=gha,scope=runner-${{ matrix.runner }}-${{ matrix.variant.suffix }},mode=max

.github/workflows/runner.yml

@@ -1,148 +0,0 @@
-#Tabs not spaces, you moron :)
-
-name: Build nestri-runner
-
-on:
-    pull_request:
-        paths:
-            - "containerfiles/runner*.Containerfile"
-            - "packages/scripts/**"
-            - "packages/server/**"
-            - ".github/workflows/runner.yml"
-    schedule:
-        - cron: 7 0 * * 1,3,6 # Regularly to keep that build cache warm
-    push:
-        branches: [dev, production]
-        paths:
-            - "containerfiles/runner*.Containerfile"
-            - ".github/workflows/runner.yml"
-            - "packages/scripts/**"
-            - "packages/server/**"
-        tags:
-            - v*.*.*
-    release:
-        types: [created]
-
-env:
-    REGISTRY: ghcr.io
-    IMAGE_NAME: nestrilabs/nestri
-    BASE_IMAGE: docker.io/cachyos/cachyos:latest
-
-# This makes our release ci quit prematurely
-# concurrency:
-#     group: ci-${{ github.ref }}
-#     cancel-in-progress: true
-
-jobs:
-    build-docker-pr:
-        name: Build images on PR
-        runs-on: ubuntu-latest
-        permissions:
-            contents: read
-            packages: write
-        if: ${{ github.event_name == 'pull_request' }}
-        steps:
-            - 
-              name: Setup Docker Buildx
-              uses: docker/setup-buildx-action@v3
-            -
-              name: Set Swap Space
-              uses: pierotofy/set-swap-space@master
-              with:
-                swap-size-gb: 20
-            -
-              name: Build images using bake
-              uses: docker/bake-action@v6
-              env:
-                BASE_IMAGE: ${{ env.BASE_IMAGE }}
-              with:
-                files: |
-                  ./.github/workflows/docker-bake.hcl
-                targets: runner
-                push: false
-                load: true
-
-    build-and-push-docker:
-        name: Build and push images
-        if: ${{ github.ref == 'refs/heads/production' || github.ref == 'refs/heads/dev' }}
-        runs-on: ubuntu-latest
-        permissions:
-            contents: read
-            packages: write
-        strategy:
-            matrix:
-                variant:
-                    - { suffix: "", base: "docker.io/cachyos/cachyos:latest" }
-                    - { suffix: "-v3", base: "docker.io/cachyos/cachyos-v3:latest" }
-                    #- { suffix: "-v4", base: "docker.io/cachyos/cachyos-v4:latest" } # Disabled until GHA has this
-        steps:
-            -
-              name: Checkout repo
-              uses: actions/checkout@v4
-            - 
-              name: Log into registry ${{ env.REGISTRY }}
-              uses: docker/login-action@v3
-              with:
-                registry: ${{ env.REGISTRY }}
-                username: ${{ github.actor }}
-                password: ${{ github.token }}
-            - 
-              name: Extract runner metadata
-              id: meta-runner
-              uses: docker/metadata-action@v5
-              with:
-                images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/runner
-                tags: |
-                  type=raw,value=nightly${{ matrix.variant.suffix }},enable={{is_default_branch}}
-                  type=raw,value={{branch}}${{ matrix.variant.suffix }}
-                  type=raw,value=latest${{ matrix.variant.suffix }},enable=${{ github.ref == format('refs/heads/{0}', 'production') }}
-                  type=semver,pattern={{version}}${{ matrix.variant.suffix }}
-                  type=semver,pattern={{major}}.{{minor}}${{ matrix.variant.suffix }}
-                  type=semver,pattern={{major}}${{ matrix.variant.suffix }}
-            -
-              name: Setup Docker Buildx
-              uses: docker/setup-buildx-action@v3
-            - 
-              name: Set Swap Space
-              uses: pierotofy/set-swap-space@master
-              with:
-                swap-size-gb: 20
-            - 
-              name: Build and push runner-base image
-              uses: docker/build-push-action@v6
-              with:
-                file: containerfiles/runner-base.Containerfile
-                context: ./
-                push: true
-                tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/runner-base:latest${{ matrix.variant.suffix }}
-                build-args: |
-                  BASE_IMAGE=${{ matrix.variant.base }}
-                cache-from: type=gha,scope=runner-base${{ matrix.variant.suffix }},mode=max
-                cache-to: type=gha,scope=runner-base${{ matrix.variant.suffix }},mode=max
-                pull: ${{ github.event_name == 'schedule' }}
-            -
-              name: Build and push runner-builder image
-              uses: docker/build-push-action@v6
-              with:
-                file: containerfiles/runner-builder.Containerfile
-                context: ./
-                push: true
-                tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/runner-builder:latest${{ matrix.variant.suffix }}
-                build-args: |
-                  RUNNER_BASE_IMAGE=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/runner-base:latest${{ matrix.variant.suffix }}
-                cache-from: type=gha,scope=runner-builder${{ matrix.variant.suffix }},mode=max
-                cache-to: type=gha,scope=runner-builder${{ matrix.variant.suffix }},mode=max
-            -
-              name: Build and push runner image
-              uses: docker/build-push-action@v6
-              with:
-                file: containerfiles/runner.Containerfile
-                context: ./
-                push: true
-                tags: ${{ steps.meta-runner.outputs.tags }}
-                labels: ${{ steps.meta-runner.outputs.labels }}
-                build-args: |
-                  RUNNER_BASE_IMAGE=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/runner-base:latest${{ matrix.variant.suffix }}
-                  RUNNER_BUILDER_IMAGE=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/runner-builder:latest${{ matrix.variant.suffix }}
-                cache-from: type=gha,scope=runner${{ matrix.variant.suffix }},mode=max
-                cache-to: type=gha,scope=runner${{ matrix.variant.suffix }},mode=max

containerfiles/heroic-runner.Containerfile

@@ -0,0 +1,23 @@
+# Container build arguments #
+ARG RUNNER_COMMON_IMAGE=runner-common:latest
+
+#*********************#
+# Final Runtime Stage #
+#*********************#
+FROM ${RUNNER_COMMON_IMAGE}
+
+### FLAVOR/VARIANT CONFIGURATION ###
+## HEROIC LAUNCHER ##
+RUN --mount=type=cache,target=/var/cache/pacman/pkg \
+    pacman -S --noconfirm heroic-games-launcher-bin && \
+    # Cleanup
+    paccache -rk1 && \
+    rm -rf /usr/share/{info,man,doc}/*
+
+## FLAVOR/VARIANT LAUNCH COMMAND ##
+ENV NESTRI_LAUNCH_CMD="heroic"
+### END OF FLAVOR/VARIANT CONFIGURATION ###
+
+### REQUIRED DEFAULT ENTRYPOINT FOR FLAVOR/VARIANT ###
+USER root
+ENTRYPOINT ["supervisord", "-c", "/etc/nestri/supervisord.conf"]

containerfiles/minecraft-runner.Containerfile

@@ -0,0 +1,24 @@
+# Container build arguments #
+ARG RUNNER_COMMON_IMAGE=runner-common:latest
+
+#*********************#
+# Final Runtime Stage #
+#*********************#
+FROM ${RUNNER_COMMON_IMAGE}
+
+### FLAVOR/VARIANT CONFIGURATION ###
+## MINECRAFT ##
+RUN --mount=type=cache,target=/var/cache/pacman/pkg \
+    pacman -S --noconfirm paru && \
+    sudo -H -u ${NESTRI_USER} paru -S --noconfirm aur/minecraft-launcher && \
+    # Cleanup
+    paccache -rk1 && \
+    rm -rf /usr/share/{info,man,doc}/*
+
+## FLAVOR/VARIANT LAUNCH COMMAND ##
+ENV NESTRI_LAUNCH_CMD="minecraft-launcher"
+### END OF FLAVOR/VARIANT CONFIGURATION ###
+
+### REQUIRED DEFAULT ENTRYPOINT FOR FLAVOR/VARIANT ###
+USER root
+ENTRYPOINT ["supervisord", "-c", "/etc/nestri/supervisord.conf"]

containerfiles/runner-builder.Containerfile

@@ -15,7 +15,7 @@ ENV CARGO_HOME=/usr/local/cargo \
 
 # Install build essentials and caching tools
 RUN --mount=type=cache,target=/var/cache/pacman/pkg \
-    pacman -Sy --noconfirm rustup git base-devel mold \
+    pacman -S --noconfirm rustup git base-devel mold \
     meson pkgconf cmake git gcc make
 
 # Override various linker with symlink so mold is forcefully used (ld, ld.lld, lld)
@@ -28,7 +28,7 @@ RUN rustup default stable
 
 # Install cargo-chef with proper caching
 RUN --mount=type=cache,target=${CARGO_HOME}/registry \
-    cargo install -j $(nproc) cargo-chef --locked
+    cargo install cargo-chef --locked
 
 #*******************************#
 # vimputti manager build stages #
@@ -38,7 +38,7 @@ WORKDIR /builder
 
 # Install build dependencies
 RUN --mount=type=cache,target=/var/cache/pacman/pkg \
-    pacman -Sy --noconfirm lib32-gcc-libs
+    pacman -S --noconfirm lib32-gcc-libs
 
 # Clone repository
 RUN git clone --depth 1 --rev "2fde5376b6b9a38cdbd94ccc6a80c9d29a81a417" https://github.com/DatCaptainHorse/vimputti.git
@@ -83,7 +83,7 @@ WORKDIR /builder
 
 # Install build dependencies
 RUN --mount=type=cache,target=/var/cache/pacman/pkg \
-    pacman -Sy --noconfirm gst-plugins-good gst-plugin-rswebrtc
+    pacman -S --noconfirm gst-plugins-good gst-plugin-rswebrtc
 
 #--------------------------------------------------------------------
 FROM nestri-server-deps AS nestri-server-planner
@@ -123,14 +123,14 @@ WORKDIR /builder
 
 # Install build dependencies
 RUN --mount=type=cache,target=/var/cache/pacman/pkg \
-    pacman -Sy --noconfirm libxkbcommon wayland \
+    pacman -S --noconfirm libxkbcommon wayland \
     gst-plugins-good gst-plugins-bad libinput
 
 RUN --mount=type=cache,target=${CARGO_HOME}/registry \
     cargo install cargo-c
 
 # Clone repository
-RUN git clone --depth 1 --rev "a4abcfe2cffe2d33b564d1308b58504a5e3012b1" https://github.com/games-on-whales/gst-wayland-display.git
+RUN git clone --depth 1 --rev "e4c70b64dad3cd8bbf5eec011f419386adf737ee" https://github.com/games-on-whales/gst-wayland-display.git
 
 #--------------------------------------------------------------------
 FROM gst-wayland-deps AS gst-wayland-planner
@@ -148,7 +148,7 @@ COPY --from=gst-wayland-planner /builder/gst-wayland-display/recipe.json .
 
 # Cache dependencies using cargo-chef
 RUN --mount=type=cache,target=${CARGO_HOME}/registry \
-    cargo chef cook --release --recipe-path recipe.json
+    cargo chef cook --release --recipe-path recipe.json --features cuda
 
 
 ENV CARGO_TARGET_DIR=/builder/target
@@ -158,7 +158,7 @@ COPY --from=gst-wayland-planner /builder/gst-wayland-display/ .
 # Build and install directly to artifacts
 RUN --mount=type=cache,target=${CARGO_HOME}/registry \
     --mount=type=cache,target=/builder/target \
-    cargo cinstall --prefix=${ARTIFACTS} --release
+    cargo cinstall --prefix=${ARTIFACTS} --release --features cuda
 
 #*********************************#
 # Patched bubblewrap build stages #
@@ -168,7 +168,7 @@ WORKDIR /builder
 
 # Install build dependencies
 RUN --mount=type=cache,target=/var/cache/pacman/pkg \
-    pacman -Sy --noconfirm libtool libcap libselinux
+    pacman -S --noconfirm libtool libcap libselinux
 
 # Copy patch file from host
 COPY packages/patches/bubblewrap/ /builder/patches/

containerfiles/runner-common.Containerfile

@@ -2,9 +2,9 @@
 ARG RUNNER_BASE_IMAGE=runner-base:latest
 ARG RUNNER_BUILDER_IMAGE=runner-builder:latest
 
-#*********************#
-# Final Runtime Stage #
-#*********************#
+#**********************#
+# Runtime Common Stage #
+#**********************#
 FROM ${RUNNER_BASE_IMAGE} AS runtime
 FROM ${RUNNER_BUILDER_IMAGE} AS builder
 FROM runtime
@@ -12,11 +12,11 @@ FROM runtime
 ### Package Installation ###
 # Core system components
 RUN --mount=type=cache,target=/var/cache/pacman/pkg \
-    pacman -Sy --needed --noconfirm \
+    pacman -S --needed --noconfirm \
         vulkan-intel lib32-vulkan-intel vpl-gpu-rt \
         vulkan-radeon lib32-vulkan-radeon \
         mesa lib32-mesa \
-        steam gtk3 lib32-gtk3 \
+        gtk3 lib32-gtk3 \
         sudo xorg-xwayland seatd libinput gamescope mangohud wlr-randr \
         pipewire pipewire-pulse pipewire-alsa wireplumber \
         noto-fonts-cjk supervisor jq pacman-contrib \
@@ -67,11 +67,6 @@ RUN mkdir -p /etc/pipewire/pipewire.conf.d && \
 COPY packages/configs/wireplumber.conf.d/* /etc/wireplumber/wireplumber.conf.d/
 COPY packages/configs/pipewire.conf.d/* /etc/pipewire/pipewire.conf.d/
 
-## Steam Configs - Proton (Experimental flavor) ##
-RUN mkdir -p "${NESTRI_HOME}/.local/share/Steam/config"
-
-COPY packages/configs/steam/config.vdf "${NESTRI_HOME}/.local/share/Steam/config/"
-
 ## MangoHud Config ##
 RUN mkdir -p "${NESTRI_HOME}/.config/MangoHud"
 
@@ -93,7 +88,3 @@ RUN chmod +x /etc/nestri/{envs.sh,entrypoint*.sh} && \
     setcap cap_net_admin+ep /usr/bin/vimputti-manager && \
     dbus-uuidgen > /etc/machine-id && \
     LANG=en_US.UTF-8 locale-gen
-
-# Root for most container engines, nestri-user compatible for apptainer without fakeroot
-USER root
-ENTRYPOINT ["supervisord", "-c", "/etc/nestri/supervisord.conf"]

containerfiles/steam-runner.Containerfile

@@ -0,0 +1,27 @@
+# Container build arguments #
+ARG RUNNER_COMMON_IMAGE=runner-common:latest
+
+#*********************#
+# Final Runtime Stage #
+#*********************#
+FROM ${RUNNER_COMMON_IMAGE}
+
+### FLAVOR/VARIANT CONFIGURATION ###
+## STEAM ##
+RUN --mount=type=cache,target=/var/cache/pacman/pkg \
+    pacman -S --noconfirm steam && \
+    # Cleanup
+    paccache -rk1 && \
+    rm -rf /usr/share/{info,man,doc}/*
+
+## Steam Configs - Proton (Experimental flavor) ##
+RUN mkdir -p "${NESTRI_HOME}/.local/share/Steam/config"
+COPY packages/configs/steam/config.vdf "${NESTRI_HOME}/.local/share/Steam/config/"
+
+## FLAVOR/VARIANT LAUNCH COMMAND ##
+ENV NESTRI_LAUNCH_CMD="steam -tenfoot -cef-force-gpu"
+### END OF FLAVOR/VARIANT CONFIGURATION ###
+
+### REQUIRED DEFAULT ENTRYPOINT FOR FLAVOR/VARIANT ###
+USER root
+ENTRYPOINT ["supervisord", "-c", "/etc/nestri/supervisord.conf"]

package.json

@@ -21,6 +21,7 @@
     "core-js-pure",
     "esbuild",
     "protobufjs",
+    "sharp",
     "workerd"
   ],
   "workspaces": {

packages/input/.containerignore

@@ -0,0 +1,3 @@
+.idea/
+dist/
+node_modules/

packages/native-app/.expo/README.md

@@ -0,0 +1,13 @@
+> Why do I have a folder named ".expo" in my project?
+
+The ".expo" folder is created when an Expo project is started using "expo start" command.
+
+> What do the files contain?
+
+- "devices.json": contains information about devices that have recently opened this project. This is used to populate the "Development sessions" list in your development builds.
+- "settings.json": contains the server configuration that is used to serve the application manifest.
+
+> Should I commit the ".expo" folder?
+
+No, you should not share the ".expo" folder. It does not contain any information that is relevant for other developers working on the project, it is specific to your machine.
+Upon project creation, the ".expo" folder is already added to your ".gitignore" file.

packages/native-app/.expo/devices.json

@@ -0,0 +1,3 @@
+{
+  "devices": []
+}

packages/play-standalone/android/app/capacitor.build.gradle

@@ -9,7 +9,7 @@ android {
 
 apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
 dependencies {
-
+    implementation project(':capacitor-screen-orientation')
 
 }
 

packages/play-standalone/android/app/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
@@ -8,7 +7,6 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-
         <activity
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode|navigation"
             android:name=".MainActivity"
@@ -16,12 +14,12 @@
             android:theme="@style/AppTheme.NoActionBarLaunch"
             android:launchMode="singleTask"
             android:exported="true">
-
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
 
+                <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
+            </intent-filter>
         </activity>
 
         <provider
@@ -29,12 +27,17 @@
             android:authorities="${applicationId}.fileprovider"
             android:exported="false"
             android:grantUriPermissions="true">
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/file_paths"></meta-data>
+            <meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths" />
         </provider>
     </application>
 
+    <uses-feature
+        android:name="android.software.leanback"
+        android:required="false" />
+    <uses-feature
+        android:name="android.hardware.touchscreen"
+        android:required="false" />
+
     <!-- Permissions -->
 
     <uses-permission android:name="android.permission.INTERNET" />

packages/play-standalone/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+    <background>
+        <inset android:drawable="@mipmap/ic_launcher_background" android:inset="16.7%" />
+    </background>
+    <foreground>
+        <inset android:drawable="@mipmap/ic_launcher_foreground" android:inset="16.7%" />
+    </foreground>
 </adaptive-icon>

packages/play-standalone/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+    <background>
+        <inset android:drawable="@mipmap/ic_launcher_background" android:inset="16.7%" />
+    </background>
+    <foreground>
+        <inset android:drawable="@mipmap/ic_launcher_foreground" android:inset="16.7%" />
+    </foreground>
 </adaptive-icon>

packages/play-standalone/android/capacitor.settings.gradle

@@ -1,3 +1,6 @@
 // DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN
 include ':capacitor-android'
 project(':capacitor-android').projectDir = new File('../../../node_modules/@capacitor/android/capacitor')
+
+include ':capacitor-screen-orientation'
+project(':capacitor-screen-orientation').projectDir = new File('../../../node_modules/@capacitor/screen-orientation/android')

packages/play-standalone/assets/icon.svg

@@ -0,0 +1,20 @@
+<svg
+    width="512"
+    height="512"
+    viewBox="0 0 26.458333 26.458333"
+    version="1.1"
+    xmlns="http://www.w3.org/2000/svg"
+>
+    <rect x="0" y="0" width="26.458333" height="26.458333" fill="#09090b"/>
+    <g transform="translate(13.2291665, 13.2291665) scale(0.60) translate(-13.2291665, -13.2291665)">
+        <path
+            d="M 1.5344249,1.5344211 V 9.2976453 C 10.141372,9.3506226 17.107729,16.31697 17.160697,24.923917 h 7.763224 V 1.5344211 H 17.26052 V 7.6582313 L 17.095435,7.5123325 C 12.813137,3.6822243 7.2773806,1.558425 1.5344327,1.5344191 Z"
+            fill="#FFFFFF"></path>
+        <path
+            d="m 1.5344249,10.321451 v 7.472042 c 3.9146312,0.04963 7.080792,3.215792 7.1304217,7.130424 H 16.136889 C 16.086774,16.878739 9.5796027,10.37157 1.5344249,10.321451 Z"
+            fill="#FFFFFF"></path>
+        <path
+            d="m 1.5344249,18.699055 v 6.224862 H 7.7592875 C 7.7148345,21.504871 4.9534705,18.743512 1.5344249,18.699055 Z"
+            fill="#FFFFFF"></path>
+    </g>
+</svg>

packages/play-standalone/package.json

@@ -5,18 +5,23 @@
   "scripts": {
     "dev": "astro dev",
     "build": "astro build",
-    "build:cap": "astro build && npx cap copy",
+    "build:cap": "astro build && bunx cap copy",
     "preview": "astro preview",
     "astro": "astro",
-    "sync:android": "npm run build && npx cap sync android"
+    "sync:android": "bun run build && bunx cap sync android"
   },
   "dependencies": {
+    "@astrojs/node": "9.5.0",
     "@capacitor/android": "^7.4.3",
     "@capacitor/cli": "^7.4.3",
     "@capacitor/core": "^7.4.3",
     "@capacitor/ios": "^7.4.3",
-    "@astrojs/node": "9.5.0",
+    "@capacitor/screen-orientation": "^7.0.2",
     "@nestri/input": "*",
     "astro": "5.15.1"
+  },
+  "devDependencies": {
+    "@capacitor/assets": "^3.0.5",
+    "sharp": "^0.34.5"
   }
 }

packages/play-standalone/public/manifest.webmanifest

@@ -0,0 +1,46 @@
+{
+  "icons": [
+    {
+      "src": "../icons/icon-48.webp",
+      "type": "image/png",
+      "sizes": "48x48",
+      "purpose": "any maskable"
+    },
+    {
+      "src": "../icons/icon-72.webp",
+      "type": "image/png",
+      "sizes": "72x72",
+      "purpose": "any maskable"
+    },
+    {
+      "src": "../icons/icon-96.webp",
+      "type": "image/png",
+      "sizes": "96x96",
+      "purpose": "any maskable"
+    },
+    {
+      "src": "../icons/icon-128.webp",
+      "type": "image/png",
+      "sizes": "128x128",
+      "purpose": "any maskable"
+    },
+    {
+      "src": "../icons/icon-192.webp",
+      "type": "image/png",
+      "sizes": "192x192",
+      "purpose": "any maskable"
+    },
+    {
+      "src": "../icons/icon-256.webp",
+      "type": "image/png",
+      "sizes": "256x256",
+      "purpose": "any maskable"
+    },
+    {
+      "src": "../icons/icon-512.webp",
+      "type": "image/png",
+      "sizes": "512x512",
+      "purpose": "any maskable"
+    }
+  ]
+}

packages/play-standalone/src/pages/index.astro

@@ -1,138 +1,109 @@
 ---
 import { ClientRouter } from "astro:transitions";
 import { navigate } from "astro:transitions/client";
+import DefaultLayout from "../layouts/DefaultLayout.astro";
+import "../styles/index.css";
 ---
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width">
-  <title>Nestri Play</title>
+
+<DefaultLayout>
   <ClientRouter />
-  <style>
-    body {
-      font-family: sans-serif;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      height: 100vh;
-      margin: 0;
-    }
-    form {
-      display: flex;
-      flex-direction: column;
-      gap: 1rem;
-      padding: 2rem;
-      border: 1px solid #ccc;
-      border-radius: 8px;
-    }
-    div {
-      display: flex;
-      flex-direction: column;
-    }
-    label {
-      margin-bottom: 0.5rem;
-    }
-    input {
-      padding: 0.5rem;
-      border: 1px solid #ccc;
-      border-radius: 4px;
-    }
-    button {
-      padding: 0.75rem;
-      border: none;
-      border-radius: 4px;
-      background-color: #007bff;
-      color: white;
-      cursor: pointer;
-    }
-    button:hover {
-      background-color: #0056b3;
-    }
-  </style>
-</head>
-<body>
-  <form id="join-form">
-    <h1>Nestri Play</h1>
-    <div>
-      <label for="room">Room</label>
-      <input type="text" id="room" name="room" required list="room-list">
-      <datalist id="room-list"></datalist>
+  <div class="page-container">
+    <div class="grid-system">
+      <div class="grid-root">
+        <div class="grid-block">
+          <div class="stack">
+            <div class="header-stack">
+              <h2>Nestri Play</h2>
+              <p class="subtitle">
+                Enter your room details to join the stream.
+              </p>
+            </div>
+
+            <form id="join-form">
+              <div class="form-stack">
+                <div class="input-group">
+                  <input 
+                    type="text" 
+                    id="room" 
+                    name="room" 
+                    required 
+                    list="room-list" 
+                    placeholder="Room Name"
+                  >
+                  <datalist id="room-list"></datalist>
+                </div>
+                
+                <div class="input-group">
+                  <input 
+                    type="text" 
+                    id="peerURL" 
+                    name="peerURL" 
+                    required 
+                    list="peerURL-list" 
+                    placeholder="Peer URL"
+                  >
+                  <datalist id="peerURL-list"></datalist>
+                </div>
+
+                <button type="submit" id="submit-btn">Join Stream</button>
+              </div>
+            </form>
+          </div>
+        </div>
+      </div>
     </div>
-    <div>
-      <label for="peerURL">peerURL</label>
-      <input type="text" id="peerURL" name="peerURL" required list="peerURL-list">
-      <datalist id="peerURL-list"></datalist>
-    </div>
-    <button type="submit">Join</button>
-  </form>
+  </div>
+</DefaultLayout>
 
-  <script>
-    import { navigate } from "astro:transitions/client";
+<script>
+  import { navigate } from "astro:transitions/client";
 
-    const roomInput = document.getElementById('room') as HTMLInputElement;
-    const peerURLInput = document.getElementById('peerURL') as HTMLInputElement;
-    const roomList = document.getElementById('room-list');
-    const peerURLList = document.getElementById('peerURL-list');
+  const roomInput = document.getElementById('room') as HTMLInputElement;
+  const peerURLInput = document.getElementById('peerURL') as HTMLInputElement;
+  const roomList = document.getElementById('room-list');
+  const peerURLList = document.getElementById('peerURL-list');
 
-    // Load values from cookies
-    function getCookie(name) {
-      const value = `; ${document.cookie}`;
-      const parts = value.split(`; ${name}=`);
-      if (parts.length === 2) {
-        const cookieValue = parts.pop()?.split(';').shift();
-        return cookieValue ? decodeURIComponent(cookieValue) : undefined;
-      }
-    }
+  // Load values from localStorage
+  const storedRooms = JSON.parse(localStorage.getItem('nestri-rooms') || '[]');
+  const storedPeerURLs = JSON.parse(localStorage.getItem('nestri-peerURLs') || '[]');
 
-    function setCookie(name, value, days) {
-      const d = new Date();
-      d.setTime(d.getTime() + (days*24*60*60*1000));
-      const expires = "expires="+ d.toUTCString();
-      document.cookie = name + "=" + encodeURIComponent(value) + ";" + expires + ";path=/";
-    }
-
-    const storedRooms = JSON.parse(getCookie('nestri-rooms') || '[]');
-    const storedPeerURLs = JSON.parse(getCookie('nestri-peerURLs') || '[]');
-
-    if (roomList) {
-      storedRooms.forEach(room => {
-        const option = document.createElement('option');
-        option.value = room;
-        roomList.appendChild(option);
-      });
-    }
-
-    if (peerURLList) {
-      storedPeerURLs.forEach(peerURL => {
-        const option = document.createElement('option');
-        option.value = peerURL;
-        peerURLList.appendChild(option);
-      });
-    }
-
-    if (storedRooms.length > 0 && roomInput) {
-      roomInput.value = storedRooms[0];
-    }
-    if (storedPeerURLs.length > 0 && peerURLInput) {
-      peerURLInput.value = storedPeerURLs[0];
-    }
-
-    document.getElementById('join-form')?.addEventListener('submit', function(event) {
-      event.preventDefault();
-      const room = roomInput.value;
-      const peerURL = peerURLInput.value;
-
-      // Save values to cookies
-      const newRooms = [room, ...storedRooms.filter(r => r !== room)].slice(0, 10);
-      const newPeerURLs = [peerURL, ...storedPeerURLs.filter(p => p !== peerURL)].slice(0, 10);
-
-      setCookie('nestri-rooms', JSON.stringify(newRooms), 365);
-      setCookie('nestri-peerURLs', JSON.stringify(newPeerURLs), 365);
-
-      if (room && peerURL) {
-        navigate(`/play/index.html?peerURL=${encodeURIComponent(peerURL)}#${room}`);
-      }
+  if (roomList) {
+    storedRooms.forEach(room => {
+      const option = document.createElement('option');
+      option.value = room;
+      roomList.appendChild(option);
     });
-  </script>
-</body>
-</html>
+  }
+
+  if (peerURLList) {
+    storedPeerURLs.forEach(peerURL => {
+      const option = document.createElement('option');
+      option.value = peerURL;
+      peerURLList.appendChild(option);
+    });
+  }
+
+  if (storedRooms.length > 0 && roomInput) {
+    roomInput.value = storedRooms[0];
+  }
+  if (storedPeerURLs.length > 0 && peerURLInput) {
+    peerURLInput.value = storedPeerURLs[0];
+  }
+
+  document.getElementById('join-form')?.addEventListener('submit', function(event) {
+    event.preventDefault();
+    const room = roomInput.value;
+    const peerURL = peerURLInput.value;
+
+    // Save values to localStorage
+    const newRooms = [room, ...storedRooms.filter(r => r !== room)].slice(0, 10);
+    const newPeerURLs = [peerURL, ...storedPeerURLs.filter(p => p !== peerURL)].slice(0, 10);
+
+    localStorage.setItem('nestri-rooms', JSON.stringify(newRooms));
+    localStorage.setItem('nestri-peerURLs', JSON.stringify(newPeerURLs));
+
+    if (room && peerURL) {
+      navigate(`/play/index.html?peerURL=${encodeURIComponent(peerURL)}#${room}`);
+    }
+  });
+</script>

packages/play-standalone/src/pages/play.astro

@@ -24,6 +24,22 @@ if (envs_map.size > 0) {
 
 <script>
 	import { Mouse, Keyboard, Controller, WebRTCStream } from "@nestri/input";
+	import { ScreenOrientation } from '@capacitor/screen-orientation';
+
+	// Lock to landscape
+	const lockOrientation = async () => {
+		try {
+			await ScreenOrientation.lock({ orientation: 'landscape' });
+		} catch (e) {
+			console.warn("Screen orientation lock failed:", e);
+		}
+	};
+	lockOrientation();
+
+	window.addEventListener('beforeunload', () => {
+		ScreenOrientation.unlock();
+	});
+
 	const ENVS = document.getElementById("ENVS")!.dataset.envs as string;
 	let ENVS_MAP: Map<string, string | undefined> | null = null;
 	if (ENVS && ENVS.length > 0) {

packages/play-standalone/src/styles/index.css

@@ -0,0 +1,144 @@
+:root {
+  --color-background: #191919;
+  --color-surface: #252525;
+  --color-primary: #f97316; /* Orange-500 */
+  --color-primary-hover: #ea580c; /* Orange-600 */
+  --color-text-main: #ffffff;
+  --color-text-muted: #a1a1aa;
+  --color-border: #3f3f46;
+  color-scheme: dark;
+}
+
+.page-container {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  min-height: 100vh;
+  width: 100%;
+  padding: 2rem;
+  box-sizing: border-box;
+}
+
+.grid-system {
+  width: 100%;
+  max-width: 1400px;
+}
+
+.grid-root {
+  display: grid;
+  grid-template-columns: repeat(4, 1fr);
+  gap: 1rem;
+}
+
+@media (min-width: 768px) {
+  .grid-root {
+    grid-template-columns: repeat(12, 1fr);
+  }
+}
+
+.grid-block {
+  grid-column: 1 / -1;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+
+@media (min-width: 768px) {
+  .grid-block {
+    grid-column: 4 / 10; /* Center in the middle 6 columns */
+  }
+}
+
+.stack {
+  display: flex;
+  flex-direction: column;
+  gap: 3rem;
+  width: 100%;
+  max-width: 500px;
+  text-align: center;
+}
+
+.header-stack {
+  display: flex;
+  flex-direction: column;
+  gap: 1rem;
+  align-items: center;
+}
+
+h2 {
+  font-size: 2.5rem;
+  font-weight: 700;
+  margin: 0;
+  color: var(--color-text-main);
+  letter-spacing: -0.02em;
+}
+
+.subtitle {
+  color: var(--color-text-muted);
+  font-size: 1rem;
+  line-height: 1.5;
+  margin: 0;
+}
+
+.form-stack {
+  display: flex;
+  flex-direction: column;
+  gap: 1rem;
+  width: 100%;
+}
+
+.input-group {
+  width: 100%;
+}
+
+input {
+  width: 100%;
+  padding: 0.75rem 1rem;
+  background-color: var(--color-surface);
+  border: 2px solid transparent;
+  border-radius: 4px;
+  color: var(--color-text-main);
+  font-size: 1rem;
+  transition: all 0.2s ease;
+  box-sizing: border-box;
+  caret-color: var(--color-primary);
+}
+
+input:focus {
+  outline: none;
+  border-color: var(--color-primary);
+  background-color: #2a2a2a;
+  color: var(--color-text-main);
+}
+
+input::placeholder {
+  color: #52525b;
+}
+
+button {
+  width: 100%;
+  padding: 0.75rem 1.5rem;
+  background-color: var(--color-primary);
+  color: white;
+  border: none;
+  border-radius: 9999px; /* Full rounded like signup */
+  font-size: 1rem;
+  font-weight: 600;
+  text-transform: uppercase;
+  cursor: pointer;
+  transition: background-color 0.2s ease;
+  margin-top: 1rem;
+}
+
+button:hover {
+  background-color: var(--color-primary-hover);
+}
+
+/* Autofill styling fix for dark mode */
+input:-webkit-autofill,
+input:-webkit-autofill:hover, 
+input:-webkit-autofill:focus, 
+input:-webkit-autofill:active{
+    -webkit-box-shadow: 0 0 0 30px var(--color-surface) inset !important;
+    -webkit-text-fill-color: var(--color-text-main) !important;
+}

packages/scripts/entrypoint_nestri.sh

@@ -106,12 +106,9 @@ start_compositor() {
     kill_if_running "${COMPOSITOR_PID:-}" "compositor"
     kill_if_running "${APP_PID:-}" "application"
 
-    # Set default values only if variables are unset (not empty)
-    if [[ -z "${NESTRI_LAUNCH_CMD+x}" ]]; then
-        NESTRI_LAUNCH_CMD="dbus-launch steam -tenfoot -cef-force-gpu"
-    fi
+    # Set default compositor if unset
     if [[ -z "${NESTRI_LAUNCH_COMPOSITOR+x}" ]]; then
-        NESTRI_LAUNCH_COMPOSITOR="gamescope --backend wayland --force-grab-cursor -g -f --rt --mangoapp -W ${WIDTH} -H ${HEIGHT} -r ${FRAMERATE:-60}"
+        NESTRI_LAUNCH_COMPOSITOR="gamescope --backend wayland --force-grab-cursor -g -f --rt -W ${WIDTH} -H ${HEIGHT} -r ${FRAMERATE:-60}"
     fi
 
     # If PRELOAD_SHIM_arch's are set and exist, set LD_PRELOAD for 32/64-bit apps
@@ -121,6 +118,16 @@ start_compositor() {
         log "Using LD_PRELOAD shim(s)"
     fi
 
+    # Configure launch cmd with dbus if set
+    local launch_cmd=""
+    if [[ -n "${NESTRI_LAUNCH_CMD+x}" ]]; then
+        if $do_ld_preload; then
+            launch_cmd="LD_PRELOAD='/usr/\$LIB/libvimputti_shim.so' dbus-launch $NESTRI_LAUNCH_CMD"
+        else
+            launch_cmd="dbus-launch $NESTRI_LAUNCH_CMD"
+        fi
+    fi
+
     # Launch compositor if configured
     if [[ -n "${NESTRI_LAUNCH_COMPOSITOR}" ]]; then
         local compositor_cmd="$NESTRI_LAUNCH_COMPOSITOR"
@@ -129,17 +136,12 @@ start_compositor() {
         # Check if this is a gamescope command
         if [[ "$compositor_cmd" == *"gamescope"* ]]; then
             is_gamescope=true
-            if [[ -n "$NESTRI_LAUNCH_CMD" ]] && [[ "$compositor_cmd" != *" -- "* ]]; then
-                # If steam in launch command, enable gamescope integration via -e
-                if [[ "$NESTRI_LAUNCH_CMD" == *"steam"* ]]; then
-                    compositor_cmd+=" -e"
-                fi
-                # If ld_preload is true, add env with LD_PRELOAD
-                if $do_ld_preload; then
-                    compositor_cmd+=" -- env LD_PRELOAD='/usr/\$LIB/libvimputti_shim.so' bash -c $(printf %q "$NESTRI_LAUNCH_CMD")"
-                else
-                    compositor_cmd+=" -- bash -c $(printf %q "$NESTRI_LAUNCH_CMD")"
+            if [[ -n "$launch_cmd" ]] && [[ "$compositor_cmd" != *" -- "* ]]; then
+                # If steam in launch command, enable gamescope integration via -e and enable mangohud
+                if [[ "$launch_cmd" == *"steam"* ]]; then
+                    compositor_cmd+=" --mangoapp -e"
                 fi
+                compositor_cmd+=" -- bash -c $(printf %q "$launch_cmd")"
             fi
         fi
 
@@ -185,9 +187,9 @@ start_compositor() {
                     WAYLAND_DISPLAY=wayland-0 wlr-randr --output "$OUTPUT_NAME" --custom-mode "$WIDTH"x"$HEIGHT"
                     log "Patched resolution with wlr-randr"
 
-                    if [[ -n "${NESTRI_LAUNCH_CMD}" ]]; then
-                        log "Starting application: $NESTRI_LAUNCH_CMD"
-                        WAYLAND_DISPLAY="$COMPOSITOR_SOCKET" /bin/bash -c "$NESTRI_LAUNCH_CMD" &
+                    if [[ -n "$launch_cmd" ]]; then
+                        log "Starting application: $launch_cmd"
+                        WAYLAND_DISPLAY="$COMPOSITOR_SOCKET" bash -c "$launch_cmd" &
                         APP_PID=$!
                     fi
                 else
@@ -200,9 +202,9 @@ start_compositor() {
         log "Warning: Compositor socket not found after 15 seconds ($COMPOSITOR_SOCKET)"
     else
         # Launch standalone application if no compositor
-        if [[ -n "${NESTRI_LAUNCH_CMD}" ]]; then
-            log "Starting application: $NESTRI_LAUNCH_CMD"
-            WAYLAND_DISPLAY=wayland-1 /bin/bash -c "$NESTRI_LAUNCH_CMD" &
+        if [[ -n "$launch_cmd" ]]; then
+            log "Starting standalone application: $launch_cmd"
+            WAYLAND_DISPLAY=wayland-1 bash -c "$launch_cmd" &
             APP_PID=$!
         else
             log "No compositor or application configured"

packages/scripts/envs.sh

@@ -4,8 +4,6 @@ export USER=${NESTRI_USER}
 export LANG=${NESTRI_LANG}
 export HOME=${NESTRI_HOME}
 export XDG_RUNTIME_DIR=${NESTRI_XDG_RUNTIME_DIR}
-export XDG_SESSION_TYPE=x11
-export DISPLAY=:0
 
 # Causes some setups to break
 export PROTON_NO_FSYNC=1
@@ -13,3 +11,6 @@ export PROTON_NO_FSYNC=1
 # Make gstreamer GL elements work without display output (NVIDIA issue..)
 export GST_GL_API=gles2
 export GST_GL_WINDOW=surfaceless
+
+# Gamescope does not respect MangoHud default config location
+export MANGOHUD_CONFIGFILE=${NESTRI_HOME}/.config/MangoHud/MangoHud.conf