merge vapier@vapier

diff --git a/.gitignore b/.gitignore
index 84affb056ef09eedd142702c4492198469cf3fd6..3c1f6d0bb35e3f427478339e7c23cebd664fd55a 100644 (file)
--- 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 f631ab3877aedee2246630bde97a793a2eb6e580..0d3aa53ce48365d88e6092cf17dd233d636bfdb7 100644 (file)
--- 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