From 163332ee2d5524abfd6d67fb83cfc4c6fc08082b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20K=C3=B6rber?= <hannes@hkoerber.de>
Date: Mon, 23 Jan 2017 16:59:05 +0100
Subject: [PATCH] Update autostart programs.

---
 autostart/autostart/20_screen.sh                         | 9 +++++++++
 .../autostart/{50_xresources.sh => 20_xresources.sh}     | 2 +-
 autostart/autostart/{50_keyboard.sh => 30_keyboard.sh}   | 4 ++--
 autostart/autostart/{50_synclient.sh => 30_touchpad.sh}  | 5 ++++-
 .../autostart/{50_wallchanger.sh => 40_wallpaper.sh}     | 2 +-
 autostart/autostart/50_mail.sh                           | 3 ---
 autostart/autostart/50_music.sh                          | 3 ---
 autostart/autostart/50_network.sh                        | 2 +-
 autostart/autostart/50_owncloud.sh                       | 4 ----
 autostart/autostart/50_pasystray.sh                      | 2 +-
 autostart/autostart/50_redshift.sh                       | 2 +-
 autostart/autostart/50_screen.sh                         | 9 ---------
 autostart/autostart/50_voip.sh                           | 4 ----
 autostart/autostart/50_xbindkeys.sh                      | 4 ----
 autostart/autostart/{50_irc.sh => 90_browser.sh}         | 2 +-
 autostart/autostart/{50_browser.sh => 90_mail.sh}        | 2 +-
 16 files changed, 22 insertions(+), 37 deletions(-)
 create mode 100755 autostart/autostart/20_screen.sh
 rename autostart/autostart/{50_xresources.sh => 20_xresources.sh} (56%)
 rename autostart/autostart/{50_keyboard.sh => 30_keyboard.sh} (73%)
 rename autostart/autostart/{50_synclient.sh => 30_touchpad.sh} (59%)
 rename autostart/autostart/{50_wallchanger.sh => 40_wallpaper.sh} (85%)
 delete mode 100755 autostart/autostart/50_mail.sh
 delete mode 100755 autostart/autostart/50_music.sh
 delete mode 100755 autostart/autostart/50_owncloud.sh
 delete mode 100755 autostart/autostart/50_screen.sh
 delete mode 100755 autostart/autostart/50_voip.sh
 delete mode 100755 autostart/autostart/50_xbindkeys.sh
 rename autostart/autostart/{50_irc.sh => 90_browser.sh} (52%)
 rename autostart/autostart/{50_browser.sh => 90_mail.sh} (60%)

diff --git a/autostart/autostart/20_screen.sh b/autostart/autostart/20_screen.sh
new file mode 100755
index 0000000..21c1906
--- /dev/null
+++ b/autostart/autostart/20_screen.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+printf '%s\n' "execute xautorandr" >>"$LOGFILE"
+
+xautorandr
+
+printf '%s\n' "disable screen blanking" >>"$LOGFILE"
+xset -dpms & &>> $LOGFILE
+xset s off & &>> $LOGFILE
diff --git a/autostart/autostart/50_xresources.sh b/autostart/autostart/20_xresources.sh
similarity index 56%
rename from autostart/autostart/50_xresources.sh
rename to autostart/autostart/20_xresources.sh
index cd9d844..e80cbed 100755
--- a/autostart/autostart/50_xresources.sh
+++ b/autostart/autostart/20_xresources.sh
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
-log "parsing .Xresources"
+printf '%s' "parsing .Xresources" >>"$LOGFILE"
 xrdb -merge ~/.Xresources &>> $LOGFILE
diff --git a/autostart/autostart/50_keyboard.sh b/autostart/autostart/30_keyboard.sh
similarity index 73%
rename from autostart/autostart/50_keyboard.sh
rename to autostart/autostart/30_keyboard.sh
index 3409955..a984270 100755
--- a/autostart/autostart/50_keyboard.sh
+++ b/autostart/autostart/30_keyboard.sh
@@ -5,8 +5,8 @@ keyboard_variant=nodeadkeys
 keyboard_repeat_delay=150
 keyboard_repeat_speed=50
 
-log "setting keyboard layout"
+printf '%s' "setting keyboard layout" >>"$LOGFILE"
 setxkbmap -layout "$keyboard_layout" -variant "$keyboard_variant" & &>> $LOGFILE
 
-log "setting key repeat delay"
+printf '%s' "setting key repeat delay" >>"$LOGFILE"
 xset r rate "$keyboard_repeat_delay" "$keyboard_repeat_speed" & &>> $LOGFILE
diff --git a/autostart/autostart/50_synclient.sh b/autostart/autostart/30_touchpad.sh
similarity index 59%
rename from autostart/autostart/50_synclient.sh
rename to autostart/autostart/30_touchpad.sh
index 4eaab76..c6860a3 100755
--- a/autostart/autostart/50_synclient.sh
+++ b/autostart/autostart/30_touchpad.sh
@@ -1,9 +1,12 @@
 #!/usr/bin/env bash
 
