X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/8ab9747e4a9942d928af6ccb9d6ead42ad5b13ea..c035e794d622d7074c8fa94e18cb5ddfea7c36a1:/dot/xinitrc?ds=sidebyside diff --git a/dot/xinitrc b/dot/xinitrc index 3ae854b..151b9a4 100755 --- a/dot/xinitrc +++ b/dot/xinitrc @@ -93,9 +93,6 @@ initialize () { ## Key mappings. xmodmap -e 'keysym BackSpace = BackSpace BackSpace' - - ## Gnome settings. - case $vnc in no) run bginit gnome-settings-daemon ;; esac } ###-------------------------------------------------------------------------- @@ -146,41 +143,9 @@ start-window-manager () { start-clients-local () { :; } -scsv=$(pick_program screensaver gnome-screensaver xscreensaver) -case $scsv in - xscreensaver) - scsvopts="-no-splash" - ;; - *) - scsvopts="" - ;; -esac - start-clients () { - ## Mail notification. - run bginit mail-notification - - ## Gnome session. With great reluctance. At least it doesn't actually do - ## anything. - run bginit gnome-session - - ## 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 $scsv $scsvopts - ;; - esac - - ## Panel. - case $vnc in no) run bginit gnome-panel ;; esac + ## Gnome session. + case $vnc in no) run bginit gnome-session ;; esac ## Local clients. start-clients-local