Upgrade to openbox 3.5

diff --git a/autostart b/autostart
new file mode 100644 (file)
index 0000000..0f554ce
--- /dev/null
+++ b/autostart
@@ -0,0 +1,24 @@
+/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

diff --git a/autostart.sh b/autostart.sh
deleted file mode 100644 (file)
index f9cef88..0000000
--- a/autostart.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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

diff --git a/environment b/environment
new file mode 100644 (file)
index 0000000..3582855
--- /dev/null
+++ b/environment
@@ -0,0 +1,3 @@
+eval `gnome-keyring-daemon --start --components=pkcs11,secrets,gpg,ssh`
+
+# vim:ft=sh