summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.vimrc2
-rw-r--r--.xinitrc7
2 files changed, 5 insertions, 4 deletions
diff --git a/.vimrc b/.vimrc
index ebff2d3..94a77db 100644
--- a/.vimrc
+++ b/.vimrc
@@ -7,7 +7,7 @@ set nocompatible
set encoding=utf-8 " unicode encoding
set t_Co=256
set nobackup
-set expandtab
+set noexpandtab
set tabstop=2
set shiftwidth=2
set softtabstop=2
diff --git a/.xinitrc b/.xinitrc
index ac23fff..12a024d 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -11,14 +11,15 @@ source $HOME/bin/gpg-agent.sh
# autostart entries
#xcompmgr &
xbindkeys &
+xmodmap -e "remove lock = Caps_Lock" &
urxvtd -o -f -q
xautolock -nowlocker $HOME/bin/screen-locker.sh -locker $HOME/bin/screen-locker.sh -time 5 &
#sh $HOME/bin/irssi_notify.sh & #broken
chat_terminal () {
- urxvt -g 125x+45+0+0 -e ssh mistral
+ 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'
+ urxvt -g 90x+5+1226+991 -e ssh mistral 'tail -f .irssi/fnotify' &
}
autostart () {
@@ -26,11 +27,11 @@ autostart () {
conky -c "$f" &
done
gajim &
+ /opt/Samsung/SmartPanel/bin/smartpanel &
#urxvtc -e $HOME/bin/screen.sh 2 &
chat_terminal &
ossxmix -b & # also in ~/bin/suspend-resume.sh
thunderbird &
- thunar --daemon &
stalonetray -w -p &
#(sleep 3 && pypanel) &
#xfce4-panel &