From 2176a208358a430e7ee241dcc9fba6e04fea679e Mon Sep 17 00:00:00 2001
From: Florian Pritz <bluewind@server-speed.net>
Date: Fri, 18 Mar 2011 15:25:53 +0100
Subject: misc changes

Signed-off-by: Florian Pritz <bluewind@server-speed.net>
---
 .xinitrc | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to '.xinitrc')

diff --git a/.xinitrc b/.xinitrc
index 99b4aa7..7f132d2 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -4,11 +4,12 @@ cd $HOME
 # I don't like no background ;)
 dash $HOME/.fehbg &
 
-numlockx &
+numlockx
 xset r rate 250 50 & # also in ~/bin/suspend-resume.sh
 source $HOME/bin/gpg-agent.sh
 
 # autostart entries
+setxkbmap de nodeadkeys
 xbindkeys &
 xmodmap ~/.xmodmaprc &
 urxvtd -o -f -q 
@@ -16,13 +17,16 @@ xautolock -nowlocker $HOME/bin/screen-locker.sh -locker $HOME/bin/screen-locker.
 
 autostart () {
   sh $HOME/bin/irssi_notify.sh < /dev/null & # also in ~/bin/suspend-resume.sh
-  urxvtc -g 125x+45+1166+0 -e ssh mistral &
-  urxvtc -g 125x+45+1920+0 -e ssh karif &
+  urxvt -g 125x+45+1166+0 -e ssh mistral &
+  urxvt -g 125x+45+1920+0 -e ssh karif &
   stalonetray --dockapp-mode -p --kludges force_icons_size &
-  lxpanel &
+#  lxpanel &
   for f in $XDG_CONFIG_HOME/conky/*; do
     conky -c "$f" &
   done
+  keepassx&
+  transmission-qt &
+#  psi &
   gajim &
 #  /opt/Samsung/SmartPanel/bin/smartpanel &
 #  ossxmix -b & # also in ~/bin/suspend-resume.sh
@@ -38,7 +42,7 @@ autostart () {
 # WM
 case "$1" in
   awesome|i3)
-    ck-launch-session i3 &
+    ck-launch-session i3 --force-xinerama &
     sleep 1
     autostart &
   ;;
@@ -50,7 +54,7 @@ case "$1" in
   console)
     ck-launch-session openbox &
     sleep 1
-    urxvtc &
+    urxvt &
   ;;
   *|openbox) 
     ck-launch-session openbox &
-- 
cgit v1.2.3-24-g4f1b