add autostart.sh dependency to git

diff --git a/desktop-20-autostart.sh b/desktop-20-autostart.sh
new file mode 100755 (executable)
index 0000000..66b7607
--- /dev/null
+++ b/desktop-20-autostart.sh
@@ -0,0 +1,38 @@
+#!/bin/bash -l
+
+# first 2 alternatives showed under ubuntu 14.04, second 2 under arch at 11/2015
+
+right_monitor_rotation=left
+if [[ $1 ]]; then
+    right_monitor_rotation=normal
+fi
+
+
+xout="$(xrandr)"
+xe() { echo "$xout"; }
+x=$(xe | grep -E '^(DisplayPort-[0123]|DVI-0|DP-[1234]|DVI-I-1) connected' | wc -l)
+if (( x > 2 )); then
+    left=$(xe | sed -rn 's/^(DVI[^ ]+) connected .*/\1/p')
+    dps=( $(xe | sed -rn 's/^(DP-[01234]|DisplayPort-[01234]) connected .*/\1/p') )
+
+    middle=${dps[1]}
+    right=${dps[0]}
+    # on older distros, i needed to swap middle and right.
+
+
+    xrandr --output $left --mode 2560x1600 --pos 0x0 --rotate left \
+           --output $middle --mode 2560x1600 --pos 1600x0 --rotate left \
+           --output $right --mode 2560x1600 --pos 3200x0 --rotate $right_monitor_rotation
+elif (( x == 2 )); then
+    # 3rd monitor not working atm, so doing this.
+    left=$(xe | sed -rn 's/^(DVI[^ ]+) connected .*/\1/p')
+    middle=$(xe | sed -rn 's/^(DP-[01234]|DisplayPort-[01234]) connected .*/\1/p')
+    xrandr --output $left --mode 2560x1600 --pos 0x0 --rotate left \
+           --output $middle --mode 2560x1600 --pos 1600x0 --rotate left
+
+fi
+/a/bin/input-setup.sh
+if isarch; then
+    pulseaudio --start
+fi
+date "+%A, %B %d, %r, %S seconds" > /tmp/desktop-20-autostart-log

diff --git a/distro-begin b/distro-begin
index ce7cbe3560d5c8b82ddd43a6cce86fc2d886784a..921464ced28e43875b4c940c9b8e5cb28a699acf 100755 (executable)
--- a/distro-begin
+++ b/distro-begin
@@ -734,11 +734,11 @@ if has_x; then
             dir=/etc/gdm
         fi
         s mkdir -p $dir/PostLogin
-        s command cp /a/bin/desktop-20-autostart.sh $dir/PostLogin/Default
+        s command cp /a/bin/distro-setup/desktop-20-autostart.sh $dir/PostLogin/Default
         s mkdir /etc/lightdm/lightdm.conf.d
         s dd of=/etc/lightdm/lightdm.conf.d/12-ian.conf <<'EOF'
 [SeatDefaults]
-session-setup-script=/a/bin/desktop-20-autostart.sh
+session-setup-script=/a/bin/distro-setup/desktop-20-autostart.sh
 EOF
     fi
 
@@ -765,7 +765,11 @@ EOF
         for homedir in /home/*; do
             cp /etc/X11/xinit/xinitrc $homedir/.xinitrc
             sed -ri '/^ *twm\b/,$d' $homedir/.xinitrc
-            echo "source /a/bin/xinitrc" | tee -a $homedir/.xinitrc
+            tee -a $homedir/.xinitrc <<'EOF'
+/a/bin/desktop-20-autostart.sh
+xsetroot -cursor_name left_ptr
+exec xmonad
+EOF
         done
     else
         pi suckless-tools