projects
/
grml-etc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
/etc/skel/.xinitrc: adjust font in osd_cat command
[grml-etc.git]
/
etc
/
skel
/
.xinitrc
diff --git
a/etc/skel/.xinitrc
b/etc/skel/.xinitrc
index
777015f
..
8b5938d
100755
(executable)
--- a/
etc/skel/.xinitrc
+++ b/
etc/skel/.xinitrc
@@
-4,11
+4,10
@@
# 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]
################################################################################
################################################################################
-# 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
@@
-20,7
+19,7
@@
# print info text
if [ -x /usr/bin/osd_cat ] ; then
echo "Starting X window system and loading window manager..." | \
# print info text
if [ -x /usr/bin/osd_cat ] ; then
echo "Starting X window system and loading window manager..." | \
- osd_cat -c white -A center -p middle -f "-misc-fixed-medium-r-normal-*-
*
-150-*-*-c-*-iso8859-15" &
+ osd_cat -c white -A center -p middle -f "-misc-fixed-medium-r-normal-*-
15
-150-*-*-c-*-iso8859-15" &
fi
# add at least one entry to xauth
fi
# add at least one entry to xauth
@@
-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 #################################################################