diff options
| author | Don Williams <don.e.williams@gmail.com> | 2026-08-09 03:05:36 -0400 |
|---|---|---|
| committer | Pinapelz <yukais@pinapelz.com> | 2026-08-29 21:41:34 -0700 |
| commit | f1694b519cd73d1bf2b2424ed893489cd1a8d8b3 (patch) | |
| tree | b8e2bd4e54c7b06142508c9e60090a0882c38ebc /config/hypr/lua | |
| parent | 1f754ef8cfc24cb29b18ba1bf905fb73e56e8d2e (diff) | |
Fix: waybar startup/restart in Fedora
Conflicts with waybar.service when hyprland-uwsm session not selected
Fixed startup config files
Added gate check for AGS to remove errors when not installed
Signed-off-by: Don Williams <don.e.williams@gmail.com>
On branch development
Your branch is up to date with 'origin/development'.
Changes to be committed:
modified: CHANGELOG.md
modified: config/hypr/configs/Startup_Apps.conf
modified: config/hypr/lua/startup.lua
modified: config/hypr/lua/user_startup_helper.lua
modified: config/hypr/scripts/DarkLight.sh
modified: config/hypr/scripts/PortalHyprland.sh
modified: config/hypr/scripts/Refresh.sh
modified: config/hypr/scripts/ToggleWaybarTime.sh
modified: config/hypr/scripts/WaybarStartup.sh
modified: scripts/migrate-hypr-to-lua.sh
Diffstat (limited to 'config/hypr/lua')
| -rw-r--r-- | config/hypr/lua/startup.lua | 2 | ||||
| -rw-r--r-- | config/hypr/lua/user_startup_helper.lua | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config/hypr/lua/startup.lua b/config/hypr/lua/startup.lua index 88a9b106..429c2ce7 100644 --- a/config/hypr/lua/startup.lua +++ b/config/hypr/lua/startup.lua @@ -26,7 +26,7 @@ local function exec_once(cmd) local marker = "/tmp/hypr-lua-exec-once-" .. session .. "-" .. key local log = "/tmp/hypr-lua-startup-" .. key .. ".log" local readiness = - 'runtime=${XDG_RUNTIME_DIR:-/run/user/$(id -u)}; export XDG_RUNTIME_DIR="$runtime"; for _ in $(seq 1 200); do if [ -n "$WAYLAND_DISPLAY" ] && [ -S "$runtime/$WAYLAND_DISPLAY" ]; then break; fi; for sock in "$runtime"/wayland-[0-9]*; do [ -S "$sock" ] || continue; case "$(basename "$sock")" in *awww*) continue ;; esac; export WAYLAND_DISPLAY="$(basename "$sock")"; break 2; done; sleep 0.1; done; if [ -n "$HYPRLAND_INSTANCE_SIGNATURE" ]; then hypr_sock="$runtime/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket.sock"; for _ in $(seq 1 200); do [ -S "$hypr_sock" ] && break; sleep 0.1; done; fi' + 'runtime=${XDG_RUNTIME_DIR:-/run/user/$(id -u)}; export XDG_RUNTIME_DIR="$runtime"; for _ in $(seq 1 30); do if [ -n "$WAYLAND_DISPLAY" ] && [ -S "$runtime/$WAYLAND_DISPLAY" ]; then break; fi; for sock in "$runtime"/wayland-[0-9]*; do [ -S "$sock" ] || continue; case "$(basename "$sock")" in *awww*) continue ;; esac; export WAYLAND_DISPLAY="$(basename "$sock")"; break 2; done; sleep 0.1; done; if [ -n "$HYPRLAND_INSTANCE_SIGNATURE" ]; then for hypr_sock in "$runtime/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket.sock" "$runtime/hypr/.socket.sock"; do [ -S "$hypr_sock" ] && break 2; done; sleep 0.1; fi' local inner = readiness .. "; " .. cmd local script = "[ -e " .. shell_quote(marker) diff --git a/config/hypr/lua/user_startup_helper.lua b/config/hypr/lua/user_startup_helper.lua index 2cc050b9..b26eac61 100644 --- a/config/hypr/lua/user_startup_helper.lua +++ b/config/hypr/lua/user_startup_helper.lua @@ -23,7 +23,7 @@ local function exec_once(cmd, opts) local key = cmd:gsub("[^%w_.-]", "_"):sub(1, 80) local marker = marker_prefix .. session .. "-" .. key local log = log_prefix .. key .. ".log" - local readiness = [[runtime=${XDG_RUNTIME_DIR:-/run/user/$(id -u)}; export XDG_RUNTIME_DIR="$runtime"; for _ in $(seq 1 200); do if [ -n "$WAYLAND_DISPLAY" ] && [ -S "$runtime/$WAYLAND_DISPLAY" ]; then break; fi; for sock in "$runtime"/wayland-[0-9]*; do [ -S "$sock" ] || continue; case "$(basename "$sock")" in *awww*) continue ;; esac; export WAYLAND_DISPLAY="$(basename "$sock")"; break 2; done; sleep 0.1; done; if [ -n "$HYPRLAND_INSTANCE_SIGNATURE" ]; then hypr_sock="$runtime/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket.sock"; for _ in $(seq 1 200); do [ -S "$hypr_sock" ] && break; sleep 0.1; done; fi]] + local readiness = [[runtime=${XDG_RUNTIME_DIR:-/run/user/$(id -u)}; export XDG_RUNTIME_DIR="$runtime"; for _ in $(seq 1 30); do if [ -n "$WAYLAND_DISPLAY" ] && [ -S "$runtime/$WAYLAND_DISPLAY" ]; then break; fi; for sock in "$runtime"/wayland-[0-9]*; do [ -S "$sock" ] || continue; case "$(basename "$sock")" in *awww*) continue ;; esac; export WAYLAND_DISPLAY="$(basename "$sock")"; break 2; done; sleep 0.1; done; if [ -n "$HYPRLAND_INSTANCE_SIGNATURE" ]; then for hypr_sock in "$runtime/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket.sock" "$runtime/hypr/.socket.sock"; do [ -S "$hypr_sock" ] && break 2; done; sleep 0.1; fi]] local inner = readiness .. "; " .. cmd local script = "[ -e " .. shell_quote(marker) .. " ] || { touch " .. shell_quote(marker) .. " && sh -lc " .. shell_quote(inner) .. " >>" .. shell_quote(log) .. " 2>&1 & }" os.execute("sh -lc " .. shell_quote(script)) |