wofi menus use static order to display options

bin/sp-clipboard

@@ -1,13 +1,15 @@
 #!/bin/bash
 
+source "/usr/lib/sp-functions"
+source "${conf_dir}/config"
+
 cb_count=$(copyq count)
-cb_count=10
+cb_count="${clipboard_length}"
 
 wofilist=""
 
 for i in $(seq $cb_count);do
   cb_line="$( copyq read $((${i}-1)) | tr '\n' ' ' )"
-  echo "${cb_line}"
   if [[ "${cb_line}" ==  "" ]];then
     cb_line=$( copyq read ? "$((${i}-1))" | head -n 1 )
   fi

bin/sp-global-shortcuts

@@ -3,6 +3,6 @@
 source "/usr/lib/sp-functions"
 
 options=$( ls "${conf_dir}/global-shortcuts/" )
-op=$( echo -e "${options}" | wofi -i --dmenu | awk '{print}' )
+op=$( echo -e "${options}" | wofi -i --dmenu -k /dev/null | awk '{print}' )
 
 "${conf_dir}/global-shortcuts/${op}"

bin/sp-launcher

@@ -1,17 +1,22 @@
 #!/bin/bash
 
 source "/usr/lib/sp-functions"
-source "${conf_dir}/config"
 
 case $1 in
   file_manager )
     launch_exec=${filemanager_cmd}
-    launch_arg=$( jq -r .[].home_directory "${conf_dir}/profiles/$( get_profile_id )/vars.json" )
+    launch_arg=($( jq -r .[].home_directory "${conf_dir}/profiles/$( get_profile_id )/vars.json" | envsubst ))
     ;;
   browser )
     launch_exec=${browser_cmd}
-    launch_arg=$( jq -r .[].browser_profile "${conf_dir}/profiles/$( get_profile_id )/vars.json" )
+    launch_arg=($( jq -r .[].browser_profile "${conf_dir}/profiles/$( get_profile_id )/vars.json" ))
+    ;;
+  browser-newtab )
+    launch_exec=${browser_cmd}
+    launch_arg=($( jq -r .[].browser_profile "${conf_dir}/profiles/$( get_profile_id )/vars.json" ))
+    launch_arg+=( "--new-tab" )
+    launch_arg+=($( jq -r .[].browser_newtab_url "${conf_dir}/profiles/$( get_profile_id )/vars.json" ))
     ;;
 esac
 
-bash -c "${launch_exec} ${launch_arg}"
+${launch_exec} "${launch_arg[@]}"

bin/sp-lock

@@ -4,21 +4,19 @@ source "/usr/lib/sp-functions"
 lock_script="${conf_dir}/lockscript"
 unlock_script="${conf_dir}/unlockscript"
 
-outputs=( $(swaymsg -t get_outputs | jq -r '.[] | {name} | "\(.name)"') )
-
-for o in ${outputs[@]};do
-  workspace=$(swaymsg -t get_workspaces | jq -r '.[] | select(.output) | {name} | "\(.name)"')
-  wpno=$(cat "${cache_dir}/displays/${o}")
-  wp_imgpath="${conf_dir}/wallpaper/${o}/${wpno}.jpg"
-  sl_imgpath="${cache_dir}/lock/${o}.jpg"
-  convert -scale 10% -blur 0x3 -resize 500% "${wp_imgpath}" "${sl_imgpath}"
-  sl_args="${sl_args}--image ${o}:${sl_imgpath} "
-done
-
 if [ -f "${lock_script}" ]; then
   bash -c "${lock_script}"
 fi
-gtklock
+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

bin/sp-powermenu

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-op=$( echo -e "⏻ Poweroff\n Reboot\n Suspend\n🔒 Lock\n Logout" | wofi -i --dmenu -a | awk '{print tolower($2)}' )
+op=$( echo -e "⏻ Poweroff\n Reboot\n Suspend\n Lock\n Logout" | wofi -i --dmenu -a -k /dev/null | awk '{print tolower($2)}' )
 case $op in
         poweroff)
                 ;&

bin/sp-profile

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+source "/usr/lib/sp-functions"
+
+get_profile_name `cat ~/.cache/sway-profiles/active_profile`

bin/sp-profile-icon

@@ -2,4 +2,4 @@
 
 source "/usr/lib/sp-functions"
 
-get_profile_icon
+get_profile_icon `cat ~/.cache/sway-profiles/active_profile`

bin/sp-profiles

@@ -5,7 +5,7 @@ source "/usr/lib/sp-functions"
 get_profile_list
 
 case $1 in
-  next|prev)
+  next|prev|reload)
     current_profile=$(cat "${cache_dir}/active_profile")
     echo ${current_profile}
     ;;&
@@ -17,7 +17,10 @@ case $1 in
     new_profile=$(( ${current_profile}-1 ))
     [[ "$new_profile" -eq "-1" ]] && new_profile=3
     ;;&
-  prev|next)
+  reload)
+    new_profile=${current_profile}
+    ;;&
+  prev|next|reload)
     op=$(printf "%01d\n" ${new_profile})
     ;;
   *)
@@ -41,6 +44,5 @@ for i in {1..10};do
 done
 
 moveto="${p_num}1:${p_icon}"
