From e689bb19ba7da09b6735f9971d3e062721c57138 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Mon, 3 Nov 2008 12:23:39 -0500
Subject: [PATCH] merge vapier@vapier

---
 .gitignore |  2 ++
 .xinitrc   | 17 +++++++++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 84affb0..3c1f6d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,8 @@
 *.gdb
 *.o
 a.out
+/log
+/out
 
 # Session files
 /.bugz_cookie
diff --git a/.xinitrc b/.xinitrc
index f631ab3..0d3aa53 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -1,2 +1,15 @@
-exec twm
-exec startkde
+export DISPLAY=:0
+
+[[ -n $(xrandr | grep '1600 x 1200') ]] && xrandr -s 1
+#gaim &
+#kmail &
+#xmms -p &
+gkrellm2 &
+#(sleep 15 ; xchat-2 ) &
+xset r rate 200
+xmodmap .xmodmap
+Eterm &
+( sleep 15 ; randomwallpaper ) &
+exec e16
+#( enlightenment || e16 ) &
+#exec X-life-line
-- 
2.39.5