X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;ds=sidebyside;f=xinitrc;h=5c4c007cc49698b3fb00669ff4ad3e151f307f0c;hb=dafc5b646c2cfd179215e6581d4797354ccc17cb;hp=3429ac1fdf7719607a850bcb884896be637a09a5;hpb=6eac57b4e14e0adc61e1c04dff037837420711ed;p=config%2Fdotfiles.git diff --git a/xinitrc b/xinitrc index 3429ac1..5c4c007 100755 --- a/xinitrc +++ b/xinitrc @@ -3,6 +3,14 @@ # 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 + # -s to force bourne shell output. This file is a bourne shell script even + # if the environment might suggest otherwise. + eval `/usr/bin/ssh-agent -s` +fi + # Use a black background for the root window. xsetroot -solid black @@ -19,14 +27,19 @@ if [ -f ~/.background ]; then # 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 + 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