From aeacd873392686f4fc12d93dab82903d1140f974 Mon Sep 17 00:00:00 2001
From: Vasil Zlatanov <vasil.zlatanov@gmail.com>
Date: Sun, 22 Mar 2015 22:37:16 +0100
Subject: many + uzbl

---
 ratpoison/panel/load      |  2 +-
 ratpoison/panel/panel     |  2 +-
 ratpoison/panel/panel_bar | 32 ++++++++++++++++----------------
 3 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'ratpoison/panel')

diff --git a/ratpoison/panel/load b/ratpoison/panel/load
index 3977bee..a1dbcdb 100755
--- a/ratpoison/panel/load
+++ b/ratpoison/panel/load
@@ -1,6 +1,6 @@
 #!/bin/bash
 while true; do
-cpu=`mpstat -P ALL 2 1 | grep "Average.*all" | awk '{print $3+$5}'` 
+cpu=`mpstat -P ALL 10 1 | grep "Average.*all" | awk '{print $3+$5}'` 
 mem=`free | grep Mem | awk '{print $3/$2 * 100.0}'`
 printf "C%.*f\n" 1 $cpu
 printf "R%.*f\n" 0 $mem
diff --git a/ratpoison/panel/panel b/ratpoison/panel/panel
index b998d0b..377bc66 100755
--- a/ratpoison/panel/panel
+++ b/ratpoison/panel/panel
@@ -13,8 +13,8 @@ volume -f 'V%i' > "$PANEL_FIFO" &
 battery -i 60 -sf 'B%i' > "$PANEL_FIFO" &
 clock -i 60 -sf 'Z%d %a %H:%M' > "$PANEL_FIFO" &
 ./music > "$PANEL_FIFO" &
+./load > "$PANEL_FIFO" &
 #essid -sf 'E%s' -i 30 -w wlp2s0 > "$PANEL_FIFO" &
-# ./load > "$PANEL_FIFO" &
 # ./signal > "$PANEL_FIFO" &
 
 
diff --git a/ratpoison/panel/panel_bar b/ratpoison/panel/panel_bar
index 24ec723..55f2403 100755
--- a/ratpoison/panel/panel_bar
+++ b/ratpoison/panel/panel_bar
@@ -8,13 +8,13 @@ num_mon=$(bspc query -M | wc -l)
 while read -r line ; do
 source ./panel_colors
 	case $line in
-#		C*)
-#			cpu="%{F$COLOR_STATUS_FG}%{B$COLOR_STATUS_BG} C:${line#?} %{B-}%{F-}"
-#			;;
-#		R*)
-#			ram="%{F$COLOR_STATUS_FG}%{B$COLOR_STATUS_BG} R:${line#?} %{B-}%{F-}"
-#			;;
-#	
+		C*)
+			cpu="%{F$COLOR_STATUS_FG}%{B$COLOR_STATUS_BG} C:${line#?} %{B-}%{F-}"
+			;;
+		R*)
+			ram="%{F$COLOR_STATUS_FG}%{B$COLOR_STATUS_BG} R:${line#?} %{B-}%{F-}"
+			;;
+	
 #		S*)
 #			signal="%{F$COLOR_STATUS_FG}%{B$COLOR_STATUS_BG} S:${line#?} %{B-}%{F-}"
 #			;;
@@ -47,14 +47,14 @@ source ./panel_colors
 			volume="%{F$COLOR_STATUS_FG}%{B$COLOR_STATUS_BG} V:${line#?} %{B-}%{F-}"
 			;;
 	
-#		E*)
-#			# essid output
-#                        if [ -z ${line#?} ];then 
-#			essid="%{F$COLOR_STATUS_FG}%{B$COLOR_STATUS_BG} E:No WiFi  %{B-}%{F-}"
-#                        else
-#			essid="%{F$COLOR_STATUS_FG}%{B$COLOR_STATUS_BG} E:${line#?} %{B-}%{F-}"
-#                        fi
-#			;;
+		E*)
+			# essid output
+                        if [ -z ${line#?} ];then 
+			essid="%{F$COLOR_STATUS_FG}%{B$COLOR_STATUS_BG} E:No WiFi  %{B-}%{F-}"
+                        else
+			essid="%{F$COLOR_STATUS_FG}%{B$COLOR_STATUS_BG} E:${line#?} %{B-}%{F-}"
+                        fi
+			;;
 	
 		Z*)
 			# clock output
@@ -119,5 +119,5 @@ source ./panel_colors
 			;;
 	esac
 #	printf "%s\n" "%{l}${wm_infos}${title}%{r}${playing}${paused}${cpu}${ram}${essid}${signal}${volume}${musicvol}${battery}${time_infos}             "
-	printf "%s\n" "%{l}${wm_infos}${title}%{r}${playing}${paused}${volume}${musicvol}${battery}${time_infos}             "
+	printf "%s\n" "%{l}${wm_infos}${title}%{r}${playing}${paused}${cpu}${ram}${volume}${musicvol}${battery}${time_infos}             "
 done
-- 
cgit v1.2.3-54-g00ecf