--- /dev/null
+/usr/lib/policykit-1-gnome/polkit-gnome-authentication-agent-1 &
+
+/usr/lib/notify-osd/notify-osd &
+bluetooth-applet &
+gnome-power-manager &
+xscreensaver &
+volumeicon &
+system-config-printer-applet &
+thunar --daemon &
+xcompmgr -n -f -D5 &
+tint2 &
+conky &
+clipit &
+sparkleshare restart &
+
+[ $(pgrep -c offlineimap) = 1 ] || tmux new-session -d -s offlineimap offlineimap &
+
+if egrep -iq 'touchpad|click-pad' /proc/bus/input/devices; then
+ synclient VertEdgeScroll=1 &
+ synclient TapButton1=1 &
+ syndaemon -i0.2 -d &
+fi
+
+# vim:ft=sh
+++ /dev/null
-# Run the system-wide support stuff
-#. $GLOBALAUTOSTART
-
-#eval `dbus-launch --sh-syntax --exit-with-session`
-eval `gnome-keyring-daemon --start --components=pkcs11,secrets,ssh,gpg`
-export GPG_AGENT_INFO
-/usr/lib/policykit-1-gnome/polkit-gnome-authentication-agent-1 &
-
-/usr/lib/notify-osd/notify-osd &
-bluetooth-applet &
-gnome-power-manager &
-xscreensaver &
-volumeicon &
-system-config-printer-applet &
-thunar --daemon &
-xcompmgr -n -f -D5 &
-#nm-applet &
-tint2 &
-conky &
-clipit &
-sparkleshare restart &
-[ $(pgrep -c offlineimap) = 1 ] || tmux new-session -d -s offlineimap offlineimap &
-
-if egrep -iq 'touchpad|click-pad' /proc/bus/input/devices; then
- synclient VertEdgeScroll=1 &
- synclient TapButton1=1 &
- syndaemon -i0.2 -d &
-fi