X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=xinitrc;h=4b578b34114125eeec47694e2b3995e033022dde;hb=fc5150bac7ea4702267bc4355e36322c4300d499;hp=6a9025463be38986c376bbbf6286dd8c1cdfba6c;hpb=fa4563d99b4605820c6e8e882632a400a8475a01;p=config%2Fdotfiles.git diff --git a/xinitrc b/xinitrc old mode 100644 new mode 100755 index 6a90254..4b578b3 --- a/xinitrc +++ b/xinitrc @@ -1,15 +1,35 @@ +#!/bin/sh + # startx configuration file. # Use a black background for the root window. xsetroot -solid black +# Force English keyboard layout. +if [ -x /usr/bin/setxkbmap ]; then + setxkbmap us +fi + # Use my X11 key bindings. xmodmap ~/.xmodmaprc # Change the background if available. if [ -f ~/.background ]; then - hsetroot -full ~/.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.