updates

7 files changed, 51 insertions, 43 deletions

diff --git a/ar/.local/bin/mounter b/ar/.local/bin/mounter
index b69dac8..46fd071 100755
--- a/ar/.local/bin/mounter
+++ b/ar/.local/bin/mounter
@@ -99,11 +99,11 @@ EOF
   mac=$(
     smbclient -L "$smbip" -U% -A /dev/stdin <<EOF 2>/dev/null | awk '/Disk/ {print $1}' | grep -vEi '(ADMIN|\w)\$|Macintosh'
 username=$(whoami)
-password=$(pass show default/default)
+password=$(pass show default/mac)
 EOF
   )
   smb=$(
-    smbclient -L "$smbip" -U% -A /dev/stdin <<EOF 2>/dev/null | awk '/Disk/ {print $1}' | grep -vEi '(ADMIN|\w)\$'
+    smbclient -L "$smbip" -U% -A /dev/stdin <<EOF 2>/dev/null | awk '/Disk/ {print $1}' | grep -vEi '(ADMIN|\w)\$|Macintosh'
 username=$(whoami)
 password=$(pass show default/default)
 EOF
diff --git a/ar/.local/bin/mpvplay b/ar/.local/bin/mpvplay
index 32d229f..2742099 100755
--- a/ar/.local/bin/mpvplay
+++ b/ar/.local/bin/mpvplay
@@ -7,18 +7,26 @@ check_mount() { findmnt "$HOME/Private" >/dev/null || $MOUNT_SCRIPT; }
 
 check_unmount() { findmnt "$HOME/Private" >/dev/null && $MOUNT_SCRIPT; }
 
+loginurl() {
+  notify-send "🔑 Authentication required"
+  username="$(echo | dmenu -i -p "Enter a username:")"
+  password="$(echo | dmenu -i -P -p "Enter a password:")"
+  if [ -n "$username" ] && [ -n "$password" ]; then
+    mpv --ytdl-raw-options=username="$username",password="$password" "$url"
+  else
+    notify-send "❌ Failed to play $url" "❗ Check your username or password"
+    exit 1
+  fi
+}
+
 play_url() {
   url=$(xclip -selection clipboard -o)
   [ -n "$url" ] && echo "$url" | grep -E '^https?://' >/dev/null || return 1
-  notify-send "📽️ Playing video from URL:" "$url"
-  if ! mpv "$url"; then
-    notify-send "🔑 Authentication required"
-    username="$(echo | dmenu -i -p "Enter a username:")"
-    [ -z "$username" ] && exit 1
-    password="$(echo | dmenu -i -P -p "Enter a password:")"
-    [ -z "$password" ] && exit 1
-    [ -n "$username" ] && [ -n "$password" ] && mpv --ytdl-raw-options=username="$username",password="$password" "$url" ||
-      notify-send "❌ Failed to play $url" "❗ Check your username or password"
+  if yt-dlp --simulate --dump-json "$url" >/dev/null 2>&1; then
+    mpv "$url"
+    notify-send "📽️ Playing video from URL:" "$url"
+  else
+    loginurl
   fi
 }
 
diff --git a/ar/.local/bin/sd b/ar/.local/bin/sd
index 67b0d5a..8c6f6a4 100755
--- a/ar/.local/bin/sd
+++ b/ar/.local/bin/sd
@@ -6,7 +6,7 @@ windowPID=$(xprop -id "$(xprop -root | sed -n "/_NET_ACTIVE_WINDOW/ s/^.*# // p"
 PIDlist=$(pstree -lpATna "$windowPID" | sed -En 's/.*,([0-9]+).*/\1/p' | tac)
 for PID in $PIDlist; do
   cmdline=$(ps -o args= -p "$PID")
-  process_group_leader=$(ps -o comm= -p "$(ps -o pgid= -p "$PID" | tr -d ' ')")
+  process_group_leader=$(ps -o comm= -p "$(ps -o pgid= -p "$PID" | tr -d ' ')" 2>/dev/null)
   cwd=$(readlink /proc/"$PID"/cwd)
   # zsh and lf won't be ignored even if it shows ~ or /
   case "$cmdline" in
diff --git a/ar/.local/bin/setfirmware b/ar/.local/bin/setfirmware
index 3914712..326d14b 100755
--- a/ar/.local/bin/setfirmware
+++ b/ar/.local/bin/setfirmware
@@ -7,15 +7,16 @@ echo "$drives"
 drive="/dev/$drive"
 printf "\n%s\n" "Target drive: $drive"
 firmwarepath="${XDG_DOTFILES_DIR:-${HOME}/.dotfiles}/$(whereami)/.config/glove80"
-firmware="$(find "$firmwarepath" "${XDG_DOWNLOAD_DIR:-${HOME}/Downloads}" -type f -iname '*.uf2' | sort | fzf --prompt "Choose a firmware: ")"
+firmware="$(find "$firmwarepath" "${XDG_DOWNLOAD_DIR:-${HOME}/Downloads}" -type f -iname '*.uf2' -printf '%T@ %p\n' | sort -n | cut -d' ' -f2- | fzf --prompt "Choose a firmware: ")"
 [ -f "$firmware" ] || exit
 [ -f "$firmwarepath/$(basename "$firmware")" ] || mv "$firmware" "$firmwarepath/"
 mp="/media/$USER/firmware"
 [ -d "$mp" ] || mkdir -p "$mp"
 sudo -A mount "$drive" "$mp"
-sudo -A cp "$firmware" "$mp/"
-[ -f "$firmware" ] || exit 1
+sudo -A cp "$firmwarepath/$(basename "$firmware")" "$mp/"
+[ -f "$firmwarepath/$(basename "$firmware")" ] || exit 1
 ls -la "$mp"
+[ -f "$mp/$(basename "$firmware")" ] || exit 1
 sudo -A umount "$mp"
 [ -e "$mp" ] && [ ! -s "$mp" ] && sudo -A rm -rf "$mp" || exit 1
 echo "Done!"
diff --git a/ar/.local/bin/statusbar/sb-music b/ar/.local/bin/statusbar/sb-music
index b0a911a..1134d12 100755
--- a/ar/.local/bin/statusbar/sb-music
+++ b/ar/.local/bin/statusbar/sb-music
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 truncate_string() {
-  local input="$1"
-  local max_length="$2"
+  input="$1"
+  max_length="$2"
   if [ "${#input}" -gt "$max_length" ]; then
     echo "${input:0:$((max_length - 2))}.."
   else
@@ -10,19 +10,24 @@ truncate_string() {
   fi
 }
 
-filter() {
+signal="$(awk -F', *' -v name="${0##*/}" '$2 ~ name {print $3+0}' "${XDG_SOURCES_HOME:-${HOME}/.local/src}/suckless/dwmblocks/config.def.h")"
+
+[ "$signal" -eq 0 ] && {
+  pidof -x sb-mpdup >/dev/null 2>&1 || sb-mpdup >/dev/null 2>&1 &
+}
+
+status() {
   if ps -C mpd >/dev/null 2>&1; then
     screen_width=$(xrandr | awk '/\*/ {split($1, res, "x"); print res[1]; exit}')
     artist=$(mpc current -f %artist%)
     title=$(mpc current -f %title%)
 
     if [ "$screen_width" -le 2048 ]; then
-      max_length=$((screen_width / 100))
+      length="$(grep 'MAX_BLOCK_OUTPUT_LENGTH' ~/.local/src/suckless/dwmblocks/config.def.h | awk '{print $3}')"
+      max_length="${length:+$((length / 3))}"
+      max_length="${max_length:-15}"
       artist=$(truncate_string "$artist" "$max_length")
       title=$(truncate_string "$title" "$max_length")
-    else
-      artist="$(mpc current -f %artist%)"
-      title="$(mpc current -f %title%)"
     fi
 
     case "$(mpc status %state%)" in
@@ -36,8 +41,10 @@ filter() {
     [ "$(mpc status %random%)" = "on" ] && indicators="${indicators}🔂"
     [ "$(mpc status %repeat%)" = "on" ] && indicators="${indicators}🔁"
 
-    case "$(awk -F',' -v name="${0##*/}" '$0 ~ name {gsub(/[[:space:]]/, "", $3); print $3}' "${XDG_SOURCES_HOME:-${HOME}/.local/src}/suckless/dwmblocks/config.def.h")" in
-    0) echo "$prefix$artist - $title${indicators:+$indicators}" ;;
+    case "$signal" in
+    0)
+      echo "$prefix$artist - $title${indicators:+$indicators}"
+      ;;
     [1-9]*)
       current_time=$(mpc status %currenttime%)
       total_time=$(mpc status %totaltime%)
@@ -45,22 +52,16 @@ filter() {
       ;;
     *) return ;;
     esac
-
   fi
 }
 
-[ "$(awk -F',' -v name="${0##*/}" '$0 ~ name {print $3; exit}' "${XDG_SOURCES_HOME:-${HOME}/.local/src}/suckless/dwmblocks/config.def.h")" -eq 0 ] && {
-  pidof -x sb-mpdup >/dev/null 2>&1 || sb-mpdup >/dev/null 2>&1 &
-}
+mpc status %state% | grep -q "stopped" || status
 
-# Handling interaction based on button press
 case $BLOCK_BUTTON in
-1) # left click, opens ncmpcpp
-  mpc status | filter
-  setsid -f "$TERMINAL" -e ncmpcpp
-  ;;
-2) mpc toggle | filter ;; # middle click, pause/unpause
-3)                        # right click
+1) setsid -f "$TERMINAL" -e ncmpcpp ;; # left click, opens ncmpcpp
+2) mpc toggle ;;                       # middle click, pause/unpause
+3)                                     # right click
+  { [ -n "$(mpc current)" ] && [ -n "$(mpc queued)" ]; } && notify-send "🎵 $(mpc current)" "⏭️ $(mpc queued)"
   notify-send "🎵 Music module" "\- Shows mpd song playing and status
 - 🎵 if playing
 - ⏸ if paused
