From 9cd7f8ac3e55b95c553273fe2c03407ec9cf8f9e Mon Sep 17 00:00:00 2001 From: Meisterlala <6453306+Meisterlala@users.noreply.github.com> Date: Sat, 15 Aug 2026 22:07:43 +0200 Subject: [PATCH] Update .config/gamemode/gamemode-end.sh Update .config/gamemode/gamemode-start.sh --- .../gamemode/executable_gamemode-end.sh | 25 +++-------------- .../gamemode/executable_gamemode-start.sh | 27 +++++-------------- 2 files changed, 11 insertions(+), 41 deletions(-) diff --git a/dot_config/gamemode/executable_gamemode-end.sh b/dot_config/gamemode/executable_gamemode-end.sh index a7e3795..a7dc1fd 100644 --- a/dot_config/gamemode/executable_gamemode-end.sh +++ b/dot_config/gamemode/executable_gamemode-end.sh @@ -1,8 +1,7 @@ #!/bin/sh PID_FILE="${XDG_RUNTIME_DIR:-/tmp}/gamemode-inhibit.pid" -LLAMA_STATE="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}/gamemode-llama-services" -LEGACY_LLAMA_MARKER="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}/llama-swap-gamemode.was-active" +LLAMA_STATE="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}/gamemode-llama-swap.state" if [ -f "$PID_FILE" ]; then pid=$(cat "$PID_FILE" 2>/dev/null) @@ -15,23 +14,7 @@ fi /home/misti/.cargo/bin/wp mode random >/dev/null 2>&1 || true swaync-client -df -sw >/dev/null 2>&1 || true -# Restore only the router that GameMode stopped. Accept the old marker once so -# an upgrade performed during an active game still restores llama-swap on exit. -if [ -f "$LEGACY_LLAMA_MARKER" ]; then - rm -f "$LEGACY_LLAMA_MARKER" - if [ ! -f "$LLAMA_STATE" ]; then - printf '%s\n' llama-swap.service > "$LLAMA_STATE" - fi -fi - -if [ -f "$LLAMA_STATE" ]; then - services=$(cat "$LLAMA_STATE") - rm -f "$LLAMA_STATE" - for service in $services; do - case "$service" in - llama-swap.service|llama-server.service) - /usr/bin/systemctl --user start "$service" >/dev/null 2>&1 || true - ;; - esac - done +if [ "$(cat "$LLAMA_STATE" 2>/dev/null)" = active ]; then + /usr/bin/systemctl --user start llama-swap.service >/dev/null 2>&1 || true fi +rm -f "$LLAMA_STATE" diff --git a/dot_config/gamemode/executable_gamemode-start.sh b/dot_config/gamemode/executable_gamemode-start.sh index 6d9c45b..06c258c 100644 --- a/dot_config/gamemode/executable_gamemode-start.sh +++ b/dot_config/gamemode/executable_gamemode-start.sh @@ -1,7 +1,7 @@ #!/bin/sh PID_FILE="${XDG_RUNTIME_DIR:-/tmp}/gamemode-inhibit.pid" -LLAMA_STATE="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}/gamemode-llama-services" +LLAMA_STATE="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}/gamemode-llama-swap.state" if [ -f "$PID_FILE" ]; then pid=$(cat "$PID_FILE" 2>/dev/null) @@ -23,23 +23,10 @@ fi /home/misti/.cargo/bin/wp mode static >/dev/null 2>&1 || true swaync-client -dn -sw >/dev/null 2>&1 || true -# Remember the router that was running before GameMode, then stop every local -# llama router. Stopping (rather than freezing) unloads child models and frees VRAM. -if [ ! -f "$LLAMA_STATE" ]; then - state_tmp="${LLAMA_STATE}.tmp" - rm -f "$state_tmp" - for service in llama-swap.service llama-server.service; do - if /usr/bin/systemctl --user is-active --quiet "$service"; then - printf '%s\n' "$service" >> "$state_tmp" - fi - done - if [ -s "$state_tmp" ]; then - mv "$state_tmp" "$LLAMA_STATE" - else - rm -f "$state_tmp" - fi +# Save the router's state, then stop it so child models release VRAM. +if /usr/bin/systemctl --user is-active --quiet llama-swap.service; then + printf '%s\n' active > "$LLAMA_STATE" +else + printf '%s\n' inactive > "$LLAMA_STATE" fi - -# The preset watcher can restart llama-server when models.ini changes. -/usr/bin/systemctl --user stop llama-server-models.path >/dev/null 2>&1 || true -/usr/bin/systemctl --user stop llama-server.service llama-swap.service >/dev/null 2>&1 || true +/usr/bin/systemctl --user stop llama-swap.service >/dev/null 2>&1 || true -- 2.51.2