projects
/
grml-etc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
.xinitrc: fix syntax of test for $XKEYBOARD
[grml-etc.git]
/
etc
/
skel
/
.xinitrc
diff --git
a/etc/skel/.xinitrc
b/etc/skel/.xinitrc
index
669521a
..
17c4052
100755
(executable)
--- a/
etc/skel/.xinitrc
+++ b/
etc/skel/.xinitrc
@@
-4,7
+4,6
@@
# 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: Sam Dez 16 16:45:54 CET 2006 [mika]
################################################################################
# is something goes wrong fall back to plain x-terminal-emulator:
################################################################################
# is something goes wrong fall back to plain x-terminal-emulator:
@@
-40,15
+39,27
@@
# other settings:
# xset m 20/10 4
# other settings:
# xset m 20/10 4
+# disable screensaver and dpms:
+# xset s off
+# xset -dpms
+
# xresources
[ -r $HOME/.Xresources ] && xrdb -merge $HOME/.Xresources
# keybindings
# xresources
[ -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:
@@
-60,6
+71,6
@@
[ -r /etc/grml_cd ] && grml-info &
# default entry, use e.g. 'grml-x windowmanager' for changing or just adjust manually
[ -r /etc/grml_cd ] && grml-info &
# default entry, use e.g. 'grml-x windowmanager' for changing or just adjust manually
- exec /usr/bin/
wm-ng
+ exec /usr/bin/
x-window-manager
## END OF FILE #################################################################
## END OF FILE #################################################################