X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=setup.sh;h=6f35e221feff17abaedd358ed1c29372f9f81c48;hb=1cd38c8dac0b5a26375788bb7ffe5e7a18945fa2;hp=6506171c57ef5625d06f0e578fe216a977323812;hpb=b7b3a93d3974a9f722108dfa4a8c7126e6dd716a;p=config%2Fdotfiles.git

diff --git a/setup.sh b/setup.sh
index 6506171..6f35e22 100755
--- a/setup.sh
+++ b/setup.sh
@@ -22,18 +22,22 @@ set -e
 
 . ../lib.sh
 
+
 if installed stumpwm; then
     link stumpwmrc ~/.stumpwmrc
 fi
 if installed xmonad; then
     link xmonad ~/.xmonad
 fi
+if installed herbstluftwm; then
+    link herbstluftwm ~/.config/herbstluftwm
+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.
-    generate perl Xdefaults -ne \
+    generate Xresources .in perl -ne \
         'if (/^Term/) {
              s/^Term//;
              print "XTerm", $_;
@@ -46,8 +50,15 @@ if installed X; then
          } else {
              print $_;
          }'
-    # Xdefaults uses ! as comment instead of #.
-    sed_i 's/^#/!/' Xdefaults
+    # Xresources uses ! as comment instead of #.
+    sed_i 's/^#/!/' Xresources
+    # Use urxvt's pseudo-transparency if neither compton nor xcompmgr are
+    # available. Better than nothing.
+    if ! installed compton && ! installed xcompmgr; then
+        echo 'Xresources: no compton found, enabling pseudo-transparency'
+        sed_i 's/^Rxvt\*background/!&/' Xresources
+        sed_i 's/^!NO_COMPTON //' Xresources
+    fi
 
     if test ! "x`os`" = xdarwin; then
         link xinitrc ~/.xinitrc
@@ -61,7 +72,7 @@ if installed X; then
         link xinitrc.local ~/.xinitrc.local
     fi
     link xmodmaprc ~/.xmodmaprc
-    link Xdefaults ~/.Xdefaults
+    link Xresources ~/.Xresources
     link XCompose ~/.XCompose
 fi