X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=xinitrc;h=7d3fdc697113c459e97975df1d945ab6b52d7e5f;hb=80ec2902478cf11da5737951f104f55918837dd7;hp=1c586bc66db0ae9197581f5d7860db637b70e3df;hpb=1727213ce076b43f51d004c97e04361c50d05cb5;p=config%2Fdotfiles.git

diff --git a/xinitrc b/xinitrc
old mode 100644
new mode 100755
index 1c586bc..7d3fdc6
--- a/xinitrc
+++ b/xinitrc
@@ -1,13 +1,61 @@
+#!/bin/sh
+
 # startx configuration file.
 
+# Copyright (C) 2011-2012  Simon Ruderich
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+# 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
 
+# Force English keyboard layout.
+if [ -x /usr/bin/setxkbmap ]; then
+    setxkbmap us
+fi
+
 # Use my X11 key bindings.
 xmodmap ~/.xmodmaprc
 
-# Start stumpwm.
-exec stumpwm
+# Change the background if available.
+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
+    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
 
 # vim: ft=sh