projects
/
grml-etc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Drop cups directories from debian/dirs
[grml-etc.git]
/
etc
/
skel
/
.xinitrc
diff --git
a/etc/skel/.xinitrc
b/etc/skel/.xinitrc
index
777015f
..
7172324
100755
(executable)
--- a/
etc/skel/.xinitrc
+++ b/
etc/skel/.xinitrc
@@
-4,11
+4,11
@@
# Authors: grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
# Bug-Reports: see http://grml.org/bugs/
# License: This file is licensed under the GPL v2.
# Authors: grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
# Bug-Reports: see http://grml.org/bugs/
# License: This file is licensed under the GPL v2.
-# Latest change: Die
Nov 14 13:32:00 CET 2006
[mika]
+# Latest change: Die
Sep 04 01:42:40 CEST 2007
[mika]
################################################################################
################################################################################
-# is something goes wrong fall back to plain x
term
:
-# failsafe="x
term
-ls -T failsafe -geometry 80x24-0-0"
+# is something goes wrong fall back to plain x
-terminal-emulator
:
+# failsafe="x
-terminal-emulator
-ls -T failsafe -geometry 80x24-0-0"
# trap "exec $failsafe" EXIT 1 2 13 15
# set wallpaper
# trap "exec $failsafe" EXIT 1 2 13 15
# set wallpaper
@@
-44,11
+44,19
@@
[ -r $HOME/.Xresources ] && xrdb -merge $HOME/.Xresources
# keybindings
[ -r $HOME/.Xresources ] && xrdb -merge $HOME/.Xresources
# keybindings
- . /etc/sysconfig/keyboard && \
- if [ $XKEYBOARD == "us" ] ; then
- [ -r $HOME/.Xmodmap ] && xmodmap $HOME/.Xmodmap
+ if ! [ -r /etc/sysconfig/keyboard ] ; then
+ [ -r $HOME/.Xmodmap ] && xmodmap $HOME/.Xmodmap || setxkbmap us
else
else
- setxkbmap "$XKEYBOARD"
+ . /etc/sysconfig/keyboard
+ if [ $XKEYBOARD == "us" ] ; then
+ [ -r $HOME/.Xmodmap ] && xmodmap $HOME/.Xmodmap
+ else
+ if [ -n "$XKEYMODEL" ] ; then
+ setxkbmap -model "$XKEYMODEL" -layout "$XKEYBOARD"
+ else
+ setxkbmap "$XKEYBOARD"
+ fi
+ fi
fi
# mouse for lefty:
fi
# mouse for lefty: