From 1357d1ca016f4fc3f235f48637d80918dec761bc Mon Sep 17 00:00:00 2001 From: Penelope Gwen Date: Fri, 28 Feb 2025 00:50:52 +0000 Subject: [PATCH] version 0.3.9, 0.3.10 --- bin/sp-launcher | 1 - bin/sp-lock | 11 ++++++++++- debian/changelog | 14 ++++++++++++++ debian/control | 2 +- lib/sp-functions | 4 ++++ 5 files changed, 29 insertions(+), 3 deletions(-) diff --git a/bin/sp-launcher b/bin/sp-launcher index 9821930..ae2c2af 100755 --- a/bin/sp-launcher +++ b/bin/sp-launcher @@ -1,7 +1,6 @@ #!/bin/bash source "/usr/lib/sp-functions" -source "${conf_dir}/config" case $1 in file_manager ) diff --git a/bin/sp-lock b/bin/sp-lock index 9678b86..df583e8 100755 --- a/bin/sp-lock +++ b/bin/sp-lock @@ -7,7 +7,16 @@ unlock_script="${conf_dir}/unlockscript" if [ -f "${lock_script}" ]; then bash -c "${lock_script}" fi -gtklock -s "${HOME}/.config/gtklock/style.css" +lock_args=() +for s in "/usr/lib/$(uname -m)-linux-gnu/gtklock/"*"-module.so";do + lock_args+=("-m") + lock_args+=("${s}") +done +if [ ! -z "${lock_monitor}" ];then + lock_args+=("-M") + lock_args+=("${lock_monitor}") +fi +gtklock -s "${HOME}/.config/gtklock/style.css" "${lock_args[@]}" if [ -f "${unlock_script}" ]; then bash -c "${unlock_script}" fi diff --git a/debian/changelog b/debian/changelog index 05bc2f8..f49feda 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +sway-profiles (0.3.10) unstable; urgency=medium + + * better support for gtklock modules + + -- Penelope Gwen Fri, 28 Feb 2025 00:47:10 +0000 + +sway-profiles (0.3.9) unstable; urgency=medium + + * support for gtklock modules + * support for gtklock preferred monitor by setting 'lock_monitor' variable in config + * support for config.d + + -- Penelope Gwen Wed, 26 Feb 2025 18:24:28 +0000 + sway-profiles (0.3.8) unstable; urgency=medium * sp-wallpaper now handles creation of lockscreen wallpapers for faster locking diff --git a/debian/control b/debian/control index 9f7809f..3547c93 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: sway-profiles Section: X11 Priority: optional -Maintainer: Penelope Gwen +Maintainer: Penelope Gwen Rules-Requires-Root: no Build-Depends: debhelper-compat (= 13), diff --git a/lib/sp-functions b/lib/sp-functions index 73f19a5..77a4aac 100755 --- a/lib/sp-functions +++ b/lib/sp-functions @@ -3,6 +3,10 @@ conf_dir="$HOME/.config/sway-profiles" cache_dir="$HOME/.cache/sway-profiles" +source "${conf_dir}/config" +for c in "${conf_dir}/config.d/"*;do + source "${c}" +done mkdir -p "${cache_dir}/"{displays,lock,screenshots}