Several changes

3 files changed, 5 insertions, 7 deletions

diff --git a/wmii-3.5/wmiirc b/wmii-3.5/wmiirc
index 351b24a..e03ceb7 100755
--- a/wmii-3.5/wmiirc
+++ b/wmii-3.5/wmiirc
@@ -12,12 +12,12 @@ RIGHT=t
 WMII_FOCUSCOLORS='#00FF00 #000000 #111111'
 WMII_NORMCOLORS='#EEEEEE #000000 #111111'
 WMII_FONT='fixed'
+
+set -- $(echo $WMII_NORMCOLORS $WMII_FOCUSCOLORS)
+
 WMII_MENU="dmenu -b -fn '$WMII_FONT' -nf '$1' -nb '$2' -sf '$4' -sb '$5'"
 WMII_9MENU="wmii9menu -font '$WMII_FONT' -nf '$1' -nb '$2' -sf '$4' -sb '$5' -br '$6'"
 WMII_TERM="x-terminal-emulator"
-WMII_LOCK="xtrlock"
-
-set -- $(echo $WMII_NORMCOLORS $WMII_FOCUSCOLORS)
 
 # Column Rules
 wmiir write /colrules <<!
@@ -120,8 +120,6 @@ eventstuff() {
 		sh -c "$(eval $WMII_MENU <$progsfile)" &
 	Key $MODKEY-Return
 		eval $WMII_TERM &
-	Key $MODKEY-l
-		eval $WMII_LOCK &
 	Key $MODKEY-Shift-space
 		wmiir xwrite /tag/sel/ctl send sel toggle
 	Key $MODKEY-m
diff --git a/xdefaults b/xdefaults
index ceb4822..601ba81 100644
--- a/xdefaults
+++ b/xdefaults
@@ -1,4 +1,5 @@
-URxvt*font: xft:Bitstream Vera Sans Mono:pixelsize=11
+URxvt*font: -xos4-terminus-*-*-*-*-*-*-*-*-*-*-*-*
+
 
 URxvt*buffered: true
 URxvt*internalBorder: 2
diff --git a/xinitrc b/xinitrc
index b5db033..d56465a 100755
--- a/xinitrc
+++ b/xinitrc
@@ -1,7 +1,6 @@
 #!/bin/bash
 WM='wmii'
 
-setxkbmap de neo
 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)