Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

simplify keyboard-layouts= to a function of setxkbmap

  • Loading branch information...
commit 1011432169285904855285a25f4e71f034a725e4 1 parent 8e3ac74
@kaihendry kaihendry authored
View
8 etc/vim/vimrc.tiny
@@ -7,5 +7,13 @@
" Debian system-wide default configuration Vim
set runtimepath=~/.vim,/var/lib/vim/addons,/usr/share/vim/vimfiles,/usr/share/vim/vim72,/usr/share/vim/vimfiles/after,/var/lib/vim/addons/after,~/.vim/after
+set esckeys
+set bs=2
+set shiftwidth=4
+set softtabstop=4
+set tabstop=4
+set encoding=utf-8
+set showmatch
+set ruler
" vim: set ft=vim:
View
88 etc/webc/keyboard-configuration.sh
@@ -1,88 +0,0 @@
-#!/bin/sh
-# wget "http://live.debian.net/gitweb?p=live-config.git;a=blob_plain;f=scripts/config/015-keyboard-configuration"
-
-## live-config(7) - System Configuration Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
-##
-## live-config comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-## This is free software, and you are welcome to redistribute it
-## under certain conditions; see COPYING for details.
-
-
-Keyboard_configuration ()
-{
- # Checking if package is installed or already configured
- if [ ! -e /var/lib/dpkg/info/keyboard-configuration.list ] || \
- [ -e /var/lib/live/config/keyboard-configuration ]
- then
- return
- fi
-
- echo -n " keyboard-configuration"
-
- # Reading kernel command line
- for _PARAMETER in ${_CMDLINE}
- do
- case "${_PARAMETER}" in
- live-config.keyboard-layouts=*|keyboard-layouts=*)
- LIVE_KEYBOARD_LAYOUTS="${_PARAMETER#*keyboard-layouts=}"
- ;;
-
- live-config.keyboard-model=*|keyboard-model=*)
- LIVE_KEYBOARD_MODEL="${_PARAMETER#*keyboard-model=}"
- ;;
-
- live-config.keyboard-options=*|keyboard-options=*)
- LIVE_KEYBOARD_OPTIONS="${_PARAMETER#*keyboard-options=}"
- ;;
-
- live-config.keyboard-variant=*|keyboard-variant=*)
- LIVE_KEYBOARD_VARIANT="${_PARAMETER#*keyboard-variant=}"
- ;;
- esac
- done
-
- Configure_keyboard_configuration
-}
-
-Configure_keyboard_configuration ()
-{
- if [ -n "${LIVE_KEYBOARD_MODEL}" ]
- then
- echo "keyboard-configuration keyboard-configuration/modelcode select ${LIVE_KEYBOARD_MODEL}" >> /tmp/debconf.live
-
- sed -i -e "s|^XKBMODEL=.*$|XKBMODEL=\"${LIVE_KEYBOARD_MODEL}\"|" /etc/default/keyboard
- fi
-
- if [ -n "${LIVE_KEYBOARD_LAYOUTS}" ]
- then
- echo "keyboard-configuration keyboard-configuration/layoutcode select ${LIVE_KEYBOARD_LAYOUTS}" >> /tmp/debconf.live
-
- sed -i -e "s|^XKBLAYOUT=.*$|XKBLAYOUT=\"${LIVE_KEYBOARD_LAYOUTS}\"|" /etc/default/keyboard
- fi
-
- if [ -n "${LIVE_KEYBOARD_VARIANT}" ]
- then
- echo "keyboard-configuration keyboard-configuration/variantcode select ${LIVE_KEYBOARD_VARIANT}" >> /tmp/debconf.live
-
- sed -i -e "s|^XKBVARIANT=.*$|XKBVARIANT=\"${LIVE_KEYBOARD_VARIANT}\"|" /etc/default/keyboard
- fi
-
- if [ -n "${LIVE_KEYBOARD_OPTIONS}" ]
- then
- echo "keyboard-configuration keyboard-configuration/variantcode string ${LIVE_KEYBOARD_OPTIONS}" >> /tmp/debconf.live
-
- sed -i -e "s|^XKBOPTIONS=.*$|XKBOPTIONS=\"${LIVE_KEYBOARD_OPTIONS}\"|" /etc/default/keyboard
- fi
-
- if [ -e /tmp/debconf.live ]
- then
- debconf-set-selections < /tmp/debconf.live
- rm -f /tmp/debconf.live
-
- # Creating state file
- touch /var/lib/live/config/keyboard-configuration
- fi
-}
-
-Keyboard_configuration
View
5 etc/webc/live-config.sh
@@ -40,11 +40,6 @@ for x in $( cmdline ); do
done
;;
- keyboard-layouts=*)
- _CMDLINE="$x"
- /etc/webc/keyboard-configuration.sh
- ;;
-
homepage=*)
x=$(/bin/busybox httpd -d ${x#homepage=})
prefs="/etc/iceweasel/profile/prefs.js"
View
18 home/webc/.xinitrc
@@ -4,7 +4,7 @@
WEBCHOME=/home/webc
. "/etc/webc/webc.conf"
-logger xsession invoked
+logs xsession invoked
cmdline_has noroot || {
set -x
@@ -27,21 +27,31 @@ wm="/usr/bin/dwm.default"
for x in $(cmdline); do
case $x in
+
kioskresetstation=*) # For killing the browser after a number of minutes of idleness
exec /usr/bin/kioskresetstation ${x#kioskresetstation=} &
;;
+
noroot)
wm="/usr/bin/dwm.web"
;;
- compose)
- setxkbmap -option "compose:rwin"
- logs "Compose key setup"
+
+ xkb=*)
+ koptions=$( /bin/busybox httpd -d ${x#xkb=} )
+ if setxkbmap $koptions; then logs "setxkbmap OK $koptions"; else logs "setxkbmap ERR $koptions"; fi
;;
+
+ xrandr=*)
+ xoptions=$( /bin/busybox httpd -d ${x#xrandr=} )
+ if xrandr $xoptions; then logs "xrandr OK $xoptions"; else logs "xrandr ERR $xoptions"; fi
+ ;;
+
noblank)
logs "noblank"
xset s off
xset -dpms
;;
+
esac
done
Please sign in to comment.
Something went wrong with that request. Please try again.