From 9576327863552f5bd3669f92e461d3aa7ab459b1 Mon Sep 17 00:00:00 2001 From: DatCaptainHorse Date: Fri, 7 Nov 2025 15:50:42 +0200 Subject: [PATCH] Rabbit nitpicks 3 and new MangoHud config --- containerfiles/runner.Containerfile | 5 ++ packages/configs/MangoHud/MangoHud.conf | 48 +++++++++++++++++++ .../relay/internal/core/protocol_stream.go | 4 +- packages/scripts/envs.sh | 3 -- 4 files changed, 55 insertions(+), 5 deletions(-) create mode 100644 packages/configs/MangoHud/MangoHud.conf diff --git a/containerfiles/runner.Containerfile b/containerfiles/runner.Containerfile index 7e0de173..7cdc6c4f 100644 --- a/containerfiles/runner.Containerfile +++ b/containerfiles/runner.Containerfile @@ -72,6 +72,11 @@ 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" + +COPY packages/configs/MangoHud/MangoHud.conf "${NESTRI_HOME}/.config/MangoHud/" + ### Artifacts from Builder ### COPY --from=builder /artifacts/bin/nestri-server /usr/bin/ COPY --from=builder /artifacts/bin/bwrap /usr/bin/ diff --git a/packages/configs/MangoHud/MangoHud.conf b/packages/configs/MangoHud/MangoHud.conf new file mode 100644 index 00000000..41a1cf48 --- /dev/null +++ b/packages/configs/MangoHud/MangoHud.conf @@ -0,0 +1,48 @@ +legacy_layout=false + +# common +horizontal +horizontal_stretch +hud_no_margin +no_small_font +background_alpha=0.66 +round_corners=0 +background_color=000000 +font_size=24 +position=top-left +engine_short_names + +# colors +text_color=DFDFDF +gpu_color=FF4E00 +cpu_color=00AA00 +engine_color=00AA00 +vram_color=00AA00 +ram_color=00AA00 +frametime_color=FF4E00 + +# load colors +cpu_load_color=DFDFDF,DF964D,DF3D3D +gpu_load_color=DFDFDF,DF964D,DF3D3D + +# GPU and VRAM +gpu_text=NESTRI +gpu_stats +gpu_load_change +gpu_load_value=70,90 + +vram + +# CPU and RAM +cpu_text=CPU +cpu_stats +cpu_load_change +cpu_load_value=70,90 + +ram + +# FPS and timing +fps +fps_metrics=0.01 + +frame_timing diff --git a/packages/relay/internal/core/protocol_stream.go b/packages/relay/internal/core/protocol_stream.go index 4832f726..9c847ba0 100644 --- a/packages/relay/internal/core/protocol_stream.go +++ b/packages/relay/internal/core/protocol_stream.go @@ -402,7 +402,7 @@ func (sp *StreamProtocol) handleStreamPush(stream network.Stream) { slog.Debug("Stream push connection closed by peer", "peer", stream.Conn().RemotePeer(), "error", err) if room != nil { room.Close() - sp.incomingConns.Set(room.Name, nil) + sp.incomingConns.Delete(room.Name) } return } @@ -411,7 +411,7 @@ func (sp *StreamProtocol) handleStreamPush(stream network.Stream) { _ = stream.Reset() if room != nil { room.Close() - sp.incomingConns.Set(room.Name, nil) + sp.incomingConns.Delete(room.Name) } return } diff --git a/packages/scripts/envs.sh b/packages/scripts/envs.sh index 2542da6c..43650f17 100644 --- a/packages/scripts/envs.sh +++ b/packages/scripts/envs.sh @@ -10,9 +10,6 @@ export DISPLAY=:0 # Causes some setups to break export PROTON_NO_FSYNC=1 -# Sleeker Mangohud preset :) -export MANGOHUD_CONFIG=preset=2 - # Make gstreamer GL elements work without display output (NVIDIA issue..) export GST_GL_API=gles2 export GST_GL_WINDOW=surfaceless