-killall -SIGUSR2 waybar
 swaymsg 'workspace number "'"${p_num}"'"1:"'"${p_icon}"'"'
 echo "${op}" > "${cache_dir}/active_profile"

bin/sp-screenshot

@@ -3,7 +3,7 @@
 source "/usr/lib/sp-functions"
 source "${conf_dir}/config"
 
-op=$( echo -e "Output\nWindow\nRegion" | wofi -i --dmenu --width 250 --height 260 | awk '{print tolower($1)}' )
+op=$( echo -e "Output\nWindow\nRegion" | wofi -i --dmenu --width 250 --height 260 -k /dev/null | awk '{print tolower($1)}' )
 
 echo "$op"
 

bin/sp-shortcuts

@@ -5,6 +5,6 @@ source "/usr/lib/sp-functions"
 current_profile=$( get_profile_id )
 
 profile_scripts=$( ls "${conf_dir}/profiles/${current_profile}/shortcuts/" )
-op=$( echo -e "${profile_scripts}" | wofi -w 2 -i --dmenu | awk '{print}' )
+op=$( echo -e "${profile_scripts}" | wofi -w 2 -i --dmenu -k /dev/null | awk '{print}' )
 
 "${conf_dir}/profiles/${current_profile}/shortcuts/${op}"

bin/sp-wallpaper

@@ -11,6 +11,9 @@ setbg() {
   for d in ${outputs[@]};do
     d_wpno=$(cat "${cache_dir}/displays/${d}")
     swaymsg output "${d}" bg "${conf_dir}/wallpaper/${d}/${d_wpno}.jpg" fill
+    wp_imgpath="${conf_dir}/wallpaper/${d}/${d_wpno}.jpg"
+    sl_imgpath="${cache_dir}/lock/${d}.jpg"
+    convert -scale 10% -blur 0x3 -resize 500% "${wp_imgpath}" "${sl_imgpath}" &
   done
 }
 

debian/changelog

@@ -1,3 +1,79 @@
+sway-profiles (0.3.15) unstable; urgency=medium
+
+  * all wofi menus now output cache to /dev/null to remain ordered statically
+
+ -- Penelope Gwen <support@pogmom.me>  Thu, 17 Apr 2025 19:44:29 +0000
+
+sway-profiles (0.3.14) unstable; urgency=medium
+
+  * added sp-profiles reload
+
+ -- Penelope Gwen <support@pogmom.me>  Fri, 14 Mar 2025 22:52:33 +0000
+
+sway-profiles (0.3.13) unstable; urgency=medium
+
+  * corrected lock character in sp-powermenu
+
+ -- Penelope Gwen <penelope@pogmom.me>  Tue, 04 Mar 2025 22:00:00 +0000
+
+sway-profiles (0.3.12) unstable; urgency=medium
+
+  * fix variable substitution in configs
+
+ -- Penelope Gwen <penelope@pogmom.me>  Fri, 28 Feb 2025 10:30:49 +0000
+
+sway-profiles (0.3.11) unstable; urgency=medium
+
+  * add sp-profile command which returns profile name
+  * add browser-newtab command to sp-launcher
+
+ -- Penelope Gwen <penelope@pogmom.me>  Fri, 28 Feb 2025 07:27:58 +0000
+
+sway-profiles (0.3.10) unstable; urgency=medium
+
+  * better support for gtklock modules
+
+ -- Penelope Gwen <penelope@pogmom.me>  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 <support@pogmom.me>  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
+  * removed legacy swaylock code from sp-lock
+
+ -- Penelope Gwen <support@pogmom.me>  Sun, 05 Jan 2025 02:36:39 +0000
+
+sway-profiles (0.3.7) unstable; urgency=medium
+
+  * sp-profile-icon now returns active profile rather than active workspace profile
+
+ -- Penelope Gwen <support@pogmom.me>  Tue, 29 Oct 2024 14:17:59 -0700
+
+sway-profiles (0.3.6) unstable; urgency=medium
+
+  * make clipboard length customizable
+
+ -- Penelope Gwen <support@pogmom.me>  Fri, 26 Jul 2024 13:29:45 -0600
+
+sway-profiles (0.3.5) unstable; urgency=medium
+
+  * disable unnecessary waybar reload
+
+ -- Penelope Gwen <support@pogmom.me>  Tue, 25 Jun 2024 02:32:59 -0600
+
+sway-profiles (0.3.4) unstable; urgency=medium
+
+  * ensure that gtklock uses css file
+
+ -- Penelope Gwen <support@pogmom.me>  Sat, 15 Jun 2024 22:53:59 -0600
+
 sway-profiles (0.3.3) unstable; urgency=medium
 
   * use gtklock instead of swaylock

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}
 
@@ -32,7 +36,9 @@ get_profile_id(){
 }
 
 get_profile_name(){
-  echo "test"
+  get_profile_list
+  [ -z "${1}" ] && p=`get_active_profile` || p="${1}"
+  echo "${p_names[ ${p} ]}"
 }
 
 get_profile_list(){
@@ -47,5 +53,6 @@ get_profile_list(){
 
 get_profile_icon(){
   get_profile_list
-  echo "${p_icons[ $( get_profile_id ) ]}"
+  [ -z "${1}" ] && p=`get_active_profile` || p="${1}"
+  echo "${p_icons[ ${p} ]}"
 }