From 15bb17abbc51c1fda0c82923c3f87c42f4cee8d4 Mon Sep 17 00:00:00 2001 From: maralorn Date: Wed, 19 Oct 2022 03:04:08 +0200 Subject: [PATCH] Fix keyboard layout --- keyboard-layout.json | 343 +++++++++++++++++++++++-------------------- 1 file changed, 183 insertions(+), 160 deletions(-) diff --git a/keyboard-layout.json b/keyboard-layout.json index 04d4f6d4..ca8379b7 100644 --- a/keyboard-layout.json +++ b/keyboard-layout.json @@ -118,7 +118,12 @@ {"code": 6, "label": {"base": "c", "shifted": "C"}}, {"code": 25, "label": {"base": "v", "shifted": "V"}}, {"code": 5, "label": {"base": "b", "shifted": "B"}}, - {"code": 49, "label": {"base": "\\", "shifted": "|"}}, + { + "code": 230, + "label": {"base": {"full": "AltGr", "1u": "AGr"}}, + "location": "right", + "categories": ["modifier"] + }, {"code": 41, "label": {"base": "Esc"}}, {"code": 43, "label": {"base": "Tab"}}, { @@ -292,7 +297,14 @@ {"code": 21, "label": {"base": "r", "shifted": "R"}}, {"code": 23, "label": {"base": "t", "shifted": "T"}}, {"code": 7, "label": {"base": "d", "shifted": "D"}}, - {"code": 28, "label": {"base": "y", "shifted": "Y"}}, + { + "code": 49453, + "baseCode": 28, + "label": {"hint": "Shift/", "base": "y"}, + "modifier": "Shift", + "rangeStart": 49169, + "categories": ["modifier", "dualuse", "shift"] + }, { "code": 65535, "label": {"base": {"full": "Transparent", "1u": " "}}, @@ -357,7 +369,6 @@ {"code": 60, "label": {"base": "F3"}}, {"code": 61, "label": {"base": "F4"}}, {"code": 62, "label": {"base": "F5"}}, - {"code": 57, "label": {"base": {"full": "Caps Lock", "1u": "CpLK"}}}, { "code": 65535, "label": {"base": {"full": "Transparent", "1u": " "}}, @@ -368,6 +379,7 @@ "label": {"base": {"full": "Transparent", "1u": " "}}, "categories": ["blanks"] }, + {"code": 79, "label": {"base": {"full": "Right Arrow", "1u": "→"}}}, { "code": 18614, "legacyCode": 22710, @@ -380,7 +392,11 @@ {"code": 66, "label": {"base": "F9"}}, {"code": 67, "label": {"base": "F10"}}, {"code": 68, "label": {"base": "F11"}}, - {"code": 43, "label": {"base": "Tab"}}, + { + "code": 65535, + "label": {"base": {"full": "Transparent", "1u": " "}}, + "categories": ["blanks"] + }, { "code": 65535, "label": {"base": {"full": "Transparent", "1u": " "}}, @@ -422,13 +438,7 @@ "label": {"base": {"full": "Transparent", "1u": " "}}, "categories": ["blanks"] }, - { - "code": 17493, - "label": {"hint": "MoveTo", "base": "#1"}, - "target": 1, - "rangeStart": 17492, - "categories": ["layer", "movetolayer"] - }, + {"code": 82, "label": {"base": {"full": "Up Arrow", "1u": "↑"}}}, { "code": 18637, "legacyCode": 22733, @@ -459,9 +469,17 @@ "categories": ["with-modifiers", "ctrl", "alt"], "baseCode": 18 }, - {"code": 48, "label": {"base": "]", "shifted": "}"}}, + { + "code": 65535, + "label": {"base": {"full": "Transparent", "1u": " "}}, + "categories": ["blanks"] + }, {"code": 69, "label": {"base": "F12"}}, - {"code": 74, "label": {"base": "Home"}}, + { + "code": 65535, + "label": {"base": {"full": "Transparent", "1u": " "}}, + "categories": ["blanks"] + }, { "code": 2308, "label": {"hint": {"full": "Ctrl+Shift+", "1u": "C+S+"}, "base": "a"}, @@ -501,11 +519,7 @@ "label": {"base": {"full": "Transparent", "1u": " "}}, "categories": ["blanks"] }, - { - "code": 65535, - "label": {"base": {"full": "Transparent", "1u": " "}}, - "categories": ["blanks"] - }, + {"code": 81, "label": {"base": {"full": "Down Arrow", "1u": "↓"}}}, { "code": 18658, "legacyCode": 19682, @@ -549,8 +563,16 @@ "label": {"base": {"full": "Transparent", "1u": " "}}, "categories": ["blanks"] }, - {"code": 77, "label": {"base": "End"}}, - {"code": 70, "label": {"base": {"full": "Print Screen", "1u": "PrSc"}}}, + { + "code": 65535, + "label": {"base": {"full": "Transparent", "1u": " "}}, + "categories": ["blanks"] + }, + { + "code": 65535, + "label": {"base": {"full": "Transparent", "1u": " "}}, + "categories": ["blanks"] + }, { "code": 20552, "label": { @@ -581,20 +603,18 @@ "categories": ["blanks"] }, { - "code": 65535, - "label": {"base": {"full": "Transparent", "1u": " "}}, - "categories": ["blanks"] - }, - { - "code": 65535, - "label": {"base": {"full": "Transparent", "1u": " "}}, - "categories": ["blanks"] + "code": 17493, + "label": {"hint": "MoveTo", "base": "#1"}, + "target": 1, + "rangeStart": 17492, + "categories": ["layer", "movetolayer"] }, { "code": 65535, "label": {"base": {"full": "Transparent", "1u": " "}}, "categories": ["blanks"] }, + {"code": 80, "label": {"base": {"full": "Left Arrow", "1u": "←"}}}, { "code": 65535, "label": {"base": {"full": "Transparent", "1u": " "}}, @@ -627,12 +647,15 @@ "categories": ["with-modifiers", "ctrl", "alt"], "baseCode": 55 }, - {"code": 49, "label": {"base": "\\", "shifted": "|"}}, { - "code": 2097, - "label": {"hint": null, "base": "|"}, - "categories": ["with-modifiers", "shift"], - "baseCode": 49 + "code": 65535, + "label": {"base": {"full": "Transparent", "1u": " "}}, + "categories": ["blanks"] + }, + { + "code": 65535, + "label": {"base": {"full": "Transparent", "1u": " "}}, + "categories": ["blanks"] } ], [ @@ -2243,49 +2266,102 @@ ] ], "colormaps": [ + [ + 9, + 2, + 0, + 0, + 15, + 15, + 15, + 15, + 15, + 15, + 15, + 15, + 15, + 15, + 15, + 15, + 15, + 15, + 15, + 15, + 15, + 15, + 15, + 15, + 0, + 0, + 0, + 0, + 13, + 0, + 0, + 9, + 9, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 15, + 15, + 15, + 15, + 15, + 15, + 15, + 15, + 15, + 15, + 15, + 15, + 15, + 15, + 15, + 15, + 15, + 15, + 15, + 15, + 15, + 15, + 2, + 9 + ], [ 15, 2, 15, 15, 15, + 3, + 3, + 3, + 3, + 3, + 3, + 15, + 15, + 3, + 3, + 3, + 3, + 3, + 3, + 15, + 15, + 3, + 3, + 3, 15, 15, 15, 15, - 15, - 15, - 15, - 15, - 15, - 15, - 7, - 15, - 7, - 7, - 7, - 7, - 7, - 7, - 7, - 7, - 15, - 15, - 0, - 0, - 0, - 0, - 15, - 15, - 0, - 0, - 0, - 0, - 15, - 15, - 15, - 15, - 15, + 12, 15, 15, 15, @@ -2297,12 +2373,25 @@ 15, 15, 15, + 3, + 3, + 3, 15, 15, + 3, + 3, + 3, + 15, + 3, + 3, 15, 15, + 3, + 3, 15, 15, + 3, + 3, 15, 15, 15, @@ -2310,72 +2399,18 @@ 15 ], [ - 15, - 3, - 3, - 15, - 3, - 3, - 3, - 15, - 15, - 3, - 3, - 3, - 15, - 15, - 15, - 15, - 3, - 15, - 15, - 15, - 15, - 15, - 15, - 15, - 15, - 15, - 15, - 15, - 3, - 3, - 3, - 15, - 15, - 3, - 3, - 3, - 15, - 3, - 3, - 15, - 15, - 3, - 3, - 15, - 15, - 3, - 3, - 15, - 15, - 15, - 3, - 15, - 15, - 15, - 15, - 15, - 12, - 15, + 9, 2, + 0, + 0, + 12, + 9, + 9, 15, 9, 9, 9, - 12 - ], - [ + 12, 12, 9, 9, @@ -2385,28 +2420,28 @@ 9, 12, 12, + 9, + 9, 15, - 15, - 15, - 15, - 15, - 15, - 15, + 0, + 0, + 0, + 0, + 0, + 0, + 0, 12, 15, - 15, - 15, - 15, - 15, - 15, - 3, - 15, - 1, - 1, - 1, - 1, - 1, - 1, + 9, + 9, + 9, + 9, + 0, + 0, + 0, + 0, + 0, + 0, 12, 12, 3, @@ -2426,20 +2461,8 @@ 12, 12, 12, - 15, - 15, - 15, - 15, - 15, - 15, - 15, - 15, - 15, - 15, - 15, - 15, - 15, - 15 + 2, + 9 ], [ 15,