From cc07736285bbb9f6bb3615f1cc6fc483bc8a5024 Mon Sep 17 00:00:00 2001
From: Florian Pritz <f-p@gmx.at>
Date: Sun, 24 May 2009 00:26:36 +0200
Subject: again spaces, change caps to esc, readd consolekit session

---
 .vimrc   |  4 ++--
 .xinitrc | 19 ++++++++++---------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/.vimrc b/.vimrc
index 2bfcea1..6b584fa 100644
--- a/.vimrc
+++ b/.vimrc
@@ -7,8 +7,8 @@ set nocompatible
 set encoding=utf-8               " unicode encoding
 set t_Co=256
 set nobackup
-set noexpandtab
-set tabstop=2 
+set expandtab
+set tabstop=2
 set shiftwidth=2
 set softtabstop=2
 set ruler                        " show me where the cursor is
diff --git a/.xinitrc b/.xinitrc
index ea6b1f0..f67514c 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -10,7 +10,8 @@ source $HOME/bin/gpg-agent.sh
 
 # autostart entries
 xbindkeys &
-xmodmap -e "remove lock = Caps_Lock" &
+#xmodmap -e "remove lock = Caps_Lock" &
+xmodmap -e "keysym Caps_Lock = Escape" &
 urxvtd -o -f -q 
 xautolock -nowlocker $HOME/bin/screen-locker.sh -locker $HOME/bin/screen-locker.sh -time 5 &
 sh $HOME/bin/irssi_notify.sh < /dev/null & # also in ~/bin/suspend-resume.sh
@@ -37,24 +38,24 @@ autostart () {
 # WM
 case "$1" in
   awesome)
-    awesome &
+		ch-launch-session awesome &
 		sleep 1
-    autostart &
+		autostart &
   ;;
   twm)
-    twm &
+		ch-launch-session twm &
 		sleep 1
-    autostart &
+		autostart &
   ;;
   console)
-    openbox &
+		ch-launch-session openbox &
 		sleep 1
-    urxvtc &
+		urxvtc &
   ;;
   *|openbox) 
-    openbox &
+		ch-launch-session openbox &
 		sleep 1
-    autostart &
+		autostart &
   ;;
 esac
 
-- 
cgit v1.2.3-24-g4f1b