X-Git-Url: https://git.shemshak.org/~bandali/configs/blobdiff_plain/be33ab1ff436cdc693422d4e9b057bdbdc14c5de..4fc8d5d2da39a88c8ccf84cc80b506f37a890e1b:/rc.org

diff --git a/rc.org b/rc.org
index 1ea4d4e..e787d8b 100644
--- a/rc.org
+++ b/rc.org
@@ -772,6 +772,11 @@ borders_color=#3D9970
 #title=<span weight='heavy' fgcolor='#01FF70'> </span>
 #borders_color=#01FF70
 
+[volume]
+command=volume-info
+title=<span weight='heavy' fgcolor='#7FDBFF'></span>
+borders_color=#7FDBFF
+
 [battery]
 preset=BAT
 command=battery-percentage-time
@@ -4878,41 +4883,30 @@ exact brightness value.
 
 ** battery-percentage-time
 :PROPERTIES:
-:header-args+: :tangle ~/.local/bin/battery-percentage-time :shebang "#!/bin/bash"
+:header-args+: :tangle ~/.local/bin/battery-percentage-time :shebang "#!/bin/sh"
 :END:
 
-#+begin_src bash
-perc=$(dbus-send --print-reply=literal --system \
-        --dest=org.freedesktop.UPower \
-        /org/freedesktop/UPower/devices/battery_BAT0 \
-        org.freedesktop.DBus.Properties.Get \
-        string:org.freedesktop.UPower.Device \
-        string:'Percentage' | awk '{print $3}')
-
-state=$(dbus-send --print-reply=literal --system \
-        --dest=org.freedesktop.UPower \
-        /org/freedesktop/UPower/devices/battery_BAT0 \
-        org.freedesktop.DBus.Properties.Get \
-        string:org.freedesktop.UPower.Device \
-        string:'State' | awk '{print $3}')
+#+begin_src sh
+dbus_send() {
+	label=$1
+	dbus-send --print-reply=literal --system \
+		--dest=org.freedesktop.UPower \
+		/org/freedesktop/UPower/devices/battery_BAT0 \
+		org.freedesktop.DBus.Properties.Get \
+		string:org.freedesktop.UPower.Device \
+		string:"${label}" | awk '{print $3}'
+}
+
+perc=$(dbus_send 'Percentage')
+state=$(dbus_send 'State')
 
 if [ "$state" -eq 2 ]; then  # Discharging
-  secs=$(dbus-send --print-reply=literal --system \
-            --dest=org.freedesktop.UPower \
-            /org/freedesktop/UPower/devices/battery_BAT0 \
-            org.freedesktop.DBus.Properties.Get \
-            string:org.freedesktop.UPower.Device \
-            string:'TimeToEmpty' | awk '{print $3}')
-  printf '%s%%%%%2dh%02dm\n' "$perc" $((secs/3600)) $((secs%3600/60))
+	secs=$(dbus_send 'TimeToEmpty')
 elif [ "$state" -eq 1 ]; then  # Charging
-  secs=$(dbus-send --print-reply=literal --system \
-            --dest=org.freedesktop.UPower \
-            /org/freedesktop/UPower/devices/battery_BAT0 \
-            org.freedesktop.DBus.Properties.Get \
-            string:org.freedesktop.UPower.Device \
-            string:'TimeToFull' | awk '{print $3}')
-  printf '%s%%%%%2dh%02dm\n' "$perc" $((secs/3600)) $((secs%3600/60))
+	secs=$(dbus_send 'TimeToFull')
 fi
+
+printf '%s%%%%%2dh%02dm\n' "$perc" $((secs / 3600)) $((secs % 3600 / 60))
 #+end_src
 
 ** rofi-light
@@ -5050,6 +5044,21 @@ import gnomekeyring as gk
 gk.unlock_sync('Default_keyring',gk.item_get_info_sync('login',1L).get_secret())
 #+end_src
 
+** volume-info
+:PROPERTIES:
+:header-args+: :tangle ~/.local/bin/volume-info :shebang "#!/bin/sh"
+:END:
+
+#+begin_src sh
+cur_vol=$(pamixer --get-volume)
+
+if [ $(pamixer --get-mute) = true ]; then
+  printf 'mt \n' "$cur_vol"
+else
+  printf '%02d \n' "$cur_vol"
+fi
+#+end_src
+
 ** wp
 
 My little wallpaper changer script.