diff --git a/build/20-desktop-labwc.sh b/build/20-desktop-labwc.sh index bcbaa74..fbd7a35 100755 --- a/build/20-desktop-labwc.sh +++ b/build/20-desktop-labwc.sh @@ -16,8 +16,6 @@ dnf5 install -y \ kanshi \ wlr-randr \ swaybg \ - swayidle \ - wlopm \ xdg-desktop-portal \ xdg-desktop-portal-wlr \ xdg-desktop-portal-gtk \ diff --git a/configs/skel/.config/labwc/autostart b/configs/skel/.config/labwc/autostart index 5c355ed..ff4185a 100644 --- a/configs/skel/.config/labwc/autostart +++ b/configs/skel/.config/labwc/autostart @@ -21,14 +21,6 @@ swaybg -c '#1a1b26' >/dev/null 2>&1 & # [shell] polkit_agent). Genau EIN Agent pro Session! # (Historie: lxqt-policykit-agent unter /usr/libexec/ - ausgebaut.) -# 4. Desktop-Shell: Bar, Dock, Launcher, Control-Center, Lock, OSDs +# 4. Desktop-Shell: Bar, Dock, Launcher, Control-Center, Lock, OSDs, +# Idle-Handling (nativ: Lock/Screen-off, siehe noctalia idle.toml) noctalia >/dev/null 2>&1 & - -# 5. Idle-Handling: nach 5 Min sperren (Noctalia-Lockscreen), -# nach 10 Min Displays stromsparend dunkel schalten (wlopm, damit -# Fensterlayouts erhalten bleiben – KEIN output --off). -swayidle -w \ - timeout 300 'noctalia msg session lock' \ - timeout 600 'wlopm --off *' \ - resume 'wlopm --on *' \ - before-sleep 'noctalia msg session lock' >/dev/null 2>&1 & diff --git a/configs/skel/.config/noctalia/idle.toml b/configs/skel/.config/noctalia/idle.toml new file mode 100644 index 0000000..cdf96c6 --- /dev/null +++ b/configs/skel/.config/noctalia/idle.toml @@ -0,0 +1,18 @@ +# Idle-Verantwortung liegt bei Noctalia (nativ): Fade-Overlay, Lock nach +# 5 Minuten, Screen-off mit Auto-Resume nach 10 Minuten. swayidle ist +# ausgebaut (kein Paket, keine Autostart-Zeile mehr). +# Suspend-Behavior bleibt aus (kein Idle-Suspend gewuenscht); +# Lock-vor-Suspend greift ueber den Lockscreen-Default. +# GUI-Aenderung landet in settings.toml und gewinnt ueber dieser Datei. +[idle.behavior.lock] +enabled = true +timeout = 300 +action = "lock" + +[idle.behavior.screen-off] +enabled = true +timeout = 600 +action = "screen_off" + +[idle.behavior.suspend] +enabled = false diff --git a/scripts/seed-labwc-skel.sh b/scripts/seed-labwc-skel.sh index f1cff17..423724d 100755 --- a/scripts/seed-labwc-skel.sh +++ b/scripts/seed-labwc-skel.sh @@ -17,6 +17,7 @@ TARGETS=( ".config/noctalia/templates.toml" ".config/noctalia/shell.toml" ".config/noctalia/wallpaper.toml" + ".config/noctalia/idle.toml" ".config/mimeapps.list" ) @@ -37,3 +38,12 @@ if [[ ! -e "${HOME}/.config/kanshi/config" ]]; then echo "Keine kanshi-Config gefunden. Erzeugen mit:" echo " kanshi-autoconfig --apply (schreibt ~/.config/kanshi/config)" fi + +# Migration: swayidle-Block aus bestehender Autostart entfernen +# (Idle macht Noctalia nativ; Doppel-Feuerung vermeiden). Mit Backup. +AUTOSTART="${HOME}/.config/labwc/autostart" +if [[ -f "${AUTOSTART}" ]] && grep -q 'swayidle' "${AUTOSTART}"; then + cp -n "${AUTOSTART}" "${AUTOSTART}.bak" 2>/dev/null || true + sed -i '/^# 5\. Idle-Handling/,/before-sleep.*&$/d' "${AUTOSTART}" + echo "migriert: swayidle-Block aus ${AUTOSTART} entfernt (Backup .bak)" +fi