X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/16ee7a8cf7ca905c30344f53f207e3d73b4d5351..b8e1fad6b2b0f576cf7c3875ee3d352bbab88940:/dot/xinitrc

diff --git a/dot/xinitrc b/dot/xinitrc
index f29eddd..151b9a4 100755
--- a/dot/xinitrc
+++ b/dot/xinitrc
@@ -87,15 +87,12 @@ initialize () {
   run init xrdb -override $HOME/.Xdefaults
 
   ## Random xsettery.
-  run init xset b 10 2000 50
+  run init xset b 5 2000 50
   run init xset r rate 500 50
   run init xset m 2 1
 
   ## Key mappings.
   xmodmap -e 'keysym BackSpace = BackSpace BackSpace'
-
-  ## Gnome settings.
-  case $vnc in no) run bginit gnome-settings-daemon ;; esac
 }
 
 ###--------------------------------------------------------------------------
@@ -113,11 +110,11 @@ start-e16 () {
   run bginit $wm $wmopts
   win=nil
   for i in $(seq 10); do
+    sleep 1
     if eesh version >/dev/null 2>&1; then
       win=t
       break
     fi
-    sleep 1
   done
   case $win in
     t)
@@ -147,29 +144,8 @@ start-window-manager () {
 start-clients-local () { :; }
 
 start-clients () {
-  ## Mail notification.
-  run bginit mail-notification
-
-  ## Policykit authentication agent.
-  agent=/usr/lib/policykit-1-gnome/polkit-gnome-authentication-agent-1
-  if [ -x $agent ]; then run bginit $agent; fi
-
-  ## System monitor.
-  case $vnc in no) run bginit gkrellm ;; esac
-
-  ## Screensaver.
-  case $vnc in
-    no)
-      run init xscreensaver-command -exit
-      run bginit xscreensaver -no-splash
-      ;;
-  esac
-
-  ## Panel.
-  case $vnc in no) run bginit gnome-panel ;; esac
-
-  ## System tray.
-  ## run bginit stalonetray
+  ## Gnome session.
+  case $vnc in no) run bginit gnome-session ;; esac
 
   ## Local clients.
   start-clients-local
@@ -336,7 +312,7 @@ EOF
 	eval "${line#!}"
 	;;
       *)
-        set -- $line
+	set -- $line
 	run bgclients "$@"
 	;;
     esac