summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.xinitrc18
1 files changed, 7 insertions, 11 deletions
diff --git a/.xinitrc b/.xinitrc
index 5155818..df490ed 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -2,14 +2,13 @@
cd $HOME
# I don't like no background ;)
-sh $HOME/.fehbg &
+dash $HOME/.fehbg &
numlockx &
xset r rate 250 50 & # also in ~/bin/suspend-resume.sh
source $HOME/bin/gpg-agent.sh
# autostart entries
-#xcompmgr &
xbindkeys &
xmodmap -e "remove lock = Caps_Lock" &
urxvtd -o -f -q
@@ -18,8 +17,6 @@ sh $HOME/bin/irssi_notify.sh < /dev/null &
chat_terminal () {
urxvt -g 125x+45+1051+260 -e ssh mistral &
- # temp replacement for the notify script
- #urxvt -g 90x+5+1226+991 -e ssh mistral 'tail -f .irssi/fnotify' &
}
autostart () {
@@ -28,24 +25,23 @@ autostart () {
conky -c "$f" &
done
gajim &
- /opt/Samsung/SmartPanel/bin/smartpanel &
- #urxvtc -e $HOME/bin/screen.sh 2 &
chat_terminal &
+ /opt/Samsung/SmartPanel/bin/smartpanel &
ossxmix -b & # also in ~/bin/suspend-resume.sh
thunderbird &
- liferea &
+ liferea &
zim &
- blueman-applet &
+# blueman-applet &
}
# WM
case "$1" in
awesome)
- autostart
+ autostart &
exec ck-launch-session awesome
;;
twm)
- autostart
+ autostart &
exec ck-launch-session twm
;;
console)
@@ -53,7 +49,7 @@ case "$1" in
exec ck-launch-session dbus-launch openbox-session
;;
*|openbox)
- autostart
+ autostart &
exec ck-launch-session dbus-launch openbox-session
;;
esac