diff --git a/home/modules/vcs.nix b/home/modules/vcs.nix index 4123e77..73c9701 100644 --- a/home/modules/vcs.nix +++ b/home/modules/vcs.nix @@ -143,7 +143,10 @@ in require_code_owner_review = false; require_last_push_approval = true; required_review_thread_resolution = true; - allowed_merge_methods = [ "squash" "rebase" ]; + allowed_merge_methods = [ + "squash" + "rebase" + ]; }; } ]; diff --git a/scripts/ctl b/scripts/ctl index 7a5d8af..63694b7 100755 --- a/scripts/ctl +++ b/scripts/ctl @@ -98,7 +98,13 @@ audio) default_name=$(printf '%s' "$dump" | jq -r --arg key "$default_meta" \ '.[] | select(.type == "PipeWire:Interface:Metadata" and .props."metadata.name" == "default") | .metadata[] | select(.key == $key) | .value.name') rows=$(printf '%s\n' "$devices" | while IFS="$(printf '\t')" read -r id name node_name; do - active=$([ "$node_name" = "$default_name" ] && echo ">" || echo "") + node_sfx="${node_name#*.}" + def_sfx="${default_name#*.}" + if [ "$node_name" = "$default_name" ] || { [ -n "$node_sfx" ] && [ "$node_sfx" = "$def_sfx" ]; }; then + active=">" + else + active="" + fi vol=$(wpctl get-volume "$id" 2>/dev/null | awk '{printf "%d", $2 * 100}') printf '%s\t%s\t%s\t%s\n' "$id" "$name" "$active" "$vol" done)