4 files changed, 10 insertions, 1 deletions
diff --git a/xcompose b/xcompose
index 006314c..0b0b1d5 100644
--- a/xcompose
+++ b/xcompose
@@ -5,3 +5,5 @@ include "/usr/share/X11/locale/en_US.UTF-8/Compose"
 <dead_circumflex> <s> : "Stefan Ritter <xeno@thehappy.de>"
 <dead_circumflex> <h> : ".oO()"
 <dead_circumflex> <x> : "[✘]"
+<dead_circumflex> <p> : "http_proxy=http://localhost:3128 "
+<dead_circumflex> <l> : "♥"
diff --git a/xdefaults b/xdefaults
index d23f2cb..d6b8ace 100644
--- a/xdefaults
+++ b/xdefaults
@@ -1,4 +1,5 @@
 URxvt*font: -xos4-terminus-*-*-*-*-*-*-*-*-*-*-*-*
+#URxvt*font: -misc-fixed-*-*-*-*-17-*-*-*-*-*-*-*
 
 URxvt*buffered: true
 URxvt*internalBorder: 2
diff --git a/xinitrc b/xinitrc
index b4fd4a1..6e9ff0d 100755
--- a/xinitrc
+++ b/xinitrc
@@ -1,10 +1,11 @@
 #!/bin/bash
-WM='i3'
+WM='awesome'
 
 keychain --clear -q ~/.ssh/id_rsa
 source ~/.keychain/`hostname`-sh > /dev/null
 feh --bg-scale ~/media/pictures/wallpaper/$(ls ~/media/pictures/wallpaper/ | sed -n $((RANDOM%$(ls ~/media/pictures/wallpaper/ | wc -l)+1))p)
 blueman-applet &
+wicd-client &
 
 exec $WM
 # vim: set tw=0:
diff --git a/zshrc b/zshrc
index 964e518..7fe4d71 100644
--- a/zshrc
+++ b/zshrc
@@ -27,6 +27,11 @@ autoload -U compinit; compinit
 autoload zmv
 
 alias c="clear && fortune"
+
+if [ "$HOST" = "galahad" ]; then
+	alias ls="ls --color=auto"
+fi
+
 alias l="ls -la"
 alias mkdir="mkdir -p"
 alias rmrf="rm -rf"