Lot's of stuffHEADmaster

1 files changed, 25 insertions, 20 deletions

diff --git a/.local/bin/makewall b/.local/bin/makewall
index 614d030..3458676 100755
--- a/.local/bin/makewall
+++ b/.local/bin/makewall
@@ -2,29 +2,34 @@
 
 wallDir="${XDG_CONFIG_HOME:-$HOME}/wallpapers"
 
-# Acquire the list of connected displays
-displays="$(wlr-randr --json | jq -r '.[] | select(.enabled) | .name')"
+# Acquire the list of connected displays and their models
+displays="$(wlr-randr --json | jq -r '.[] | select(.enabled) | "\(.name) \(.model)"')"
 echo "$displays"
 
-# If there is a wallpaper with a filename matching the display
-# name, set it as the wallpaper for that display.
-# ex: DP-1.jpg and DP-1.png are both valid filenames
-# Otherwise, set the wallpaper to the default wallpaper
-# (default.png or default.jpg)
+# Sanitize the model names by replacing spaces with hyphens
+sanitize_model() {
+  echo "$1" | sed 's/\s/-/g'
+}
+
+# If there is a wallpaper with a filename matching the display name or sanitized model,
+# set it as the wallpaper for that display.
 setDisplay() {
-	case $(ls $wallDir) in
-	*"$1"*)
-		wall=$(ls $wallDir | grep "$1" | head -n 1)
-		;;
-	*)
-		wall=$(ls $wallDir | grep "default" | head -n 1)
-		;;
-	esac
-  swaybg --output $1 -m fill --image $wallDir/$wall &
+  name="$1"
+  model="$2"
+  case $(ls $wallDir) in
+  *"$name"*|*"$model"*)
+    wall=$(ls $wallDir | grep -E "$name|$model" | head -n 1)
+    ;;
+  *)
+    wall=$(ls $wallDir | grep "default" | head -n 1)
+    ;;
+  esac
+  swaybg --output "$name" -m fill --image "$wallDir/$wall" &
 }
 
 # Set the wallpaper for each display
-killall swaybg > /dev/null 2>&1
-for display in $displays; do
-	setDisplay $display
-done
+killall swaybg >/dev/null 2>&1
+while IFS=' ' read -r name model; do
+  sanitized_model=$(sanitize_model "$model")
+  setDisplay "$name" "$sanitized_model"
+done <<< "$displays"