Permalink
Browse files

Clean up .xsession

  • Loading branch information...
1 parent b032be9 commit 47ba3875d924a34d0deabac07f613495a5d7a060 @tpope committed Sep 13, 2011
Showing with 20 additions and 79 deletions.
  1. +20 −79 .xsession
View
@@ -1,112 +1,53 @@
#!/bin/sh
-# vim:set ft=sh et sw=4 sts=4:
+# vi: set et sw=2:
PATH="$HOME/bin:/usr/local/bin:/usr/bin/X11:/usr/bin:/bin:/usr/games"
[ -n "$ENV" ] || ENV="$HOME/.shrc"
. "$ENV"
-[ ! -x /bin/zsh ] || SHELL=/bin/zsh
unset STY
xsetroot -solid '#000420'
-
-hosts="gob michael lucille lindsay tobias buster"
-dpy=`echo ${DISPLAY:-':0.0'} | sed -e 's/localhost//'`
-if echo $dpy|grep '^:' >/dev/null; then
- hname=`hostname`
-else
- hname=`echo $dpy|cut -d: -f 1`
- dpy=":`echo $dpy|cut -d: -f 2`"
-fi
-echo "I believe $DISPLAY is actually $hname $dpy."
-
-if ! xauth list "$hname$dpy" >/dev/null; then
- echo "Warning: $hname$dpy not found in xauth list!" >&2
-fi
-
-if /sbin/ifconfig 2>/dev/null | grep '172\.28\.6' >/dev/null; then
- for host in $hosts; do
- xauth -i extract - $hname$dpy | ssh -axqoBatchmode=yes $host xauth merge - &
- done
-fi
-
xset r rate 600 30
xset b 40 440 60
-[ ! -f "$HOME/.xmodmap" ] || xmodmap "$HOME/.xmodmap"
-
-if [ ! -f "$HOME/.xmodmap" -a ! -f "$HOME/.Xmodmap" ] && \
- xmodmap 2>/dev/null|grep Super >/dev/null; then
- xmodmap -e "keysym Super_L = Hyper_L"
- xmodmap -e "keysym Caps_Lock = Super_L"
- xmodmap -e "keysym Scroll_Lock = Hyper_R Scroll_Lock"
- xmodmap -e "keysym Menu = Caps_Lock"
- xmodmap -e "clear lock"
- xmodmap -e "clear Mod4"
- xmodmap -e "clear Mod5"
- xmodmap -e "add lock = Caps_Lock"
- xmodmap -e "add Mod4 = Super_L Super_R"
- xmodmap -e "add Mod5 = Hyper_L Hyper_R"
+if [ -f "$HOME/.xmodmap" ]; then
+ xmodmap "$HOME/.xmodmap"
+else
+ xmodmap -e "keysym Caps_Lock = Control_L"
+ xmodmap -e "keysym Scroll_Lock = Caps_Lock Scroll_Lock"
+ xmodmap -e "clear control"
+ xmodmap -e "clear lock"
+ xmodmap -e "add lock = Caps_Lock"
+ xmodmap -e "add control = Control_L Control_R"
fi
-ESPEAKER="$hname"
-RPLAY_HOST="$hname"
-#WINDOW_MANAGER="fvwm2"
-export ESPEAKER RPLAY_HOST WINDOW_MANAGER
-
-hostname="`hostname|sed -e 's/[.].*//'`"
if [ ! -f "$HOME/. tpope" ]; then
- echo 'Performing an initial "tpope install"'
- tpope installer
+ echo 'Performing an initial "tpope install"'
+ tpope install
fi
tpope cron --login
-#xrdb -merge $HOME/.Xresources
-
-#[ ! -x /usr/bin/ssh-askpass ] || export SSH_ASKPASS=/usr/bin/ssh-askpass
-
if [ -x /usr/bin/ssh-agent -a -z "$SSH_AUTH_SOCK" ]; then
- sshagent="/usr/bin/ssh-agent --"
+ sshagent="/usr/bin/ssh-agent --"
fi
-[ ! -x /bin/pidof ] || [ -z "`pidof q-agent`" ] || kill `pidof q-agent`
-
-wait
-
if [ -x "`which xscreensaver 2>/dev/null`" ]; then
- nice -n 2 xscreensaver -no-splash >/dev/null 2>/dev/null &
- case "$hname$dpy" in tobias:0|lucille:0|lindsay:0|maeby:0|buster:0)
- (xscreensaver-command -watch|while read trash; do
- case "$trash" in
- BLANK*|LOCK*|UNBLANK*) tpope status check "$hname" ;;
- esac
- done
- ) >/dev/null 2>&1 & ;;
- esac
+ nice -n 2 xscreensaver -no-splash >/dev/null 2>/dev/null &
fi
-#[ ! -x "`which btcid-launch 2>/dev/null`" ] || btcid-launch
+
[ ! -x "`which unclutter 2>/dev/null`" ] || unclutter -idle 10 -noevents &
-[ ! -x "`which imwheel 2>/dev/null`" ] || imwheel -k -b 000067 2>/dev/null &
[ ! -x "`which pulseaudio 2>/dev/null`" ] || pulseaudio &
[ ! -x "`which bluetooth-applet 2>/dev/null`" ] || bluetooth-applet &
-[ ! -f "$HOME/.lircrc" ] || irexec &
-[ ! -f "$HOME/.lircrc" ] || irxevent &
-[ ! -x /usr/bin/q-agent ] || eval `/usr/bin/q-agent &`
-[ "$GPG_AGENT_INFO" -o -z "$AGENT_SOCKET" ] || export GPG_AGENT_INFO="$AGENT_SOCKET"
xsetroot -solid '#000840'
-tpope status rehash
+[ ! -f "$HOME/.xsession.local" ] || . "$HOME/.xsession.local"
-[ -f "$HOME/.xsession.local" ] && . "$HOME/.xsession.local"
-
-if [ -x /usr/bin/fvwm2 -a -x /usr/bin/gnome-session -a -x /usr/bin/gnome-control-center ] && fvwm2 --version >/dev/null 2>&1; then
- export WINDOW_MANAGER=fvwm2
- # exec $sshagent gnome-session
+if [ -n "$GNOME_FVWM" -a -x /usr/bin/fvwm2 -a -x /usr/bin/gnome-session -a -x /usr/bin/gnome-control-center ] && fvwm2 --version >/dev/null 2>&1; then
+ export WINDOW_MANAGER=fvwm2
+ exec $sshagent gnome-session
fi
for wm in fvwm2 icewm startkde fluxbox enlightenment mwm twm xterm; do
- [ -x "`which $wm 2>/dev/null`" ] && exec $sshagent $wm
+ [ -x "`which $wm 2>/dev/null`" ] && exec $sshagent $wm
done
-
-#echo "Could not launch a window manager. Aborting..." >&2
-#exit 1

0 comments on commit 47ba387

Please sign in to comment.