Merge branch 'master' of gitorious.org:lukeshu-dotfiles/lukeshu-dotfiles

Conflicts:
	.emacs
	.emacs.d/custom.el

1 files changed, 0 insertions, 37 deletions

diff --git a/.wmii/wmiirc_local b/.wmii/wmiirc_local
deleted file mode 100755
index 4b0330e..0000000
--- a/.wmii/wmiirc_local
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/dash -f
-# -*- mode: sh; -*-
-
-# wmiirc file for my HP Pavilion dv6426us laptop
-
-MODKEY=Mod4
-
-status() {
-	buffer=$(
-	echo -n ' '
-	# Wifi status
-	echo -n 'Wlan0:' $(iwconfig wlan0 | sed 's/ /\n/g' | grep Quality)
-	
-	echo -n ' | '
-	
-	# Battery charge (not status)
-	echo -n $(acpi -b | sed 's/.*, \{0,2\}\([0-9]\{1,3\}%\),.*/Bat: \1/')
-	
-	echo -n ' | '
-	# CPU
-	# This doesn't work for me, it shows capacity
-	#echo -n 'Core MHz:' $(cat /proc/cpuinfo | grep 'cpu MHz' | sed 's/.*: //g; s/\..*//g;')
-	# This actually displays %idle
-	echo -n 'CPU: [ '$(tail -n3 ~/tmp/cputime|sed -u 's/  */\t/g'|cut -f3,12|sed 's/\t\(.*\)/(\1)/')' ]'
-	
-	#echo -n ' | '
-	
-	#echo -n $(uptime | sed 's/.*://; s/,//g')
-	
-	echo -n ' | '
-	
-	echo -n $(date) 
-	
-	echo -n ' '
-	)
-	echo "$buffer"
-}