keyboard layout and MacBook trackpad fixes

2 files changed, 15 insertions, 0 deletions

diff --git a/config/chroot_local-includes/lib/live/config/0030-macbook b/config/chroot_local-includes/lib/live/config/0030-macbook
new file mode 100755
index 0000000..3dfebb4
--- /dev/null
+++ b/config/chroot_local-includes/lib/live/config/0030-macbook
@@ -0,0 +1,13 @@
+#!/bin/bash
+if grep -q "Apple.*Keyboard" /proc/bus/input/devices; then
+    # set keyboard model to macbook79
+    echo "keyboard-configuration keyboard-configuration/modelcode select macbook79" | debconf-set-selections 
+    sed -i -e "s|^XKBMODEL=.*$|XKBMODEL=\"macbook79\"|" /etc/default/keyboard
+    
+    # reverse scroll wheel
+    echo "[Mouse]" > /etc/skel/.kde/share/config/kcminputrc
+    echo "ReverseScrollPolarity=true" >> /etc/skel/.kde/share/config/kcminputrc
+
+    # disable tap = click because Apple Trackpads have an own click button
+    sed -i 's/^\(.*"f1_tap_action":\) [01]\(.*\)$/\1 0\2/' /etc/skel/.config/synaptiks/touchpad-config.json
+fi
diff --git a/config/chroot_local-includes/lib/live/config/8000-kde-keyboard-layout b/config/chroot_local-includes/lib/live/config/8000-kde-keyboard-layout
index 62e3927..d83cb7f 100755
--- a/config/chroot_local-includes/lib/live/config/8000-kde-keyboard-layout
+++ b/config/chroot_local-includes/lib/live/config/8000-kde-keyboard-layout
@@ -52,6 +52,8 @@ Configure_kdekeyboardlayout ()
 	else
 		sed -i 's/^\(DisplayNames\|LayoutList\)=/\1='$LIVE_KEYBOARD_LAYOUTS',/; s/,$//' "$KXKBRC"
 	fi
+    [ -r /etc/default/keyboard ] && . /etc/default/keyboard
+    [ "$XKBMODEL" ] && kwriteconfig --file "$KXKBRC" --group Layout --key Model --type string "$XKBMODEL"
 
 	# Creating state file
 	touch /var/lib/live/config/kdekeyboardlayout