Update autostart

autostart/20_dunst.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+dunst &

autostart/20_screen.sh

@@ -1,12 +1,11 @@
 #!/usr/bin/env bash
 
-printf '%s\n' "execute xautorandr" >>"$LOGFILE"
+printf '%s\n' "start compton"
+compton --backend xrender --vsync opengl &
 
-xautorandr &
+printf '%s\n' "disable screen blanking"
+xset -dpms &
+xset s off &
 
-printf '%s\n' "start compton" >>"$LOGFILE"
-compton --backend glx --vsync opengl &
-
-printf '%s\n' "disable screen blanking" >>"$LOGFILE"
-xset -dpms & &>> $LOGFILE
-xset s off & &>> $LOGFILE
+printf '%s\n' "disable wakeup when lid switched"
+grep "^${ACPI_LID_NAME}.*enabled" /proc/acpi/wakeup && echo " ${ACPI_LID_NAME}" | sudo tee /proc/acpi/wakeup

autostart/20_xresources.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
-printf '%s' "parsing .Xresources" >>"$LOGFILE"
-xrdb -merge -I${HOME} ~/.Xresources &>> $LOGFILE
+printf '%s' "parsing .Xresources"
+xrdb -merge -I${HOME} ~/.Xresources

autostart/30_audio.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
-printf '%s' "starting pulseaudio" >>"$LOGFILE"
+printf '%s' "starting pulseaudio"
 pulseaudio --start

autostart/30_keyboard.sh

@@ -6,7 +6,7 @@ keyboard_repeat_delay=150
 keyboard_repeat_speed=50
 
 printf '%s' "setting keyboard layout" >>"$LOGFILE"
-setxkbmap -layout "$keyboard_layout" -variant "$keyboard_variant" & &>> $LOGFILE
+setxkbmap -layout "$keyboard_layout" -variant "$keyboard_variant" &
 
 printf '%s' "setting key repeat delay" >>"$LOGFILE"
-xset r rate "$keyboard_repeat_delay" "$keyboard_repeat_speed" & &>> $LOGFILE
+xset r rate "$keyboard_repeat_delay" "$keyboard_repeat_speed" &

autostart/30_touchpad.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-printf '%s' "configuring synclient" >>"$LOGFILE"
+printf '%s' "configuring synclient"
 synclient VertEdgeScroll=0
 synclient VertTwoFingerScroll=1
 synclient MaxSpeed=2.2

autostart/40_wallpaper.sh

@@ -2,9 +2,7 @@
 
 wallpaper="$LIBDIR/wallpaper/current"
 
-printf '%s' "setting wallpaper" >>"$LOGFILE"
-{
+printf '%s' "setting wallpaper"
 feh --bg-scale "${wallpaper}"
 sleep 10
 feh --bg-scale "${wallpaper}"
-} & &>> $LOGFILE

autostart/50_network.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
-printf '%s' "starting network tray application" >>"$LOGFILE"
-nm-applet & &>> $LOGFILE
+printf '%s' "starting network tray application"
+nm-applet &

autostart/50_pasystray.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
-printf '%s' "starting pasystray" >>"$LOGFILE"
-pasystray & &>> $LOGFILE
+printf '%s' "starting pasystray"
+pasystray &

autostart/50_redshift.sh

@@ -4,6 +4,6 @@
 redshift_lat_long="49.5:11"
 redshift_colortemp="6000:3300"
 
-printf '%s' "starting redshift-gtk" >>"$LOGFILE"
-redshift-gtk -b 1 -l "$redshift_lat_long" -t "$redshift_colortemp" & &>> "$LOGFILE"
+printf '%s' "starting redshift-gtk"
+redshift-gtk -b 1 -l "$redshift_lat_long" -t "$redshift_colortemp" &
 printf '%s' $! > "$RUNDIR"/redshift.${XDG_SESSION_ID}.pid

x/xinitrc

@@ -22,16 +22,20 @@ start_wm() {
 }
 
 autostart() {
-    if [[ -d "$HOME/.autostart" ]] ; then
+    if [ -d "$HOME/.autostart" ] ; then
         log "Looking for autostart files."
         for f in "$HOME/.autostart/"*.sh ; do
-            if [[ -x "$f" ]] ; then
+            if [ -x "$f" ] ; then
                 log "Executing autostart file \"$f\""
-                . "$f"
+                "$f" >>"${LOGFILE}" 2>&1
             fi
         done
     fi
 }
 
+exec >> "$LOGFILE" 2>&1
+set -x
+log "the"
 autostart
+log "fuck"
 start_wm

zsh/zprofile

@@ -41,6 +41,8 @@ export GOPATH=~/dev/go
 
 export PATH=$PATH:$(go env GOPATH)/bin
 
+export ACPI_LID_NAME=LID
+
 # Start the gpg-agent if not already running
 if ! pgrep -x --uid "${USER}" gpg-agent >/dev/null 2>&1; then
     eval $(gpg-agent --daemon --sh)