Changes.

x/xinitrc

@@ -11,7 +11,7 @@ log() {
     echo "[$(date +%FT%T)] $*" >> "$LOGFILE"
 }
 
-log "START"
+log "xinitrc startup"
 
 if [ -d /etc/X11/xinit/xinitrc.d ]; then
   for f in /etc/X11/xinit/xinitrc.d/*; do
@@ -64,24 +64,13 @@ redshift_colortemp="5500:3700"
 # start mpd
 if ! pgrep --euid hannes --exact '^mpd$' ; then
     log "mpd is not running, starting mpd"
-    mpd "$HOME/.mpd/mpd.conf" &
+    mpd "$HOME/.mpd/mpd.conf" & &>> $LOGFILE
 else
     log "mpd already running, will not start another instance"
 fi
 
- start the urxvt daemon
-if pgrep urxvtd >/dev/null 2>&1; then
-    log "urxvtd already running"
-else
-    log "starting urxvtd"
-    urxvtd -q -q -o
-fi
-
 log "starting zim in tray"
-zim --plugin trayicon
-
-log "starting conky clock on desktop"
-(sleep 3 && conky -c "$HOME/.conky/clock.conkyrc" &>> $LOGFILE) &
+zim --plugin trayicon & &>> $LOGFILE
 
 # start the pulseaudio volume control tray applet
 log "starting pasystray"
@@ -91,10 +80,19 @@ pasystray & &>> $LOGFILE
 log "starting dropboxd"
 nice -n 10 ionice -c 3 dropboxd & &>> $LOGFILE
 
+log "starting conky clock on desktop"
+{   
+    sleep 1
+    conky -c "$HOME/.conky/clock.conkyrc"
+} & &>> $LOGFILE
+
 # start the wallpaper changer
 log "starting $path_wallchanger"
-$path_wallchanger "$wallpaper_directory" "$wallpaper_interval" "$wallpaper_fallback" &
-echo $! > "$wallchanger_pidfile"
+{ 
+    sleep 0
+    $path_wallchanger "$wallpaper_directory" "$wallpaper_interval" "$wallpaper_fallback" &
+    echo $! > "$wallchanger_pidfile" 
+} & &>> $LOGFILE
 
 # start redshift
 log "starting redshift-gtk"
@@ -108,12 +106,21 @@ setxkbmap -layout "$keyboard_layout" -variant "$keyboard_variant" & &>> $LOGFILE
 log "setting key repeat delay"
 xset r rate "$keyboard_repeat_delay" "$keyboard_repeat_speed" & &>> $LOGFILE
 
+log "starting alarm clock applet"
+alarm-clock-applet --hidden & &>> $LOGFILE
+
+log "starting composite manager"
+xcompmgr & &>> $LOGFILE
+
+log "starting network tray application"
+nm-applet & &>> $LOGFILE
+
 # disable auto screen disable
-xset -dpms
-xset s off
+xset -dpms & &>> $LOGFILE
+xset s off & &>> $LOGFILE
 
 # execute the host-specific .xinitrc-addition
-hostfile="$HOME/.xinitrc.d/$(hostname).xinitrc"
+hostfile="$HOME/.xinitrc.d/$(hostname --short).xinitrc"
 log "looking for host specific xinitrc addition at $hostfile"
 if [[ -f "$hostfile" ]] ; then
     log "found it. executing"
@@ -124,7 +131,7 @@ fi
 
 if [[ -f ~/.Xresources ]] ; then
     log "found ~/.Xresources, merging it into xrdb"
-    xrdb -merge ~/.Xresources & &>> $LOGFILE
+    xrdb -merge ~/.Xresources &>> $LOGFILE
 else
     log "~/.Xresources not found"
 fi