From f1694b519cd73d1bf2b2424ed893489cd1a8d8b3 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Sun, 9 Aug 2026 03:05:36 -0400 Subject: 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 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 --- config/hypr/scripts/PortalHyprland.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'config/hypr/scripts/PortalHyprland.sh') diff --git a/config/hypr/scripts/PortalHyprland.sh b/config/hypr/scripts/PortalHyprland.sh index 54ea71bb..e1ed2cae 100755 --- a/config/hypr/scripts/PortalHyprland.sh +++ b/config/hypr/scripts/PortalHyprland.sh @@ -120,12 +120,14 @@ restart_portal_via_systemd() { done systemctl --user start xdg-desktop-portal-hyprland.service >/dev/null 2>&1 || true - if is_ubuntu_family; then + if command -v /usr/libexec/xdg-desktop-portal-gtk >/dev/null 2>&1 || command -v /usr/lib/xdg-desktop-portal-gtk >/dev/null 2>&1 || is_ubuntu_family; then systemctl --user start xdg-desktop-portal-gtk.service >/dev/null 2>&1 || true fi + systemctl --user start xdg-desktop-portal.service >/dev/null 2>&1 || true for _ in $(seq 1 60); do - if systemctl --user is-active --quiet xdg-desktop-portal-hyprland.service; then + if systemctl --user is-active --quiet xdg-desktop-portal-hyprland.service && \ + systemctl --user is-active --quiet xdg-desktop-portal.service; then return 0 fi sleep 0.1 @@ -144,11 +146,9 @@ restart_portal_manually() { sleep 2 - if is_ubuntu_family; then - start_portal_binary "xdg-desktop-portal-gtk" \ - /usr/lib/xdg-desktop-portal-gtk \ - /usr/libexec/xdg-desktop-portal-gtk || true - fi + start_portal_binary "xdg-desktop-portal-gtk" \ + /usr/lib/xdg-desktop-portal-gtk \ + /usr/libexec/xdg-desktop-portal-gtk || true start_portal_binary "xdg-desktop-portal" \ /usr/lib/xdg-desktop-portal \ -- cgit v1.2.3