Switch from i3status+conky to i3blocks.

i3/i3/scripts/battery.bash

@@ -18,13 +18,12 @@ THRESHOLD2=5
 acpi_output=$(acpi -b)
 if [[ -n "$acpi_output" ]] ; then
     has_battery=1
-    percent="$(echo "$acpi_output" | cut -d "," -f 2 | cut -d " " -f 2 | cut -d "%" -f 1)"
+    percent="$(echo "$acpi_output" | grep -oP '\d+(?=%)')"
     if [[ $percent == 100 ]] ; then
         status="Full"
     else
-        status="$(echo "$acpi_output" | cut -d "," -f 1 | cut -d " " -f 3)"
+        status="$(echo "$acpi_output" | grep -oP '(?<=: )\w+(?=,)' )"
     fi
-    time="$(echo "$acpi_output" | cut -d "," -f 3 | cut -d " " -f 2)"
     shortstatus="$(echo $status | cut -c 1)"
 else
     has_battery=0
@@ -34,19 +33,6 @@ log() {
     echo [$(date +%FT%T)] "$*" >> $logfile
 }
 
-
-pretty() {
-    if (( has_battery )) ; then
-        (
-        echo "Status:|$status"
-        echo "Charge:|${percent}%"
-        if [[ $percent != 100 ]] ; then
-            echo "Time left:|$time"
-        fi
-        ) | column -t --separator="|"
-    fi
-}
-
 charging() {
     [[ "$shortstatus" == "C" ]]
 }
@@ -56,14 +42,14 @@ discharging() {
 }
 
 threshold1() {
-    [[ $percent -le $THRESHOLD1 ]]
+    (( $percent <= $THRESHOLD1 ))
 }
 
 threshold2() {
-    [[ $percent -le $THRESHOLD2 ]]
+    (( $percent <= $THRESHOLD2 ))
 }
 
-conky() {
+short() {
     if (( has_battery )) ; then
         if discharging ; then
             if threshold2 ; then
@@ -87,34 +73,27 @@ conky() {
                 rm "$PATH_WARN_1"
             fi
             [[ -f "$PATH_WARN_2" ]] && rm "$PATH_WARN_2"
-            #if [[ $percent -gt 25 ]] ; then
-            #    [[ -f "$PATH_WARN_1" ]] && rm "$PATH_WARN_1"
-            #elif [[ $percent -gt 5 ]] ; then
-            #    [[ -f "$PATH_WARN_2" ]] && rm "$PATH_WARN_2"
-            #fi
-
         fi
 
         if threshold2 ; then
             color="#FF0000" # red
+            urgent=1
         elif threshold1 ; then
             color="#FFFF00" # yellow
+            urgent=0
         else
             color="#FFFFFF" # white
+            urgent=0
         fi
 
-
-
-        echo "{ \"full_text\" : \"     ${shortstatus} ${percent}% \" , \"color\" : \"$color\" , \"name\" : \"battery\" },"
+        echo "${shortstatus}  ${percent}%"
+        echo
+        echo $color
+        (( $urgent )) && exit 33
+        exit 0
     else
-        echo "{ \"full_text\" : \"     no battery \" , \"color\" : \"#FFFFFF\" , \"name\" : \"battery\" },"
+        echo "no battery"
     fi
 }
 
-if [[ "$1" == "conky" ]] ; then
-    conky
-else
-    pretty
-fi
-
-
+short

i3/i3/scripts/i3bar_wrapper.bash

@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-# paths to scripts used.
-path_conkyrc="$1"
-
-_PIDFILE="$RUNDIR/i3/conky.pid"
-
-
-# end the header so that i3bar knows we want to use JSON:
-echo '{ "version" : 1 , "click_events" : true }'
-
-# Begin the endless array.
-echo '['
-
-# We send an empty first array of blocks to make the loop simpler:
-echo '[],'
-
-# Now send blocks with information forever:
-conky -c "$path_conkyrc" &
-
-pid=$!
-
-printf '%s' $pid > "$_PIDFILE"
-
-wait $pid

i3/i3/scripts/update-status.bash

@@ -1 +1,2 @@
-kill -USR1 $(cat $RUNDIR/i3/conky.pid)
+#!/usr/bin/env bash
+pkill --signal SIGRTMIN+1 i3blocks