#!/bin/sh
#freetemp

userresources=$HOME/.Xresources
usermodmap=$HOME/.Xmodmap
sysresources=/usr/X11R6/lib/X11/xinit/.Xresources
sysmodmap=/usr/lib/X11/etc/xmodmap.std

# merge in defaults and keymaps

if [ -f $sysresources ]; then
    xrdb -merge $sysresources &
fi

if [ -f $sysmodmap ]; then
    /usr/X11R6/bin/xmodmap $sysmodmap &
fi

if [ -f $userresources ]; then
    xrdb -merge $userresources &
fi

if [ -f $usermodmap ]; then
    /usr/X11R6/bin/xmodmap $usermodmap &
fi

# Start the stuff that I want started depending on what box I am loggin in to
HOSTNAME=$(hostname -s)
export SSH_ASKPASS="/usr/bin/x11-ssh-askpass"
#exec ssh-agent $HOME/.xinit.usr.$HOSTNAME
#eval $(gnome-keyring-daemon --login --daemonize --components=pkcs11,secrets < /dev/null)
#export GNOME_KEYRING_CONTROL GNOME_KEYRING_PID
exec dbus-launch $HOME/.xinit.usr.$HOSTNAME