@@ -70,10 +71,8 @@ case $BLOCK_BUTTON in
 - Left click opens ncmpcpp
 - Middle click pauses/unpause
 - Scroll changes track"
-  { [ -n "$(mpc current)" ] && [ -n "$(mpc queued)" ]; } && notify-send "🎵 $(mpc current)" "⏭️ $(mpc queued)"
   ;;
-4) mpc prev | filter ;; # scroll up, previous
-5) mpc next | filter ;; # scroll down, next
+4) mpc prev ;; # scroll up, previous
+5) mpc next ;; # scroll down, next
 6) setsid -f "$TERMINAL" -e "$EDITOR" "$0" ;;
-*) mpc status | filter ;; # default, show current status
 esac
diff --git a/ar/.local/bin/statusbar/sb-repos b/ar/.local/bin/statusbar/sb-repos
index 1dad9f1..2b936c7 100755
--- a/ar/.local/bin/statusbar/sb-repos
+++ b/ar/.local/bin/statusbar/sb-repos
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-pidof transmission-daemon >/dev/null && exit 1
+pidof transmission-daemon >/dev/null && exit
 
 # Directories containing Git repositories
 DOTFILES_REPOS="$HOME/.dotfiles"
@@ -35,7 +35,7 @@ get_git_status_symbols() {
 get_unpushed_commits() { git cherry -v 2>/dev/null | wc -l; }
 
 # Function to check for unpulled commits
-get_unpulled_commits() { git rev-list --count HEAD..@{upstream} 2>/dev/null; }
+get_unpulled_commits() { git rev-list --count HEAD..@{upstream}; }
 
 # Function to check Git repository status for multiple repos
 check_multi_repo_status() {
diff --git a/ar/.local/bin/statusbar/sb-volume b/ar/.local/bin/statusbar/sb-volume
index 800f19e..7881bfd 100755
--- a/ar/.local/bin/statusbar/sb-volume
+++ b/ar/.local/bin/statusbar/sb-volume
@@ -8,11 +8,11 @@ case $BLOCK_BUTTON in
   pkill -RTMIN+5 "${STATUSBAR:-dwmblocks}"
   ;;
 2) wpctl set-mute @DEFAULT_SINK@ toggle ;;
-4) wpctl set-volume @DEFAULT_SINK@ 1%+ ;;
-5) wpctl set-volume @DEFAULT_SINK@ 1%- ;;
 3) notify-send "📢 Volume module" "\- Shows volume 🔊, 🔇 if muted
 - Middle click to mute
 - Scroll to change" ;;
+4) wpctl set-volume @DEFAULT_SINK@ 1%+ ;;
+5) wpctl set-volume @DEFAULT_SINK@ 1%- ;;
 6) setsid -f "$TERMINAL" -e "$EDITOR" "$0" ;;
 esac