diff --git a/README.org b/README.org
index 2546801..f62047e 100644
--- a/README.org
+++ b/README.org
@@ -36,7 +36,6 @@ This is modified for my personal environment with i3wm + Spacemacs.
** TODO
- fully implement a sane extended layer like [[https://dreymar.colemak.org/layers-extend.html][this]]
-- add mouse warping: https://kaleidoscope.readthedocs.io/en/latest/plugins/Kaleidoscope-MouseKeys.html#warping
- maybe completely remove the NAV and TAB keys
** Adjusted QWERTY Layer for gaming
diff --git a/colemak-dhm/colemak-dhm.ino b/colemak-dhm/colemak-dhm.ino
index bcc704d..5d54185 100644
--- a/colemak-dhm/colemak-dhm.ino
+++ b/colemak-dhm/colemak-dhm.ino
@@ -79,8 +79,8 @@ KEYMAPS(
(
Key_de_ExlamationMark ,Key_de_DoubleQuote ,Key_de_QuestionMark ,Key_de_Dollar ,Key_de_Percent
,Key_de_Tilde ,Key_de_LeftCurly ,Key_de_LeftParen ,Key_de_LeftBracket ,Key_de_Quote
- ,Key_de_Pipe ,Key_de_RightCurly ,Key_de_RightParen ,Key_de_RightBracket ,Key_de_DoubleQuote ,Key_de_At
- ,___ ,___ ,___ ,Key_de_LeftShift ,Key_de_Spacebar ,___
+ ,Key_de_Pipe ,Key_de_RightCurly ,Key_de_RightParen ,Key_de_RightBracket ,Key_de_Backslash ,Key_de_At
+ ,___ ,___ ,___ ,Key_de_LeftShift ,Key_de_Spacebar ,___
,Key_de_Slash ,Key_de_7 ,Key_de_8 ,Key_de_9 ,Key_de_Plus
@@ -124,10 +124,10 @@ KEYMAPS(
,Key_de_LeftControl ,Key_de_Y ,Key_de_X ,Key_de_LeftAlt ,Key_de_C ,Key_de_Spacebar
- ,Key_de_7 ,Key_de_8 ,Key_de_9 ,Key_de_0 ,Key_de_F12
- ,Key_de_H ,Key_de_F11 ,Key_de_I ,Key_de_O ,Key_de_F11
- ,Key_de_I ,Key_de_U ,Key_de_K ,Key_de_L ,Key_de_K ,Key_de_Slash
- ,Key_de_B ,Key_de_M ,Key_de_N ,Key_de_F5 ,UnlockLayer(GAME) ,Key_Enter
+ ,Key_de_7 ,Key_de_8 ,Key_de_9 ,Key_de_0 ,Key_de_F12
+ ,Key_de_G ,Key_de_L ,Key_de_I ,Key_de_O ,Key_de_F11
+ ,Key_de_I ,Key_de_H ,Key_de_K ,Key_de_U ,Key_de_K ,Key_de_Slash
+ ,Key_de_B ,Key_de_M ,Key_de_N ,Key_de_F5 ,UnlockLayer(GAME) ,Key_Enter
),
)
diff --git a/keyboard-layout-GW-Gaming.json b/keyboard-layout-GW-Gaming.json
index c388e26..7393e50 100644
--- a/keyboard-layout-GW-Gaming.json
+++ b/keyboard-layout-GW-Gaming.json
@@ -13,20 +13,20 @@
"y": -0.09999999999999998,
"x": 2
},
- "$\n\n\n\n\n\n4"
+ "$\n\n\n\n\n\n3"
],
[
{
"y": -0.65,
"x": 1
},
- "§\n\n\n\n\n\n3",
+ "§\n\n\n\n\n\n2",
{
"x": 1,
"t": "#000000\n#1842d9",
"a": 4
},
- "\nF1\n\n\n\n\n\n\n%\n5"
+ "\nF1\n\n\n\n\n\n\n%\n4"
],
[
{
@@ -34,7 +34,7 @@
"t": "#000000",
"a": 5
},
- "\"\n\n\n\n\n\n2"
+ "\"\n\n\n\n\n\n1"
],
[
{
@@ -43,7 +43,7 @@
"t": "#000000\n#1842d9",
"a": 4
},
- "\nF2\n\n\n\n\n\n\n&\n6"
+ "\nF2\n\n\n\n\n\n\n&\n5"
],
[
{
@@ -73,7 +73,7 @@
"t": "#000000",
"a": 5
},
- "!\n\n\n\n\n\n1"
+ "!\n\n\n\n\n\nTAB"
],
[
{
@@ -82,7 +82,7 @@
"t": "#000000\n#1842d9",
"a": 4
},
- "\nF4\n\n\n\n\n\n\n\nR"
+ "\nF4\n\n\n\n\n\n\n\nT"
],
[
{
@@ -108,11 +108,11 @@
{
"y": -0.75
},
- "TAB",
+ "Shift",
{
"x": 4
},
- "T"
+ "6"
],
[
{
@@ -137,13 +137,13 @@
{
"x": 1
},
- "Esc\n\n\n\nShift"
+ "Alt"
],
[
{
"y": -0.75
},
- "\n\n\n\nCtrl",
+ "Ctrl",
{
"x": 4,
"t": "#000000\n\n\n\n#1842d9"
@@ -178,7 +178,7 @@
{
"x": 1
},
- "=\n\n\n\nF11\n\n0"
+ "=\n\n\n\n\n\n0"
],
[
{
@@ -186,7 +186,7 @@
"x": 4,
"a": 7
},
- "?\n\n\n\nF12"
+ "F12"
],
[
{
@@ -208,7 +208,7 @@
"y": -0.6499999999999999,
"x": 1
},
- "U\n\n\n\nF6",
+ "L\n\n\n\nF6",
{
"x": 1
},
@@ -219,38 +219,38 @@
"y": -0.75,
"x": 4
},
- "P"
+ "F11"
],
[
{
"y": -0.8999999999999999
},
- "Z\n\n\n\nF5"
+ "G\n\n\n\nF5"
],
[
{
"y": -0.7000000000000002,
"x": 2
},
- "K"
+ "U"
],
[
{
"y": -0.6499999999999999,
"x": 1
},
- "J",
+ "K",
{
"x": 1
},
- "L"
+ "K"
],
[
{
"y": -0.7500000000000004,
"x": 4
},
- "Shift"
+ "/"
],
[
{
@@ -273,17 +273,21 @@
"N",
{
"x": 1,
+ "c": "#15ab03",
+ "t": "#ffffff",
"a": 5
},
- ",\n\n\n\n\n\n."
+ "unlock\n\n\n\n\n\ngame"
],
[
{
"y": -0.8650000000000002,
"x": -1,
+ "c": "#cccccc",
+ "t": "#000000",
"a": 7
},
- "V"
+ "B"
],
[
{
@@ -296,7 +300,7 @@
{
"y": -0.9000000000000004
},
- "B"
+ "M"
],
[
{
@@ -304,6 +308,6 @@
"y": 2.2350000000000003,
"x": -1.25
},
- "G"
+ "I"
]
]
\ No newline at end of file
diff --git a/keyboard-layout-GW-gaming_draft.png b/keyboard-layout-GW-gaming_draft.png
index 55d9701..6b1c5fd 100644
Binary files a/keyboard-layout-GW-gaming_draft.png and b/keyboard-layout-GW-gaming_draft.png differ
diff --git a/keyboard-layout-colemak-DHm.json b/keyboard-layout-colemak-DHm.json
index b74eb61..95a3d50 100644
--- a/keyboard-layout-colemak-DHm.json
+++ b/keyboard-layout-colemak-DHm.json
@@ -214,22 +214,21 @@
"\n\n\n\nCtrl",
{
"x": 4,
- "f": 3
- },
- "Esc\n\n\n\n LGui"
- ],
- [
- {
- "y": -0.8999999999999999,
- "x": 4,
- "t": "#000000\n#1fa12e",
+ "t": "#000000\n#1fa12e\n\n\n#b906d6",
"a": 4,
"fa": [
6,
2
]
},
- "\nLclick\n\n\n\n\n\n\n\nSpace"
+ "\nScr \n\n\n LGui\n\n\n\n\nEsc"
+ ],
+ [
+ {
+ "y": -0.8999999999999999,
+ "x": 4
+ },
+ "\nLclick\n\n\nNAV\n\n\n\n\nSpace"
],
[
{
@@ -248,11 +247,11 @@
"ry": 0.965,
"y": -0.20000000000000018,
"x": 2,
- "t": "#267dff\n\n\n#c76c00\n\n\n\n\n\n000000\n#b906d6",
+ "t": "#267dff\n#1fa12e\n\n#c76c00\n\n\n\n\n\n000000\n#b906d6",
"a": 4,
"fa": [
0,
- 2,
+ 1,
0,
0,
0,
@@ -264,31 +263,32 @@
2
]
},
- "8\n\n\n\n\n\n\n\n\nU\nÜ"
+ "8\nN\n\n\n\n\n\n\n\nU\nÜ"
],
[
{
"y": -0.6499999999999999,
"x": 1,
- "t": "#267dff\n\n\n#c76c00\n#b906d6\n\n\n\n\n000000",
+ "t": "#267dff\n#1fa12e\n\n#c76c00\n#b906d6\n\n\n\n\n000000",
"fa": [
0,
- 2,
+ 1,
0,
1
]
},
- "7\n\n\nHOME\nCtrl+L\n\n\n\n\nL",
+ "7\nNW\n\nHOME\nCtrl+L\n\n\n\n\nL",
{
"x": 1,
- "t": "#267dff\n\n\n#c76c00\n\n\n\n\n\n000000"
+ "t": "#267dff\n#1fa12e\n\n#c76c00\n\n\n\n\n\n000000"
},
- "9\n\n\nEnd\n\n\n\n\n\nZ"
+ "9\nNE\n\nEnd\n\n\n\n\n\nZ"
],
[
{
"y": -0.75,
"x": 4,
+ "t": "#267dff\n\n\n#c76c00\n\n\n\n\n\n000000",
"fa": [
4
]
@@ -306,23 +306,23 @@
{
"y": -0.7000000000000002,
"x": 2,
- "t": "#267dff\n\n\n#c76c00\n\n\n\n\n\n000000",
- "f": 3
+ "t": "#267dff\n#1fa12e\n\n#c76c00\n\n\n\n\n\n000000",
+ "f2": 1
},
- "5\n\n\n\n\n\n\n\n\nE"
+ "5\ncenter\n\n\n\n\n\n\n\nE"
],
[
{
"y": -0.6499999999999999,
"x": 1,
- "f": 3
+ "f2": 1
},
- "4\n\n\n\n\n\n\n\n\nN",
+ "4\nW\n\n\n\n\n\n\n\nN",
{
"x": 1,
- "f": 3
+ "f2": 1
},
- "6\n\n\n\n\n\n\n\n\nI"
+ "6\nE\n\n\n\n\n\n\n\nI"
],
[
{
@@ -331,14 +331,14 @@
"t": "#267dff\n\n\n#c76c00\n\n\n\n\n\n000000\n#b906d6",
"fa": [
0,
+ 1,
+ 1,
0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
+ 1,
+ 1,
+ 1,
+ 1,
+ 1,
0,
2
]
@@ -348,7 +348,8 @@
[
{
"y": -0.8999999999999999,
- "t": "#267dff\n#1fa12e\n\n#c76c00\n#1fa12e\n\n\n\n\n000000"
+ "t": "#267dff\n#1fa12e\n\n#c76c00\n#1fa12e\n\n\n\n\n000000",
+ "f": 3
},
"*\n\n\n\nMouse\n\n\n\n\nM"
],
@@ -356,22 +357,25 @@
{
"y": -0.7000000000000002,
"x": 2,
- "t": "#267dff\n\n\n\n\n\n\n\n000000\n000000"
+ "t": "#267dff\n#1fa12e\n\n\n\n\n\n\n000000\n000000",
+ "f2": 1
},
- "2\n\n\n\n\n\n\n\n;\n,"
+ "2\nS\n\n\n\n\n\n\n;\n,"
],
[
{
"y": -0.6499999999999999,
"x": 1,
- "t": "#267dff\n\n\n\n\n\n\n\n\n000000"
+ "t": "#267dff\n#1fa12e\n\n\n\n\n\n\n\n000000",
+ "f2": 1
},
- "1\n\n\n\n\n\n\n\n\nH",
+ "1\nSW\n\n\n\n\n\n\n\nH",
{
"x": 1,
- "t": "#267dff\n\n\n\n\n\n\n\n000000\n000000"
+ "t": "#267dff\n#1fa12e\n\n\n\n\n\n\n000000\n000000",
+ "f2": 1
},
- "3\n\n\n\n\n\n\n\n:\n."
+ "3\nSE\n\n\n\n\n\n\n:\n."
],
[
{
@@ -379,14 +383,16 @@
"x": 4,
"t": "#267dff",
"sm": "alps",
- "sb": "matias"
+ "sb": "matias",
+ "f": 3
},
"=\n\n\n\n\n\n\n\n\n/"
],
[
{
"y": -0.9000000000000004,
- "t": "#267dff\n\n\n\n\n\n\n\n\n000000"
+ "t": "#267dff\n\n\n\n\n\n\n\n\n000000",
+ "f": 3
},
"0\n\n\n\n\n\n\n\n\nK"
],
@@ -426,32 +432,33 @@
"\n\n\n\nNAV\n\n",
{
"x": 1,
- "c": "#c76c00",
+ "c": "#1cc700",
"t": "#267dff",
"a": 4,
"fa": [
4
]
},
- ".\n\n\n\n\n\n\n\n\nNAV"
+ ".\n\n\n\n\n\n\n\n\nGAME"
],
[
{
"y": -0.8650000000000002,
"x": -1,
"c": "#cccccc",
- "t": "#000000",
- "a": 7,
- "f": 3
+ "t": "#000000\n#1fa12e",
+ "fa": [
+ 4,
+ 2
+ ]
},
- "Alt"
+ "\nScr \n\n\n\n\n\n\n\nAlt"
],
[
{
"y": -0.8849999999999998,
"x": 4,
"t": "#267dff\n\n\n\n#b906d6",
- "a": 4,
"f": 8,
"fa": [
4
diff --git a/keyboard-layout-colemak-DHm.png b/keyboard-layout-colemak-DHm.png
index f17f1be..43a0ef6 100644
Binary files a/keyboard-layout-colemak-DHm.png and b/keyboard-layout-colemak-DHm.png differ