order sessiond at graphical-session-pre
The authority takes ext-session-lock before any surface exists, which is the window -pre reserves. It cannot start earlier — ext-session-lock is a Wayland protocol and needs the compositor's socket. Also drops the injected venv variable from eleven surface scripts; each finds the path itself.
This commit is contained in:
parent
4a4f0a5a27
commit
e485b91c14
10 changed files with 17 additions and 15 deletions
|
|
@ -1,8 +1,10 @@
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=Souveraine session authority (lock-before-shell, lock-past-shell-death)
|
Description=Souveraine session authority (lock-before-shell, lock-past-shell-death)
|
||||||
# Started explicitly from the hyprland.start hook after WAYLAND_DISPLAY is
|
# graphical-session-pre, not graphical-session: the authority takes
|
||||||
# imported into the user manager — same lifecycle pattern as hypridle.
|
# ext-session-lock before any surface exists, and -pre is the window systemd
|
||||||
PartOf=graphical-session.target
|
# 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]
|
[Service]
|
||||||
ExecStart=/usr/bin/souveraine-sessiond
|
ExecStart=/usr/bin/souveraine-sessiond
|
||||||
|
|
@ -10,4 +12,4 @@ Restart=on-failure
|
||||||
RestartSec=1
|
RestartSec=1
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
WantedBy=graphical-session.target
|
WantedBy=graphical-session-pre.target
|
||||||
|
|
|
||||||
|
|
@ -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 argparse
|
||||||
import math
|
import math
|
||||||
import json
|
import json
|
||||||
|
|
|
||||||
|
|
@ -306,7 +306,7 @@ switch() {
|
||||||
fi
|
fi
|
||||||
|
|
||||||
matugen "${matugen_args[@]}"
|
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[@]}" \
|
python3 "$SCRIPT_DIR/generate_colors_material.py" "${generate_colors_material_args[@]}" \
|
||||||
> "$STATE_DIR"/user/generated/material_colors.scss
|
> "$STATE_DIR"/user/generated/material_colors.scss
|
||||||
deactivate
|
deactivate
|
||||||
|
|
@ -339,7 +339,7 @@ main() {
|
||||||
|
|
||||||
detect_scheme_type_from_image() {
|
detect_scheme_type_from_image() {
|
||||||
local img="$1"
|
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'
|
"$SCRIPT_DIR"/scheme_for_image.py "$img" 2>/dev/null | tr -d '\n'
|
||||||
deactivate
|
deactivate
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -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 argparse
|
||||||
import re
|
import re
|
||||||
import os
|
import os
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
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" "$@"
|
"$SCRIPT_DIR/find_regions.py" "$@"
|
||||||
deactivate
|
deactivate
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
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" "$@"
|
"$SCRIPT_DIR/least_busy_region.py" "$@"
|
||||||
deactivate
|
deactivate
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
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" "$@"
|
"$SCRIPT_DIR/text_color.py" "$@"
|
||||||
deactivate
|
deactivate
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
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" "$@"
|
GIO_USE_VFS=local "$SCRIPT_DIR/thumbgen.py" "$@"
|
||||||
THUMBGEN_EXIT_CODE=$?
|
THUMBGEN_EXIT_CODE=$?
|
||||||
deactivate
|
deactivate
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
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" "$@"
|
"$SCRIPT_DIR/token_from_key.py" "$@"
|
||||||
deactivate
|
deactivate
|
||||||
|
|
|
||||||
|
|
@ -307,7 +307,7 @@ switch() {
|
||||||
fi
|
fi
|
||||||
|
|
||||||
matugen "${matugen_args[@]}"
|
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[@]}" \
|
python3 "$SCRIPT_DIR/generate_colors_material.py" "${generate_colors_material_args[@]}" \
|
||||||
> "$STATE_DIR"/user/generated/material_colors.scss
|
> "$STATE_DIR"/user/generated/material_colors.scss
|
||||||
deactivate
|
deactivate
|
||||||
|
|
@ -340,7 +340,7 @@ main() {
|
||||||
|
|
||||||
detect_scheme_type_from_image() {
|
detect_scheme_type_from_image() {
|
||||||
local img="$1"
|
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'
|
"$SCRIPT_DIR"/scheme_for_image.py "$img" 2>/dev/null | tr -d '\n'
|
||||||
deactivate
|
deactivate
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue