From 500270a8d8b8b3effab4e6be9bb3810f4bf6ab91 Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Sat, 6 Feb 2016 21:47:39 +0100
Subject: liveinit: better support for german localizations.

Based on feedback, use Scroll Lock instead of AltGr as the Compose Key.
Also, use 'de-latin1-nodeadkeys' instead of 'de-latin1' for console keyboard
layout, 'de_DE@euro' instead of 'de_DE.utf8' as language definition and
'nodeadkeys' as the X keyboard variant.
---
 languages | 2 +-
 liveinit  | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/languages b/languages
index 2baa558..b810107 100644
--- a/languages
+++ b/languages
@@ -2,7 +2,7 @@
 be:belgisch:be-latin1:Europe/Brussels:nl_BE.utf8:
 br:brazil:br-abnt2:America/Sao_Paulo:pt_BR.utf8:
 gb:british:uk:Etc/GMT:en_GB.utf8:
-de:deutsch:de-latin1:Europe/Berlin:de_DE.utf8:
+de:deutsch:de-latin1-nodeadkeys:Europe/Berlin:de_DE@euro:de,nodeadkeys
 de_ch:deutsch (schweiz):de-latin1:Europe/Zurich:de_CH.utf8:ch,
 es:espanol:es:Europe/Madrid:es_ES.utf8:
 fr:francais:fr-latin9:Europe/Paris:fr_FR.utf8:
diff --git a/liveinit b/liveinit
index 8b10fdc..809c9ed 100755
--- a/liveinit
+++ b/liveinit
@@ -502,7 +502,12 @@ EOT
     # You can set just the XkbVariant by adding something like "kbd=ch xkb=,fr"
     XKBLAYOUT=$(echo $XKB |cut -d, -f1)
     XKBVARIANT=$(echo $XKB |cut -d, -f2)
-    XKBOPTIONS="compose:ralt"
+    if [ "$XKBLAYOUT" = "de" ]; then
+      # Germans use the AltGr key, so Scroll Lock will be their Compose Key:
+      XKBOPTIONS="compose:sclk"
+    else
+      XKBOPTIONS="compose:ralt"
+    fi
     # Ensure that XKBLAYOUT gets a value; XKBVARIANT is allowed to be empty.
     if [ -z "$XKBLAYOUT" ]; then
       if [ -z "$KEYMAP" ]; then
-- 
cgit v1.2.3