From 790e251a34b976ebc9b46685d90ed10e22325227 Mon Sep 17 00:00:00 2001
From: natemaia <natemaia10@gmail.com>
Date: Mon, 9 Jul 2018 18:48:03 -0700
Subject: [PATCH] Update polybar cpu load module with fix from
 https://forum.archlabslinux.com/t/2018-07-testing-release/1196/13

---
 home/.config/polybar/config       |  6 +++---
 home/.config/polybar/master.conf  |  2 +-
 home/.config/polybar/modules.conf | 18 ++++--------------
 home/bin/rofr.sh                  | 17 +++++++----------
 4 files changed, 15 insertions(+), 28 deletions(-)

diff --git a/home/.config/polybar/config b/home/.config/polybar/config
index 59088dcb..296cef4f 100644
--- a/home/.config/polybar/config
+++ b/home/.config/polybar/config
@@ -19,7 +19,7 @@ monitor =
 
 modules-left   = jgmenu workspaces
 modules-center = window_switch clock
-modules-right  = pkg memory temperature coreuse network volume
+modules-right  = coreuse temperature memory pkg network volume
 
 
 ;=====================================================
@@ -34,7 +34,7 @@ monitor =
 
 modules-left   = jgmenu i3 menu
 modules-center = clock
-modules-right  = pkg memory temperature coreuse network volume
+modules-right  = coreuse temperature memory pkg network volume
 
 
 ;=====================================================
@@ -49,4 +49,4 @@ monitor =
 
 modules-left   = bspwm menu
 modules-center = clock
-modules-right  = pkg memory temperature coreuse network volume
+modules-right  = coreuse temperature memory pkg network volume
diff --git a/home/.config/polybar/master.conf b/home/.config/polybar/master.conf
index a5def9fc..fff43d5f 100644
--- a/home/.config/polybar/master.conf
+++ b/home/.config/polybar/master.conf
@@ -61,7 +61,7 @@ separator = │
 ; shows which modules have click actions
 cursor-click = pointer
 
-; with the above these cause the entire bar to have click actions
+; with cursor-click = pointer' these cause the entire bar to have click actions
 ; essentially defeating the purpose, so they are commented out
 
 ; scroll-up = pamixer -i 2
diff --git a/home/.config/polybar/modules.conf b/home/.config/polybar/modules.conf
index 601d385c..18bc013c 100644
--- a/home/.config/polybar/modules.conf
+++ b/home/.config/polybar/modules.conf
@@ -171,7 +171,7 @@ type = internal/cpu
 interval = 3
 format-padding = 1
 format = <label> <ramp-coreload>
-label = %{A1:st -e htop -s PERCENT_CPU & disown:} %percentage%% %{A}
+label = %{A1:st -e htop -s PERCENT_CPU & disown:} %percentage:2%% %{A}
 ramp-coreload-0 = ▂
 ramp-coreload-1 = ▃
 ramp-coreload-2 = ▄
@@ -252,7 +252,7 @@ type = internal/volume
 master-mixer = Master
 format-volume-padding   = 1
 label-volume-foreground = ${colors.foreground}
-label-volume  = %{A3:pavucontrol & disown:}%percentage%% %{A}
+label-volume  = %{A3:pavucontrol & disown:}%percentage:2%% %{A}
 format-volume = <ramp-volume> <label-volume>
 label-muted   = " muted "
 ramp-volume-0 = 
@@ -367,17 +367,7 @@ type           = internal/xkeyboard
 blacklist-0    = scroll lock
 format         = <label-layout> <label-indicator>
 format-spacing = 0
-
-; Available tokens:
-;   %layout%
-;   %name%
-;   %number%
-; Default: %layout%
-label-layout   = %{A1:mintlocale & disown:} %{A3:mintlocale & disown:} %layout%%{A} %{A}
-
-; Available tokens:
-;   %name%
-; Default: %name%
+label-layout   =  %layout%
 label-indicator = %name%
 label-indicator-padding = 2
 label-indicator-background = #8139e8
@@ -474,7 +464,7 @@ ramp-signal-3-foreground = ${colors.purple}
 ramp-signal-4-foreground = ${colors.purple}
 ramp-signal-5-foreground = ${colors.purple}
 animation-packetloss-0 = ⚠
-animation-packetloss-1 = 📶
+animation-packetloss-1 = !
 animation-packetloss-0-foreground = #ffa64c
 animation-packetloss-1-foreground = #000000
 animation-packetloss-framerate = 500
diff --git a/home/bin/rofr.sh b/home/bin/rofr.sh
index bc45ba63..85dc11c4 100755
--- a/home/bin/rofr.sh
+++ b/home/bin/rofr.sh
@@ -71,10 +71,9 @@ for arg in "$@"; do
                                           sed '/:/d' |
                                           awk '{$1=$1};1' |
                                           rofi -hide-scrollbar -kb-row-select 'Tab' \
-                                            -kb-row-tab 'Control+space' -dmenu \
-                                            -mesg 'Tab for Autocomplete' -i -p 'Web Search' \
-                                            -padding 50 -line-padding 4)
-            ;;
+                                          -kb-row-tab 'Control+space' -dmenu \
+                                          -mesg 'Tab for Autocomplete' -i -p 'Web Search' \
+                                          -padding 50 -line-padding 4) ;;
         -l|--logout)
             ANS="$(rofi -sep "|" -dmenu -i -p 'System' -width 20 \
                 -hide-scrollbar -line-padding 4 -padding 20 \
@@ -84,13 +83,11 @@ for arg in "$@"; do
                 *Logout) session-logout || pkill -15 -t tty"$XDG_VTNR" Xorg ;;
                 *Reboot) systemctl reboot ;;
                 *Shutdown) systemctl -i poweroff
-            esac
-            ;;
-        *)
-            echo -e "Option does not exist: $arg"
-            usage
-            exit 1
+            esac ;;
+        *) echo; echo "Option does not exist: $arg"; echo; exit 2
     esac
 done
 
+(( $# == 0 )) && "$0" -r
+
 exit 0