X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=setup.sh;h=a93d357ec98934b346283c3558fd2385f7738517;hb=d0c74d35e6fc5c9e22592bf0b2ab6ab8337d3aa1;hp=be55e5252c2bb3895717d395884cea72711d8d24;hpb=cfbe0fa5363aa36caa133e2387bafcb8eb3f7d56;p=config%2Fdotfiles.git

diff --git a/setup.sh b/setup.sh
index be55e52..a93d357 100755
--- a/setup.sh
+++ b/setup.sh
@@ -35,14 +35,13 @@ fi
 
 if installed X; then
     # Prevent code duplication. Term* rules are for all terminals; XTerm rules
-    # are for XTerm and UXTerm. At the moment XTerm, UXTerm and Rxvt are
-    # supported.
+    # are for XTerm and UXTerm.
     generate Xresources .in perl -ne \
         'if (/^Term/) {
              s/^Term//;
              print "XTerm", $_;
              print "UXTerm", $_;
-             print "Rxvt", $_;
+             print "URxvt", $_;
          } elsif (/^XTerm/) {
              print $_;
              s/^XTerm//;
@@ -62,11 +61,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,10 +71,10 @@ if installed X; then
     link xmodmaprc ~/.xmodmaprc
     link Xresources ~/.Xresources
     link XCompose ~/.XCompose
-fi
 
-if installed xscreensaver; then
-    link xscreensaver ~/.xscreensaver
+    link fonts ~/.fonts
+
+    link bin/xlockscreen ~/.xlockscreen
 fi
 
 if installed xpdf; then
@@ -87,6 +84,9 @@ if installed zathura; then
     mkdir -p ~/.config/zathura
     link zathurarc ~/.config/zathura/zathurarc
 fi
+if installed katarakt; then
+    link katarakt.ini ~/.config/katarakt.ini
+fi
 
 if installed feh; then
     mkdir -p ~/.config