diff options
Diffstat (limited to '.local/bin')
| -rwxr-xr-x | .local/bin/backlightctl | 52 | ||||
| -rwxr-xr-x | .local/bin/makewall | 45 |
2 files changed, 51 insertions, 46 deletions
diff --git a/.local/bin/backlightctl b/.local/bin/backlightctl index 1d38c07..453c3c0 100755 --- a/.local/bin/backlightctl +++ b/.local/bin/backlightctl @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Get the correct sub-directory for your backlight device root_path="/sys/class/backlight/" @@ -12,26 +12,26 @@ default_step=10 default_set=50 to_percent() { - printf "%d" "$((100 * $1 / $max))" + printf "%d" "$((100 * $1 / $max))" } to_value() { - printf "%d" "$((max * $1 / 100))" + printf "%d" "$((max * $1 / 100))" } get_status() { - cat "$device/brightness" + cat "$device/brightness" } get_percent() { - to_percent "$(get_status)" + to_percent "$(get_status)" } # Add $1 to current brightness. Adjust if out of bounds (0-$max) # $1 is converted to a value between 0-$max within this function get_total() { - value="$(to_value "$1")" - printf "%d" "$(($(get_status) + $value))" + value="$(to_value "$1")" + printf "%d" "$(($(get_status) + $value))" } helpmsg="Usage: backlightctl -[FLAG] [PERCENTAGE] @@ -46,38 +46,38 @@ helpmsg="Usage: backlightctl -[FLAG] [PERCENTAGE] case "$1" in -i | --increase) - [ -z "$2" ] && step="$default_step" || step="$2" - get_total "$step" >"$device/brightness" - ;; + [ -z "$2" ] && step="$default_step" || step="$2" + get_total "$step" >"$device/brightness" + ;; -d | --decrease) - [ -z "$2" ] && step="$default_step" || step="$2" - get_total "-$step" >"$device/brightness" - ;; + [ -z "$2" ] && step="$default_step" || step="$2" + get_total "-$step" >"$device/brightness" + ;; -s | --set) - [ -z "$2" ] && set="$default_set" || set="$2" - to_value "$set" >"$device/brightness" - ;; + [ -z "$2" ] && set="$default_set" || set="$2" + to_value "$set" >"$device/brightness" + ;; -g | --get) - printf " %s\n" "$(get_status)%" - ;; + printf " %s\n" "$(get_status)%" + ;; -h | --help) - printf "%s" "$helpmsg" - ;; + printf "%s" "$helpmsg" + ;; *) - printf "\033[31mInvalid option: $1\033[0m\n%s" "$helpmsg" && exit 1 - ;; + printf "\033[31mInvalid option: $1\033[0m\n%s" "$helpmsg" && exit 1 + ;; esac # Send notification case "$@" in *-q* | *--quiet*) - exit 0 - ;; + exit 0 + ;; *) - notify-send.sh -t 1000 --replace-file /tmp/bl-notif -a " Brightness:" "$(get_percent)%" - ;; + notify-send.sh -t 1000 --replace-file /tmp/bl-notif -a " Brightness:" "$(get_percent)%" + ;; esac 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" |