modified bin/bookmarks, modified bin/dmenurecord, modified bin/ethwifi, modified statusbar/sb-internet

4 files changed, 44 insertions, 27 deletions

diff --git a/ar/.local/bin/bookmarks b/ar/.local/bin/bookmarks
index a0f3d72..b24a4b9 100755
--- a/ar/.local/bin/bookmarks
+++ b/ar/.local/bin/bookmarks
@@ -86,18 +86,18 @@ openinbrowser() {
     selection="dmenu -i -l 20 -p \"Choose a $1 to open:\"" ||
     selection="fzf-tmux --reverse --cycle --ansi --delimiter='|' --with-nth=1..-2"
 
+  cols=$((${COLUMNS:-90} / 3))
   case "$1" in
   *bookmark*)
     sqlite_query="
-    SELECT b.title || ' | ' || p.url AS bookmark
+    SELECT substr(b.title, 1, $cols) || ' | ' || p.url AS bookmark
     FROM moz_bookmarks b
     JOIN moz_places p ON b.fk = p.id
     WHERE b.type = 1 AND p.url LIKE 'http%' AND b.title NOT NULL
-    ORDER BY b.dateAdded DESC;
+    ORDER BY b.title;
     "
     ;;
   *history*)
-    cols=$((${COLUMNS:-90} / 3))
     sqlite_query="
     SELECT substr(p.title, 1, $cols) || ' | ' || p.url
     FROM moz_places p
diff --git a/ar/.local/bin/dmenurecord b/ar/.local/bin/dmenurecord
index 4aef54f..e86b02e 100755
--- a/ar/.local/bin/dmenurecord
+++ b/ar/.local/bin/dmenurecord
@@ -4,7 +4,7 @@ usage() {
   echo "Asks for recording type via dmenu."
   echo "If there is already a running instance, user will be prompted to end it. "
   echo ""
-  echo "Usage: ${0##*/} [-h] [audio] [kill] [video] [screencast]"
+  echo "Usage: ${0##*/} [-h] [-a|--audio|audio] [-k|--kill|kill] [-v|--video|video] [-s|--screencast|screencast]"
   echo ""
   echo "Options:"
   echo "  - audio         : Records only audio"
@@ -17,7 +17,7 @@ getdim() { xrandr | grep -oP '(?<=current ).*(?=,)' | tr -d ' '; }
 
 updateicon() {
   echo "$1" >/tmp/recordingicon
-  pkill -RTMIN+31 "${STATUSBAR:-dwmblocks}"
+  pkill -RTMIN+30 "${STATUSBAR:-dwmblocks}"
 }
 
 killrecording() {
@@ -25,7 +25,7 @@ killrecording() {
   kill -15 "$recpid"
   rm -f /tmp/recordingpid
   updateicon ""
-  pkill -RTMIN+31 "${STATUSBAR:-dwmblocks}"
+  pkill -RTMIN+24 "${STATUSBAR:-dwmblocks}"
 }
 
 screencast() {
@@ -39,7 +39,7 @@ screencast() {
     -f alsa -thread_queue_size 1024 -i default \
     -c:v h264 \
     -crf 0 -preset ultrafast -c:a aac \
-    "$HOME/screencast-$(date '+%y%m%d-%H%M-%S').mp4" &
+    "$recordings/screencast-$(date '+%y%m%d-%H%M-%S').mp4" &
   echo $! >/tmp/recordingpid
   updateicon "⏺️🎙️"
 }
@@ -51,7 +51,7 @@ video() {
     -s "$(getdim)" \
     -i "$DISPLAY" \
     -c:v libx264 -qp 0 -r 30 \
-    "$HOME/video-$(date '+%y%m%d-%H%M-%S').mkv" &
+    "$recordings/video-$(date '+%y%m%d-%H%M-%S').mkv" &
   echo $! >/tmp/recordingpid
   updateicon "⏺️"
 }
@@ -61,7 +61,7 @@ webcamhidef() {
     -f v4l2 \
     -i /dev/video0 \
     -video_size 1920x1080 \
-    "$HOME/webcam-$(date '+%y%m%d-%H%M-%S').mkv" &
+    "$recordings/webcam-$(date '+%y%m%d-%H%M-%S').mkv" &
   echo $! >/tmp/recordingpid
   updateicon "🎥"
 }
@@ -71,7 +71,7 @@ webcam() {
     -f v4l2 \
     -i /dev/video0 \
     -video_size 640x480 \
-    "$HOME/webcam-$(date '+%y%m%d-%H%M-%S').mkv" &
+    "$recordings/webcam-$(date '+%y%m%d-%H%M-%S').mkv" &
   echo $! >/tmp/recordingpid
   updateicon "🎥"
 }
@@ -80,7 +80,7 @@ audio() {
   ffmpeg \
     -f alsa -i default \
     -c:a flac \
-    "$HOME/audio-$(date '+%y%m%d-%H%M-%S').flac" &
+    "$recordings/audio-$(date '+%y%m%d-%H%M-%S').flac" &
   echo $! >/tmp/recordingpid
   updateicon "🎙️"
 }
@@ -113,17 +113,20 @@ videoselected() {
     -video_size "$W"x"$H" \
     -i :0.0+"$X,$Y" \
     -c:v libx264 -qp 0 -r 30 \
-    "$HOME/box-$(date '+%y%m%d-%H%M-%S').mkv" &
+    "$recordings/box-$(date '+%y%m%d-%H%M-%S').mkv" &
   echo $! >/tmp/recordingpid
   updateicon "⏺️"
 }
 
+recordings="${XDG_VIDEOS_DIR:-$HOME/Videos}/recordings"
+[ -d "$recordings" ] || mkdir -p "$recordings"
+
 case "$1" in
 -h | --help | help) usage && exit 0 ;;
-audio) audio ;;
-kill) killrecording ;;
-screencast) screencast ;;
-video) video ;;
+-a | --audio | audio) audio ;;
+-k | --kill | kill) killrecording ;;
+-s | --screencast | screencast) screencast ;;
+-v | --video | video) video ;;
 *selected) videoselected ;;
 *) ([ -f /tmp/recordingpid ] && asktoend && exit) || askrecording ;;
 esac