-log "configuring synclient"
+printf '%s' "configuring synclient" >>"$LOGFILE"
 synclient VertEdgeScroll=0
 synclient VertTwoFingerScroll=1
 synclient MaxSpeed=2.2
 synclient AccelFactor=0.08
 synclient TapButton1=1
 synclient CoastingSpeed=0
+synclient PalmDetect=1
+synclient PalmMinWidth=20
+synclient PalmMinZ=180
diff --git a/autostart/autostart/50_wallchanger.sh b/autostart/autostart/40_wallpaper.sh
similarity index 85%
rename from autostart/autostart/50_wallchanger.sh
rename to autostart/autostart/40_wallpaper.sh
index c83ecb1..c8e8299 100755
--- a/autostart/autostart/50_wallchanger.sh
+++ b/autostart/autostart/40_wallpaper.sh
@@ -5,7 +5,7 @@ wallchanger_pidfile="$RUNDIR/wallchanger.${XDG_SESSION_ID}.pid"
 wallpaper_logfile="$LOGDIR/wallpaper.log"
 wallpaper_interval="10800"
 
-log "starting $path_wallchanger"
+printf '%s' "starting $path_wallchanger" >>"$LOGFILE"
 {
     wallchanger "$wallpaper_directory" "$wallpaper_interval" &
     echo $! > "$wallchanger_pidfile"
diff --git a/autostart/autostart/50_mail.sh b/autostart/autostart/50_mail.sh
deleted file mode 100755
index 033a188..0000000
--- a/autostart/autostart/50_mail.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-thunderbird &
diff --git a/autostart/autostart/50_music.sh b/autostart/autostart/50_music.sh
deleted file mode 100755
index 1283c84..0000000
--- a/autostart/autostart/50_music.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-chromium --app=https://subsonic.app.lab.haktec.de/index.view &
diff --git a/autostart/autostart/50_network.sh b/autostart/autostart/50_network.sh
index 7b6483b..78ec1b6 100755
--- a/autostart/autostart/50_network.sh
+++ b/autostart/autostart/50_network.sh
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
-log "starting network tray application"
+printf '%s' "starting network tray application" >>"$LOGFILE"
 nm-applet & &>> $LOGFILE
diff --git a/autostart/autostart/50_owncloud.sh b/autostart/autostart/50_owncloud.sh
deleted file mode 100755
index 4da9523..0000000
--- a/autostart/autostart/50_owncloud.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-log "starting owncloud client"
-owncloud & &>> $LOGFILE
diff --git a/autostart/autostart/50_pasystray.sh b/autostart/autostart/50_pasystray.sh
index 29438ff..8487958 100755
--- a/autostart/autostart/50_pasystray.sh
+++ b/autostart/autostart/50_pasystray.sh
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
-log "starting pasystray"
+printf '%s' "starting pasystray" >>"$LOGFILE"
 pasystray & &>> $LOGFILE
diff --git a/autostart/autostart/50_redshift.sh b/autostart/autostart/50_redshift.sh
index a29af55..fd5cc43 100755
--- a/autostart/autostart/50_redshift.sh
+++ b/autostart/autostart/50_redshift.sh
@@ -4,6 +4,6 @@
 redshift_lat_long="49.5:11"
 redshift_colortemp="6000:3300"
 
-log "starting redshift-gtk"
+printf '%s' "starting redshift-gtk" >>"$LOGFILE"
 redshift-gtk -b 1 -l "$redshift_lat_long" -t "$redshift_colortemp" & &>> "$LOGFILE"
 printf '%s' $! > "$RUNDIR"/redshift.${XDG_SESSION_ID}.pid
diff --git a/autostart/autostart/50_screen.sh b/autostart/autostart/50_screen.sh
deleted file mode 100755
index b4bf8f1..0000000
--- a/autostart/autostart/50_screen.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-
-log "execute xautorandr"
-
-xautorandr
-
-log "disable screen blanking"
-xset -dpms & &>> $LOGFILE
-xset s off & &>> $LOGFILE
diff --git a/autostart/autostart/50_voip.sh b/autostart/autostart/50_voip.sh
deleted file mode 100755
index 6da2f0b..0000000
--- a/autostart/autostart/50_voip.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-mumble &
-teamspeak3 &
diff --git a/autostart/autostart/50_xbindkeys.sh b/autostart/autostart/50_xbindkeys.sh
deleted file mode 100755
index 42b4235..0000000
--- a/autostart/autostart/50_xbindkeys.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-log "starting xbindkeys"
-xbindkeys
diff --git a/autostart/autostart/50_irc.sh b/autostart/autostart/90_browser.sh
similarity index 52%
rename from autostart/autostart/50_irc.sh
rename to autostart/autostart/90_browser.sh
index 64cdcfb..8eb7b04 100755
--- a/autostart/autostart/50_irc.sh
+++ b/autostart/autostart/90_browser.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-quasselclient &
+chromium-browser &
diff --git a/autostart/autostart/50_browser.sh b/autostart/autostart/90_mail.sh
similarity index 60%
rename from autostart/autostart/50_browser.sh
rename to autostart/autostart/90_mail.sh
index cfe570c..d6e21ea 100755
--- a/autostart/autostart/50_browser.sh
+++ b/autostart/autostart/90_mail.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-qutebrowser &
+evolution &