From 80f30a70e631f356c76fe8fba7a79c1ebb7e8399 Mon Sep 17 00:00:00 2001
From: Mitchell Riedstra <mitch@riedstra.dev>
Date: Sat, 20 Jan 2024 15:26:26 -0500
Subject: Further adjust key remappings

---
 readme.md           |  2 +-
 remap-macbookair.sh | 12 ------------
 remap.sh            | 23 -----------------------
 remap/at-kbd.sh     | 23 +++++++++++++++++++++++
 remap/mbair.sh      | 22 ++++++++++++++++++++++
 5 files changed, 46 insertions(+), 36 deletions(-)
 delete mode 100644 remap-macbookair.sh
 delete mode 100644 remap.sh
 create mode 100644 remap/at-kbd.sh
 create mode 100644 remap/mbair.sh

diff --git a/readme.md b/readme.md
index 209aa0d..d5f42d7 100644
--- a/readme.md
+++ b/readme.md
@@ -6,7 +6,7 @@
 
 ### Key remappings ( Linux specific )
 
-`./remap.sh`
+`./remap/at-kbd.sh`
 
 ### Distro specific
 
diff --git a/remap-macbookair.sh b/remap-macbookair.sh
deleted file mode 100644
index ac209c0..0000000
--- a/remap-macbookair.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-# Example can be hand via evemu-describe and grabbing the DMI line.
-# This should match most apple keyboards, though.
-#
-# From for remapping you'll want to run `evtest` for the input,
-# the keyboard key code, take the value you get from the type 4 EV_MSC
-# lines
-evdev:*:dmi:bvnAppleInc.:bvr*:bd*:br0.1:svn*:pn*:pvr*
- KEYBOARD_KEY_70039=leftctrl
- KEYBOARD_KEY_700e3=leftalt
- KEYBOARD_KEY_700e2=leftmeta
- KEYBOARD_KEY_700e6=capslock
-
diff --git a/remap.sh b/remap.sh
deleted file mode 100644
index 37ae9a6..0000000
--- a/remap.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-set -ex
-_s="sudo"
-[ "$(id -u)" -eq 0 ] && _s=""
-hwdb_f="$(mktemp)"
-cat > "$hwdb_f" <<EOF
-# /etc/udev.d/hwdb/01-keyboard.hwdb
-# https://wiki.archlinux.org/title/map_scancodes_to_keycodes
-# also 'yum -y install evtest'
-# evdev:name:AT Translated Set 2 keyboard:*
-# systemd-hwdb update && udevadm trigger
-# or perhaps:
-# udevadm hwdb -u
-# This should match all AT keyboards, apparently
-evdev:atkbd:dmi:bvn*:bvr*:bd*:svn*:pn*:pvr*
- KEYBOARD_KEY_3a=leftctrl
- KEYBOARD_KEY_1d=leftctrl
- KEYBOARD_KEY_9d=capslock
-EOF
-
-$_s cp "$hwdb_f" /etc/udev/hwdb.d/01-keyboard.hwdb
-$_s systemd-hwdb update
-$_s udevadm trigger 
diff --git a/remap/at-kbd.sh b/remap/at-kbd.sh
new file mode 100644
index 0000000..37ae9a6
--- /dev/null
+++ b/remap/at-kbd.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+set -ex
+_s="sudo"
+[ "$(id -u)" -eq 0 ] && _s=""
+hwdb_f="$(mktemp)"
+cat > "$hwdb_f" <<EOF
+# /etc/udev.d/hwdb/01-keyboard.hwdb
+# https://wiki.archlinux.org/title/map_scancodes_to_keycodes
+# also 'yum -y install evtest'
+# evdev:name:AT Translated Set 2 keyboard:*
+# systemd-hwdb update && udevadm trigger
+# or perhaps:
+# udevadm hwdb -u
+# This should match all AT keyboards, apparently
+evdev:atkbd:dmi:bvn*:bvr*:bd*:svn*:pn*:pvr*
+ KEYBOARD_KEY_3a=leftctrl
+ KEYBOARD_KEY_1d=leftctrl
+ KEYBOARD_KEY_9d=capslock
+EOF
+
+$_s cp "$hwdb_f" /etc/udev/hwdb.d/01-keyboard.hwdb
+$_s systemd-hwdb update
+$_s udevadm trigger 
diff --git a/remap/mbair.sh b/remap/mbair.sh
new file mode 100644
index 0000000..8ec0e46
--- /dev/null
+++ b/remap/mbair.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+set -ex
+_s="sudo"
+[ "$(id -u)" -eq 0 ] && _s=""
+hwdb_f="$(mktemp)"
+cat > "$hwdb_f" <<EOF
+# Example can be hand via evemu-describe and grabbing the DMI line.
+# This should match most apple keyboards, though.
+#
+# From for remapping you'll want to run `evtest` for the input,
+# the keyboard key code, take the value you get from the type 4 EV_MSC
+# lines
+evdev:name:Apple Inc*Internal Keyboard*
+ KEYBOARD_KEY_70039=leftctrl
+ KEYBOARD_KEY_700e3=leftalt
+ KEYBOARD_KEY_700e2=leftmeta
+ KEYBOARD_KEY_700e6=capslock
+EOF
+
+$_s cp "$hwdb_f" /etc/udev/hwdb.d/01-mbair.hwdb
+$_s systemd-hwdb update
+$_s udevadm trigger 
-- 
cgit v1.2.3