X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=setup.sh;h=d68dd723eab3ab5afe32a6de80599115e5e0a30e;hb=b71680c55e6e492ed008f8ec5af3bf169b272f09;hp=eb7e8c2c6fe82be31e51f5afed3a3d338be166ee;hpb=b8aeb26b122396eb294e39daba2ed7bad6cc33b8;p=config%2Fdotfiles.git

diff --git a/setup.sh b/setup.sh
index eb7e8c2..d68dd72 100755
--- a/setup.sh
+++ b/setup.sh
@@ -62,11 +62,9 @@ if installed X; then
 
     if test ! "x`os`" = xdarwin; then
         link xinitrc ~/.xinitrc
-        # lightdm doesn't use ~/.xinitrc but ~/.xprofile instead. Assume it's
-        # used when the lightdm configuration file is present.
-        if test -f "$HOME/.dmrc"; then
-            link xinitrc ~/.xprofile
-        fi
+        # Most display managers use ~/.xsession instead of ~/.xinitrc (which
+        # is used by e.g. startx). Provide both links.
+        link xinitrc ~/.xsession
     fi
     if test -f xinitrc.local; then
         link xinitrc.local ~/.xinitrc.local
@@ -74,6 +72,8 @@ if installed X; then
     link xmodmaprc ~/.xmodmaprc
     link Xresources ~/.Xresources
     link XCompose ~/.XCompose
+
+    link bin/xlockscreen ~/.xlockscreen
 fi
 
 if installed xpdf; then