From 49ba23870a74b6e3c9006f8e9cf52d614fc04931 Mon Sep 17 00:00:00 2001
From: Florian Pritz <bluewind@xinu.at>
Date: Thu, 12 Jul 2012 11:27:09 +0200
Subject: update xinitrc and conky config

Signed-off-by: Florian Pritz <bluewind@xinu.at>
---
 .xinitrc | 30 ++++++------------------------
 1 file changed, 6 insertions(+), 24 deletions(-)

(limited to '.xinitrc')

diff --git a/.xinitrc b/.xinitrc
index 430f290..3285521 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -12,48 +12,30 @@ source $HOME/bin/gpg-agent.sh
 setxkbmap de nodeadkeys
 xbindkeys &
 xmodmap ~/.xmodmaprc &
-urxvtd -o -f -q 
-xautolock -nowlocker $HOME/bin/screen-locker.sh -locker $HOME/bin/screen-locker.sh -time 5 &
+xautolock -nowlocker $HOME/bin/screen-locker.sh -locker $HOME/bin/screen-locker.sh -time 10 &
+/usr/lib/xfce4/notifyd/xfce4-notifyd &
 
 autostart () {
-	notipy.py -a SOUTH_EAST -m 0,1920,0,0 &
-  $HOME/bin/irssi_notify.sh & # also in ~/bin/suspend-resume.sh
-  urxvt -g 125x+45+1166+0 -e ssh mistral &
-  urxvt -g 125x+45+1920+0 -e ssh karif &
+  notipy.py -a SOUTH_EAST -m 0,1920,0,0 &
+  urxvt -g 125x+45+1041+0 -e ssh mistral &
+#	urxvt -g 125x+45+1920+0 -e ssh karif &
   stalonetray --dockapp-mode -p --kludges force_icons_size &
-#  lxpanel &
   for f in $XDG_CONFIG_HOME/conky/*; do
     conky -c "$f" &
   done
-	rm $HOME/passwords.kdb.lock
+  rm -f $HOME/passwords.kdb.lock
   keepassx&
-#  transmission-qt &
   transmission-remote-gtk &
-#  psi &
-  gajim &
-#  /opt/Samsung/SmartPanel/bin/smartpanel &
-#  ossxmix -b & # also in ~/bin/suspend-resume.sh
   ossmixer.py &> /dev/null &
   thunderbird &
   liferea &
   zim &
   parcellite &
-#  blueman-applet &
   $HOME/git/thetime/src/thetime -t "%F %H:%M:%S" -p 1921,1040 -f "xft:DejaVu Sans:size=10"
 }
 
 # WM
 case "$1" in
-  awesome|i3)
-    i3 --force-xinerama &
-    sleep 1
-    autostart &
-  ;;
-  twm)
-    twm &
-    sleep 1
-    autostart &
-  ;;
   console)
     openbox &
     sleep 1
-- 
cgit v1.2.3-24-g4f1b