X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=setup.sh;h=6a26b0486cc2d865355c9d1c21e78d14e8050af8;hb=e4417dd84069be88e22e300d15dfda22875a4cff;hp=df9b80e4c31fbbccbe297aa5cd47629f6b170fb0;hpb=19d6b23933ad68c37e0098f93da4afdbe153e532;p=config%2Fdotfiles.git

diff --git a/setup.sh b/setup.sh
index df9b80e..6a26b04 100755
--- a/setup.sh
+++ b/setup.sh
@@ -18,7 +18,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-set -e
+set -eu
 
 . ../lib.sh
 
@@ -29,12 +29,15 @@ 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 Xdefaults .in perl -ne \
+    generate Xresources .in perl -ne \
         'if (/^Term/) {
              s/^Term//;
              print "XTerm", $_;
@@ -47,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
@@ -62,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