X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=xinitrc;h=475da6ed98a4c2e6143f6f7a2e25ecd21cd6a486;hb=de57a54e54230179017cdea80b8bed47c6042ce6;hp=5353d0a8ca429c822c3f442f2e071cd36c8f7e65;hpb=4cdb61d9e38e39c81051ba8519eb674503c31023;p=config%2Fdotfiles.git diff --git a/xinitrc b/xinitrc index 5353d0a..475da6e 100755 --- a/xinitrc +++ b/xinitrc @@ -3,6 +3,12 @@ # startx configuration file. +# Start ssh-agent if we have private keys, thanks to +# http://code.haskell.org/XMonadContrib/scripts/xinitrc (read on 2011-06-19). +if [ -x /usr/bin/ssh-agent -a -f "$HOME/.ssh/id_rsa" ]; then + eval `ssh-agent` +fi + # Use a black background for the root window. xsetroot -solid black @@ -16,13 +22,22 @@ xmodmap ~/.xmodmaprc # Change the background if available. if [ -f ~/.background ]; then - if [ -x /usr/bin/hsetroot ]; then - hsetroot -full ~/.background - elif [ -x /usr/bin/feh ]; then - feh --bg-scale ~/.background + # But not on slow machines in the university. + HOSTNAME=`hostname` + if [ "x`echo $HOSTNAME | grep faui0sr`" = x ]; then + if [ -x /usr/bin/hsetroot ]; then + hsetroot -full ~/.background + elif [ -x /usr/bin/feh ]; then + feh --bg-scale ~/.background + fi fi fi +# Display reminders. +if [ -x /usr/bin/remind -a -f ~/.reminders ]; then + remind -z1 -k'.shell/bin/notify.py %s &' ~/.reminders & +fi + # Start XMonad. xmonad