diff --git a/.config/sway/scripts.d/project.sh b/.config/sway/scripts.d/project.sh index f7353e1..97b8f41 100755 --- a/.config/sway/scripts.d/project.sh +++ b/.config/sway/scripts.d/project.sh @@ -58,20 +58,23 @@ get_id() { i=0 while true; do NAME="$(get_name $i)" - if [ "$NAME" == "$1" ]; then + if [ $(echo "$NAME" | grep "^$1") ]; then echo "$i" - exit 0 + return 0 elif [ "$NAME" == "null" ]; then - notify-send -u critical -t 3000 "Sway" "Failed to get display" - kill $PID - exit 1 + return 1 fi ((i=i+1)) done } -PRIMARY=$(get_id "eDP-1") -EXTERNAL=$(get_id "DP-1" || get_id "HDMI-1" || get_id "HDMI-A-1") +die() { + notify-send -u critical -t 3000 "Sway" "Failed to get display" + kill $PID +} + +PRIMARY=$(get_id "eDP-1" || die) +EXTERNAL=$(get_id "DP" || get_id "HDMI" || die) PRIMARY_SCALE=1.5 EXTERNAL_SCALE=1 diff --git a/packages b/packages index e0f805d..35e5a30 100644 --- a/packages +++ b/packages @@ -29,6 +29,7 @@ grub htop imv iwd +jq krita less lib32-libva-mesa-driver