# HG changeset patch
# User meillo@marmaro.de
# Date 1188936271 -7200
# Node ID 68dd6ae11835736ce97237121eb31e2aed8afca7
# Parent  4c1ead2dc501e2fed47d1438cd2c56a1721dc61e
lots of minor adjustments; some major things in bashrc & inputrc

diff -r 4c1ead2dc501 -r 68dd6ae11835 .Xresources
--- a/.Xresources	Wed Apr 25 20:42:44 2007 +0200
+++ b/.Xresources	Tue Sep 04 22:04:31 2007 +0200
@@ -73,4 +73,5 @@
 
 
 ! to divide urxvt and xterm apart
-xterm*background: #000000
+xterm*background: #111111
+xterm*font: -*-terminus-medium-*-*-*-14-*-*-*-*-*-*-*
diff -r 4c1ead2dc501 -r 68dd6ae11835 .bashrc
--- a/.bashrc	Wed Apr 25 20:42:44 2007 +0200
+++ b/.bashrc	Tue Sep 04 22:04:31 2007 +0200
@@ -18,6 +18,10 @@
 # enable colored ls output
 eval "`dircolors -b $HOME/.dircolorsrc`"
 
+# one history for all
+shopt -s histappend
+PROMPT_COMMAND='history -a'
+
 # command prompt
 PS1='\033[01;31m<\033[00m \h \033[01;31m|\033[00m \u \033[01;31m|\033[00m \w \033[01;31m>\033[00m\n    \$ '
 
@@ -34,20 +38,23 @@
 # aliases
 
 alias ls='ls -F --color=auto'
-
 alias ll='ls -lF'
 alias lh='ls -lhF'
 alias la='ls -AF'
 
 alias dh='df -h'
 
+# standard options
+alias cal='cal -m'
+alias xpdf='xpdf -z page'
+
+alias serveme='ssh meillo@192.168.0.100'
+
 alias du1='du -h --max-depth=1 --exclude=".?*" '  # -> shellscript instead of alias
 alias du2='du -h --max-depth=2 --exclude=".?*" '  # -> shellscript instead of alias
 
-alias serveme='ssh meillo@192.168.0.100'
-
-alias fireworks='wine /usr/share/Fireworks4/Fireworks\ 4.exe'
-alias stendhal='java -jar /home/meillo/Spiele/Stendhal/stendhal'
+#alias fireworks='wine /usr/share/Fireworks4/Fireworks\ 4.exe'
+#alias stendhal='java -jar /home/meillo/Spiele/Stendhal/stendhal'
 
 
 # vars
diff -r 4c1ead2dc501 -r 68dd6ae11835 .inputrc
--- a/.inputrc	Wed Apr 25 20:42:44 2007 +0200
+++ b/.inputrc	Tue Sep 04 22:04:31 2007 +0200
@@ -1,4 +1,11 @@
 "\e[5~": history-search-backward
 "\e[6~": history-search-forward
 
+"\M-s": menu-complete
+
+# perform history expansion on pressing space
+$if Bash
+  Space: magic-space
+$endif
+
 set bell-style=visual
diff -r 4c1ead2dc501 -r 68dd6ae11835 .screenrc
--- a/.screenrc	Wed Apr 25 20:42:44 2007 +0200
+++ b/.screenrc	Tue Sep 04 22:04:31 2007 +0200
@@ -11,14 +11,14 @@
 
 # startup programs
 
-screen -t ROOT su
+screen -t ROOT sudo su
 screen w3m marmaro.de
 screen -t bash bash
 
 
 # program bindings
 
-bind R screen -t ROOT 0 su
+bind R screen -t ROOT 0 sudo su
 bind M screen -t cplay 3 cplay -v
 bind I screen -t icq 4 centericq
 
@@ -27,7 +27,7 @@
 
 bind l windowlist -b
 bind - title
-bind n screen
+bind n screen 2
 bind o only
 bind s split
 
diff -r 4c1ead2dc501 -r 68dd6ae11835 .xinitrc
--- a/.xinitrc	Wed Apr 25 20:42:44 2007 +0200
+++ b/.xinitrc	Tue Sep 04 22:04:31 2007 +0200
@@ -2,7 +2,8 @@
 
 
 # turn off beeps (dont know if this really works)
-xset -b
+/usr/bin/xset -b
+/usr/bin/numlockx on
 
 # set multimedia keys and CAPS_LOCK as ESC
 /usr/bin/xmodmap $HOME/.xmodmaprc