Merge branch 'master' of github.com:vlsd/config

Author: Vlad Seghete

.gitignore

@@ -1,2 +1,3 @@
 *.sw*
 wakeonlan
+oh-my-zsh/custom/*

bin/.gitignore

@@ -1,2 +1,3 @@
 math
 beet
+python

bin/cpusage

@@ -0,0 +1,31 @@
+#!/bin/bash
+# by Paul Colby (http://colby.id.au), no rights reserved ;)
+
+PREV_TOTAL=0
+PREV_IDLE=0
+
+while true; do
+  CPU=(`cat /proc/stat |grep '^cpu '`)  # Get the total CPU statistics.
+  unset CPU[0]                          # Discard the "cpu" prefix.
+  IDLE=${CPU[4]}                        # Get the idle CPU time.
+
+  # Calculate the total CPU time.
+  TOTAL=0
+  for VALUE in "${CPU[@]}"; do
+      (( TOTAL=TOTAL+VALUE ))
+  done
+
+  # Calculate the CPU usage since we last checked.
+  (( DIFF_IDLE=IDLE-PREV_IDLE ))
+  (( DIFF_TOTAL=TOTAL-PREV_TOTAL ))
+  (( DIFF_USAGE=(1000*(DIFF_TOTAL-DIFF_IDLE)/DIFF_TOTAL+5)/10 ))
+  echo ${DIFF_USAGE} > "/var/tmp/${USER}_cpu"
+
+  # Remember the total and idle CPU times for the next check.
+  let PREV_TOTAL=$TOTAL
+  let PREV_IDLE=$IDLE
+
+  # Wait before checking again.
+  sleep 1
+done
+

bin/screenstats

@@ -1,5 +1,12 @@
 #!/bin/sh
 
-LOAD=$(awk < /proc/loadavg '{print $1}')
-MEM=$(free -ho |awk 'FNR==2 {print $4"/"$2}')
-echo "L:$LOAD Mem:$MEM"
+# if cpusage is not running, start it
+if ! pidof -x cpusage > /dev/null
+then
+    cpusage &!
+fi
+
+#LOAD=$(awk < /proc/loadavg '{print $1}')
+MEM=$(free |awk 'FNR==3 {print 100*$3/($3+$4)}' OFMT="%2.f")
+CPU=$(cat /var/tmp/vlad_cpu)
+echo "Cpu:$CPU% Mem:$MEM%"

gitconfig

@@ -1,11 +1,8 @@
 [user]
 	name = Vlad Seghete
 	email = [email protected]
-
 [alias]
     pu = !"git fetch origin -v; git fetch upstream -v; git merge upstream/master"
-#[push]
-#	default = simple
 [core]
 	editor = vim
 [color]