[rc] disable some i3gs blocks & change battery time/perct. format

[~bandali/configs] / rc.org

diff --git a/rc.org b/rc.org
index 20bb8bd..1ea4d4e 100644 (file)
--- a/rc.org
+++ b/rc.org
@@ -752,25 +752,25 @@ timeout = 0
 borders_width=0 0 2 0
 separator_width=10
 
-[mpd]
-preset=MPD
-title=<span weight='heavy' fgcolor='#7FDBFF'> </span>
-borders_color=#7FDBFF
+#[mpd]
+#preset=MPD
+#title=<span weight='heavy' fgcolor='#7FDBFF'> </span>
+#borders_color=#7FDBFF
 
 [ram]
 preset=RAM
 title=<span weight='heavy' fgcolor='#3D9970'> </span>
 borders_color=#3D9970
 
-[cpu]
-preset=CPU
-title=<span weight='heavy' fgcolor='#2ECC40'> </span>
-borders_color=#2ECC40
+#[cpu]
+#preset=CPU
+#title=<span weight='heavy' fgcolor='#2ECC40'> </span>
+#borders_color=#2ECC40
 
-[hdd]
-preset=HDD
-title=<span weight='heavy' fgcolor='#01FF70'> </span>
-borders_color=#01FF70
+#[hdd]
+#preset=HDD
+#title=<span weight='heavy' fgcolor='#01FF70'> </span>
+#borders_color=#01FF70
 
 [battery]
 preset=BAT
@@ -3664,6 +3664,7 @@ insert_pass="Alt+n"
 
 #+begin_src conf
 exec xrdb .Xresources
+exec dunst
 ### Variables
 # super
 set $mod Mod4
@@ -3734,10 +3735,7 @@ input "1:1:AT_Translated_Set_2_keyboard" {
 
     # Drag floating windows by holding down $mod and left mouse button.
     # Resize them with right mouse button + $mod.
-    # Despite the name, also works for non-floating windows.
-    # Change normal to inverse to use left mouse button for resizing and right
-    # mouse button for dragging.
-    #floating_modifier $mod normal
+    floating_modifier $mod
 
     # reload the configuration file
     bindsym $mod+Shift+c reload
@@ -3749,17 +3747,22 @@ input "1:1:AT_Translated_Set_2_keyboard" {
     bindsym XF86MonBrightnessUp exec light -A 5    # increase screen brightness
     bindsym XF86MonBrightnessDown exec light -U 5  # decrease screen brightness
 
-    # bspwm-esque workspace switch and window move
-    bindsym $mod+bracketleft exec sway-ws-util switch prev
-    bindsym $mod+bracketright exec sway-ws-util switch next
-    bindsym $mod+braceleft exec sway-ws-util move prev follow
-    bindsym $mod+braceright exec sway-ws-util move next follow
+    bindsym XF86AudioRaiseVolume exec pamixer --allow-boost --increase 5
+    bindsym XF86AudioLowerVolume exec pamixer --allow-boost --decrease 5
+    bindsym XF86AudioMute exec pamixer --toggle-mute
+    bindsym XF86AudioMicMute exec pactl set-source-mute 1 toggle
 
     # original sway workspace switch and window move
-    bindsym $mod2+bracketleft workspace prev
-    bindsym $mod2+bracketright workspace next
-    bindsym $mod2+braceleft move container to workspace prev
-    bindsym $mod2+braceright move container to workspace next
+    bindsym $mod+bracketleft workspace prev
+    bindsym $mod+bracketright workspace next
+    bindsym $mod+braceleft move container to workspace prev
+    bindsym $mod+braceright move container to workspace next
+
+    # bspwm-esque workspace switch and window move
+    bindsym $mod2+bracketleft exec sway-ws-util switch prev
+    bindsym $mod2+bracketright exec sway-ws-util switch next
+    bindsym $mod2+braceleft exec sway-ws-util move prev follow
+    bindsym $mod2+braceright exec sway-ws-util move next follow
 #
 # Moving around:
 #
@@ -4879,9 +4882,37 @@ exact brightness value.
 :END:
 
 #+begin_src bash
-pct=$(upower -i /org/freedesktop/UPower/devices/battery_BAT0 | grep percentage | awk '{print $2}')
-time=$(upower -i /org/freedesktop/UPower/devices/battery_BAT0 | grep time | awk '{print $4,$5}')
-echo "$pct ($time)"
+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}')
+
+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))
+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))
+fi
 #+end_src
 
 ** rofi-light