diff --git a/packaging/souveraine-sessiond.service b/packaging/souveraine-sessiond.service index ffea9b3..b40f8c0 100644 --- a/packaging/souveraine-sessiond.service +++ b/packaging/souveraine-sessiond.service @@ -1,8 +1,10 @@ [Unit] Description=Souveraine session authority (lock-before-shell, lock-past-shell-death) -# Started explicitly from the hyprland.start hook after WAYLAND_DISPLAY is -# imported into the user manager — same lifecycle pattern as hypridle. -PartOf=graphical-session.target +# graphical-session-pre, not graphical-session: the authority takes +# ext-session-lock before any surface exists, and -pre is the window systemd +# already reserves for that. It cannot start earlier — ext-session-lock is a +# Wayland protocol and needs the compositor's socket. +PartOf=graphical-session-pre.target [Service] ExecStart=/usr/bin/souveraine-sessiond @@ -10,4 +12,4 @@ Restart=on-failure RestartSec=1 [Install] -WantedBy=graphical-session.target +WantedBy=graphical-session-pre.target diff --git a/surfaces/quickshell/ii-base/scripts/colors/generate_colors_material.py b/surfaces/quickshell/ii-base/scripts/colors/generate_colors_material.py index f8ce286..c97ff0e 100755 --- a/surfaces/quickshell/ii-base/scripts/colors/generate_colors_material.py +++ b/surfaces/quickshell/ii-base/scripts/colors/generate_colors_material.py @@ -1,4 +1,4 @@ -#!/usr/bin/env -S\_/bin/sh\_-c\_"source\_\$(eval\_echo\_\$ILLOGICAL_IMPULSE_VIRTUAL_ENV)/bin/activate&&exec\_python\_-E\_"\$0"\_"\$@"" +#!/usr/bin/env -S\_/bin/sh\_-c\_"source\_\$HOME/.local/state/quickshell/.venv/bin/activate&&exec\_python\_-E\_"\$0"\_"\$@"" import argparse import math import json diff --git a/surfaces/quickshell/ii-base/scripts/colors/switchwall.sh b/surfaces/quickshell/ii-base/scripts/colors/switchwall.sh index 6948d64..dabb165 100755 --- a/surfaces/quickshell/ii-base/scripts/colors/switchwall.sh +++ b/surfaces/quickshell/ii-base/scripts/colors/switchwall.sh @@ -306,7 +306,7 @@ switch() { fi matugen "${matugen_args[@]}" - source "$(eval echo $ILLOGICAL_IMPULSE_VIRTUAL_ENV)/bin/activate" + source "$HOME/.local/state/quickshell/.venv/bin/activate" python3 "$SCRIPT_DIR/generate_colors_material.py" "${generate_colors_material_args[@]}" \ > "$STATE_DIR"/user/generated/material_colors.scss deactivate @@ -339,7 +339,7 @@ main() { detect_scheme_type_from_image() { local img="$1" - source "$(eval echo $ILLOGICAL_IMPULSE_VIRTUAL_ENV)/bin/activate" + source "$HOME/.local/state/quickshell/.venv/bin/activate" "$SCRIPT_DIR"/scheme_for_image.py "$img" 2>/dev/null | tr -d '\n' deactivate } diff --git a/surfaces/quickshell/ii-base/scripts/hyprland/hyprconfigurator.py b/surfaces/quickshell/ii-base/scripts/hyprland/hyprconfigurator.py index 10bf4ea..d668bf8 100755 --- a/surfaces/quickshell/ii-base/scripts/hyprland/hyprconfigurator.py +++ b/surfaces/quickshell/ii-base/scripts/hyprland/hyprconfigurator.py @@ -1,4 +1,4 @@ -#!/usr/bin/env -S\_/bin/sh\_-c\_"source\_\$(eval\_echo\_\$ILLOGICAL_IMPULSE_VIRTUAL_ENV)/bin/activate&&exec\_python\_-E\_"\$0"\_"\$@"" +#!/usr/bin/env -S\_/bin/sh\_-c\_"source\_\$HOME/.local/state/quickshell/.venv/bin/activate&&exec\_python\_-E\_"\$0"\_"\$@"" import argparse import re import os diff --git a/surfaces/quickshell/ii-base/scripts/images/find-regions-venv.sh b/surfaces/quickshell/ii-base/scripts/images/find-regions-venv.sh index d31fe4a..3bbf57a 100755 --- a/surfaces/quickshell/ii-base/scripts/images/find-regions-venv.sh +++ b/surfaces/quickshell/ii-base/scripts/images/find-regions-venv.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -source $(eval echo $ILLOGICAL_IMPULSE_VIRTUAL_ENV)/bin/activate +source "$HOME/.local/state/quickshell/.venv/bin/activate" "$SCRIPT_DIR/find_regions.py" "$@" deactivate diff --git a/surfaces/quickshell/ii-base/scripts/images/least-busy-region-venv.sh b/surfaces/quickshell/ii-base/scripts/images/least-busy-region-venv.sh index 3a5e90d..da5ffb4 100755 --- a/surfaces/quickshell/ii-base/scripts/images/least-busy-region-venv.sh +++ b/surfaces/quickshell/ii-base/scripts/images/least-busy-region-venv.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -source $(eval echo $ILLOGICAL_IMPULSE_VIRTUAL_ENV)/bin/activate +source "$HOME/.local/state/quickshell/.venv/bin/activate" "$SCRIPT_DIR/least_busy_region.py" "$@" deactivate diff --git a/surfaces/quickshell/ii-base/scripts/images/text-color-venv.sh b/surfaces/quickshell/ii-base/scripts/images/text-color-venv.sh index f673bd6..ce2f3b6 100755 --- a/surfaces/quickshell/ii-base/scripts/images/text-color-venv.sh +++ b/surfaces/quickshell/ii-base/scripts/images/text-color-venv.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -source $(eval echo $ILLOGICAL_IMPULSE_VIRTUAL_ENV)/bin/activate +source "$HOME/.local/state/quickshell/.venv/bin/activate" "$SCRIPT_DIR/text_color.py" "$@" deactivate diff --git a/surfaces/quickshell/ii-base/scripts/thumbnails/thumbgen-venv.sh b/surfaces/quickshell/ii-base/scripts/thumbnails/thumbgen-venv.sh index 9b0d923..c9d6743 100755 --- a/surfaces/quickshell/ii-base/scripts/thumbnails/thumbgen-venv.sh +++ b/surfaces/quickshell/ii-base/scripts/thumbnails/thumbgen-venv.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -source $(eval echo $ILLOGICAL_IMPULSE_VIRTUAL_ENV)/bin/activate +source "$HOME/.local/state/quickshell/.venv/bin/activate" GIO_USE_VFS=local "$SCRIPT_DIR/thumbgen.py" "$@" THUMBGEN_EXIT_CODE=$? deactivate diff --git a/surfaces/quickshell/ii-base/services/gCloud/token-from-key-venv.sh b/surfaces/quickshell/ii-base/services/gCloud/token-from-key-venv.sh index fd9e255..6f65c15 100755 --- a/surfaces/quickshell/ii-base/services/gCloud/token-from-key-venv.sh +++ b/surfaces/quickshell/ii-base/services/gCloud/token-from-key-venv.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -source $(eval echo $ILLOGICAL_IMPULSE_VIRTUAL_ENV)/bin/activate +source "$HOME/.local/state/quickshell/.venv/bin/activate" "$SCRIPT_DIR/token_from_key.py" "$@" deactivate diff --git a/surfaces/quickshell/ii-phone/scripts/colors/switchwall.sh b/surfaces/quickshell/ii-phone/scripts/colors/switchwall.sh index 1f0ebf0..bbdf6c8 100755 --- a/surfaces/quickshell/ii-phone/scripts/colors/switchwall.sh +++ b/surfaces/quickshell/ii-phone/scripts/colors/switchwall.sh @@ -307,7 +307,7 @@ switch() { fi matugen "${matugen_args[@]}" - source "$(eval echo $ILLOGICAL_IMPULSE_VIRTUAL_ENV)/bin/activate" + source "$HOME/.local/state/quickshell/.venv/bin/activate" python3 "$SCRIPT_DIR/generate_colors_material.py" "${generate_colors_material_args[@]}" \ > "$STATE_DIR"/user/generated/material_colors.scss deactivate @@ -340,7 +340,7 @@ main() { detect_scheme_type_from_image() { local img="$1" - source "$(eval echo $ILLOGICAL_IMPULSE_VIRTUAL_ENV)/bin/activate" + source "$HOME/.local/state/quickshell/.venv/bin/activate" "$SCRIPT_DIR"/scheme_for_image.py "$img" 2>/dev/null | tr -d '\n' deactivate }