4 Commits 98aa1f1c0c ... a6c3c59325

Author SHA1 Message Date
  Adam a6c3c59325 run network in bar on startup 3 years ago
  Adam 34be7a2f65 hide bar while mpv running 3 years ago
  Adam bd85617759 show network status in bar 3 years ago
  Adam 07424ccefa run battery on startup 3 years ago

+ 2 - 2
.config/ranger/rifle.conf

@@ -120,8 +120,8 @@ ext midi?,        terminal, has wildmidi = wildmidi -- "$@"
 #-------------------------------------------
 mime ^video|audio, has gmplayer, X, flag f = gmplayer -- "$@"
 mime ^video|audio, has smplayer, X, flag f = smplayer "$@"
-mime ^video,       has mpv,      X, flag f = mpv -- "$@"
-mime ^video,       has mpv,      X, flag f = mpv --fs -- "$@"
+mime ^video,       has mpv,      X, flag f = ~/.local/bin/mpv -- "$@"
+mime ^video,       has mpv,      X, flag f = ~/.local/bin/mpv --fs -- "$@"
 mime ^video,       has mplayer2, X, flag f = mplayer2 -- "$@"
 mime ^video,       has mplayer2, X, flag f = mplayer2 -fs -- "$@"
 mime ^video,       has mplayer,  X, flag f = mplayer -- "$@"

+ 2 - 1
.config/sway/sway_startup.sh

@@ -4,7 +4,8 @@
 . /home/adam/.config/sh/aliases
 . /home/adam/.config/sh/functions
 
-/home/adam/.local/bin/battery
+pgrep network || /home/adam/.local/bin/network &
+pgrep battery || /home/adam/.local/bin/battery &
 
 swaybg -i ~/Pictures/wallpapers/1000years.webp -m fill &
 

+ 1 - 1
.local/bin/bar_status

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 render() {
-	cat /tmp/swaybar/battery | tr '\n' ' ' | rev | cut -c 2- | rev
+	cat /tmp/swaybar/network /tmp/swaybar/battery | tr '\n' '   ' | rev | cut -c 2- | rev
 }
 
 mkdir -p /tmp/swaybar

+ 7 - 2
.local/bin/battery

@@ -9,14 +9,16 @@ render() {
 	full=$(( ((load * 12) + 99) / 100 ))
 	empty=$(( 12 - full ))
 
-	if [ "$state" = "charging" ]
+	if [ "$state" = "Charging" ]
 	then
 		colour="#db9d3b"
 	elif [ "$state" = "Full" ]
 	then
+		battery_notify "$load"
 		colour="#1c9867"
 	elif [ $full -le 1 ]
 	then
+		battery_notify "$load"
 		colour="#892b30"
 	else
 		colour="#d3d7cf"
@@ -36,7 +38,6 @@ render() {
 
 	echo "</span>"
 
-	battery_notify "$load"
 }
 
 
@@ -44,5 +45,9 @@ mkdir -p /tmp/swaybar
 while true
 do
 	render > /tmp/swaybar/battery
+	if [ "$1" = '-1' ]
+	then
+		exit
+	fi
 	sleep 120
 done

+ 2 - 2
.local/bin/battery_notify

@@ -3,10 +3,10 @@
 what="$1"
 last=$(cat /tmp/last_battery_state 2>/dev/null)
 
-if [ "$what" = '6' ] && [ "$last" != '6' ]
+if [ "$what" = '4' ] && [ "$last" != '4' ]
 then
 	notify-send -u critical -i /usr/share/icons/Papirus/24x24/panel/xfce4-battery-critical.svg Battery 'less than <sub>2</sub>6'
-elif [ "$what" = '10' ] && [ "$last" != '10' ]
+elif [ "$what" = '8' ] && [ "$last" != '8' ]
 then
 	notify-send -u normal -i /usr/share/icons/Papirus/24x24/panel/xfce4-battery-low.svg Battery 'less than <sub>2</sub>10'
 elif [ "$what" = '100' ] && [ "$last" != '100' ]

+ 7 - 0
.local/bin/mpv

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+swaymsg bar mode hide
+killall battery
+/usr/bin/mpv "$@"
+battery &
+swaymsg bar mode overlay

+ 32 - 0
.local/bin/network

@@ -0,0 +1,32 @@
+#!/bin/sh
+
+render () {
+	services=$(connmanctl services)
+	if echo "$services" | grep -P '(O|R) ' > /dev/null
+	then
+		echo "<span color='#317b9f'>█</span>"
+		return
+	fi
+
+	if echo "$services" | grep -P 'c ' > /dev/null
+	then
+		echo "<span color='#317b9f'>▒</span>"
+	fi
+
+	if [ "$(connmanctl technologies | grep wif -A 1 | grep Powered | cut -d '=' -f 2 | tr -d ' ')" = 'True' ]
+	then
+		echo "<span color='#317b9f'>░</span>"
+	fi
+}
+
+mkdir -p /tmp/swaybar
+render > /tmp/swaybar/network
+if [ "$1" = '-1' ]
+then
+	exit
+fi
+
+ip monitor address | while read -r _
+do
+	render > /tmp/swaybar/network
+done