Fiddle with my wmii config

3 files changed, 27 insertions, 56 deletions

diff --git a/.wmii/wmiirc_local b/.wmii/wmiirc_local
index eac35c0..dd72f59 100755
--- a/.wmii/wmiirc_local
+++ b/.wmii/wmiirc_local
@@ -1,60 +1,7 @@
 #!/bin/dash
 
-MODKEY=Mod4
+export WMII_FONT='xft:Monospace-8'
 export WMII_TERM="urxvt"
 
-
-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"
-}
-
-# Solarized
-SOL_BASE03='#002b36'
-SOL_BASE02='#073642'
-SOL_BASE01='#586e75'
-SOL_BASE00='#657b83'
-SOL_BASE0='#839496'
-SOL_BASE1='#93a1a1'
-SOL_BASE2='#eee8d5'
-SOL_BASE3='#fdf6e3'
-SOL_YELLOW='#b58900'
-SOL_ORANGE='#cb4b16'
-SOL_RED='#dc322f'
-SOL_MAGENTA='#d33682'
-SOL_VIOLET='#6c71c4'
-SOL_BLUE='#268bd2'
-SOL_CYAN='#2aa198'
-SOL_GREEN='#859900'
-
-# Solarized-dark
-# ="<text> <background> <border>"
-WMII_NORMCOLORS="$SOL_BASE0 $SOL_BASE03 $SOL_BASE02"
-WMII_FOCUSCOLORS="$SOL_BASE0 $SOL_BASE02 $SOL_BASE0"
-WMII_BACKGROUND="$SOL_BASE02"
+. $HOME/.wmii/wmiirc_local.local
+. $HOME/.wmii/wmiirc_solarized_dark
diff --git a/.wmii/wmiirc_solarized b/.wmii/wmiirc_solarized
new file mode 100644
index 0000000..5dc830d
--- /dev/null
+++ b/.wmii/wmiirc_solarized
@@ -0,0 +1,16 @@
+SOL_BASE03='#002b36'
+SOL_BASE02='#073642'
+SOL_BASE01='#586e75'
+SOL_BASE00='#657b83'
+SOL_BASE0='#839496'
+SOL_BASE1='#93a1a1'
+SOL_BASE2='#eee8d5'
+SOL_BASE3='#fdf6e3'
+SOL_YELLOW='#b58900'
+SOL_ORANGE='#cb4b16'
+SOL_RED='#dc322f'
+SOL_MAGENTA='#d33682'
+SOL_VIOLET='#6c71c4'
+SOL_BLUE='#268bd2'
+SOL_CYAN='#2aa198'
+SOL_GREEN='#859900'
diff --git a/.wmii/wmiirc_solarized_dark b/.wmii/wmiirc_solarized_dark
new file mode 100644
index 0000000..4d663d2
--- /dev/null
+++ b/.wmii/wmiirc_solarized_dark
@@ -0,0 +1,8 @@
+# Solarized-dark
+
+. $HOME/.wmii/wmiirc_solarized
+
+# ="<text> <background> <border>"
+WMII_NORMCOLORS="$SOL_BASE0 $SOL_BASE03 $SOL_BASE02"
+WMII_FOCUSCOLORS="$SOL_BASE0 $SOL_BASE02 $SOL_BASE0"
+WMII_BACKGROUND="$SOL_BASE02"