diff --git a/ar/.local/bin/ethwifi b/ar/.local/bin/ethwifi
index 1f76ace..26366e9 100755
--- a/ar/.local/bin/ethwifi
+++ b/ar/.local/bin/ethwifi
@@ -8,9 +8,24 @@ check_ethernet() {
   return 1
 }
 
-check_ethernet && nmcli radio wifi off && notify-send "📡 wifi: OFF" || {
-  nmcli radio wifi on
-  notify-send "📡 wifi: ON"
+toggle_wifi() {
+  wifi_status=$(nmcli radio wifi) # Get current Wi-Fi status
+  if [ "$wifi_status" = "enabled" ]; then
+    nmcli radio wifi off
+    notify-send "📡 wifi: OFF"
+  else
+    nmcli radio wifi on
+    notify-send "📡 wifi: ON"
+  fi
 }
 
+# Check Ethernet and toggle Wi-Fi based on its status
+if check_ethernet; then
+  nmcli radio wifi off
+  notify-send "📡 wifi: OFF (Ethernet connected)"
+else
+  toggle_wifi
+fi
+
+# Refresh status bar
 pkill -RTMIN+7 "${STATUSBAR:-dwmblocks}"
diff --git a/ar/.local/bin/statusbar/sb-internet b/ar/.local/bin/statusbar/sb-internet
index 3d4ff4e..c9180b3 100755
--- a/ar/.local/bin/statusbar/sb-internet
+++ b/ar/.local/bin/statusbar/sb-internet
@@ -31,12 +31,11 @@ fi
 [ "$(cat /sys/class/net/e*/operstate 2>/dev/null)" = 'up' ] && ethericon="🌐" || ethericon="❎"
 
 # TUN
-[ -n "$(cat /sys/class/net/tun*/operstate 2>/dev/null)" ] && tunicon=" 🛰️"
+[ -n "$(cat /sys/class/net/tun*/operstate 2>/dev/null)" ] && tunicon="🛰️"
 
-if [ "$(cat /sys/class/net/w*/operstate 2>/dev/null)" = 'up' ] && [ ! "$(cat /sys/class/net/e*/operstate 2>/dev/null)" = 'up' ]; then
-  printf "%s%s\n" "$wifiicon" "$tunicon"
-elif [ ! "$(cat /sys/class/net/w*/operstate 2>/dev/null)" = 'up' ] && [ "$(cat /sys/class/net/e*/operstate 2>/dev/null)" = 'up' ]; then
-  printf "%s%s\n" "$ethericon" "$tunicon"
-else
-  printf "%s%s%s\n" "$wifiicon" " $ethericon" "$tunicon"
-fi
+icons=""
+[ -n "$wifiicon" ] && icons="${icons}$wifiicon "
+[ -n "$ethericon" ] && icons="${icons}$ethericon "
+[ -n "$tunicon" ] && icons="${icons}$tunicon "
+
+printf "%s\n" "${icons% }"