Compare commits

..

No commits in common. "f16d38da48543fc85ef46c76fff822ad69d3bfa5" and "e3a133eaf760d5859cd0cb6a4db3a9431d5e075d" have entirely different histories.

6 changed files with 108 additions and 102 deletions

View File

@ -36,6 +36,7 @@ This is modified for my personal environment with i3wm + Spacemacs.
** TODO ** TODO
- fully implement a sane extended layer like [[https://dreymar.colemak.org/layers-extend.html][this]] - 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 - maybe completely remove the NAV and TAB keys
** Adjusted QWERTY Layer for gaming ** Adjusted QWERTY Layer for gaming

View File

@ -40,6 +40,7 @@
#include "Kaleidoscope-Languages.h" #include "Kaleidoscope-Languages.h"
#include "kaleidoscope/lang/de-qwertz.h" #include "kaleidoscope/lang/de-qwertz.h"
#define MO(n) ShiftToLayer(n) #define MO(n) ShiftToLayer(n)
#define TG(n) LockLayer(n) #define TG(n) LockLayer(n)
@ -52,6 +53,7 @@ enum {
/* QWERTZ+Shift should be MOVED to (and back) still with ability to use SYMBOLS layer from there */ /* QWERTZ+Shift should be MOVED to (and back) still with ability to use SYMBOLS layer from there */
enum { enum {
BASE, // Colemak-DHm: no modifiers BASE, // Colemak-DHm: no modifiers
// SHIFT, // Shifted: hold Shift like a sane person
SYMBOLS, // SUPER key SYMBOLS, // SUPER key
NAVI, // with FUN or Any key (below , and .) NAVI, // with FUN or Any key (below , and .)
MOUSE, // while holding M key MOUSE, // while holding M key
@ -66,20 +68,34 @@ KEYMAPS(
,Key_de_A ,Key_de_R ,Key_de_S ,Key_de_T ,Key_de_G ,Key_de_A ,Key_de_R ,Key_de_S ,Key_de_T ,Key_de_G
,Key_de_Y ,Key_de_X ,Key_de_C ,Key_de_D ,Key_de_V ,Key_de_Hash ,Key_de_Y ,Key_de_X ,Key_de_C ,Key_de_D ,Key_de_V ,Key_de_Hash
,Key_de_Tab ,Key_de_Tab ,Key_LeftGui ,Key_de_LeftShift ,Key_de_Spacebar ,Key_de_Escape ,Key_de_Tab ,Key_de_Tab ,Key_LeftGui ,Key_de_LeftShift ,Key_de_Spacebar ,Key_de_Escape
// ,Key_de_Tab ,Key_de_Tab ,Key_LeftGui ,MO(SHIFT) ,Key_de_Spacebar ,Key_de_Escape
,Key_de_J ,Key_de_L ,Key_de_U ,Key_de_Z ,Key_de_Semicolon ,Key_de_J ,Key_de_L ,Key_de_U ,Key_de_Z ,Key_de_Semicolon
,Key_de_M ,Key_de_N ,Key_de_E ,Key_de_I ,Key_de_O ,Key_de_M ,Key_de_N ,Key_de_E ,Key_de_I ,Key_de_O
,Key_de_LessThan ,Key_de_K ,Key_de_H ,Key_de_Comma ,Key_de_Period ,Key_de_Slash ,Key_de_LessThan ,Key_de_K ,Key_de_H ,Key_de_Comma ,Key_de_Period ,Key_de_Slash
,Key_de_LeftAlt ,MO(SYMBOLS) ,Key_de_Backspace ,MO(NAVI) ,TG(GAME) ,Key_Enter ,Key_de_LeftAlt ,MO(SYMBOLS) ,Key_de_Backspace ,MO(NAVI) ,MO(NAVI) ,Key_Enter
), ),
// [SHIFT] = KEYMAP_STACKED
// (
// LSHIFT(Key_de_Q) ,LSHIFT(Key_de_W) ,LSHIFT(Key_de_F) ,LSHIFT(Key_de_P) ,LSHIFT(Key_de_B)
// ,LSHIFT(Key_de_A) ,LSHIFT(Key_de_R) ,LSHIFT(Key_de_S) ,LSHIFT(Key_de_T) ,LSHIFT(Key_de_G)
// ,LSHIFT(Key_de_Y) ,LSHIFT(Key_de_X) ,LSHIFT(Key_de_C) ,LSHIFT(Key_de_D) ,LSHIFT(Key_de_V) ,Key_de_LessThan
// ,LSHIFT(Key_de_Tab) ,LSHIFT(Key_de_Tab) ,___ ,___ ,___ ,___
// ,LSHIFT(Key_de_J) ,LSHIFT(Key_de_L) ,LSHIFT(Key_de_U) ,LSHIFT(Key_de_Z) ,LSHIFT(Key_de_W)
// ,LSHIFT(Key_de_M) ,LSHIFT(Key_de_N) ,LSHIFT(Key_de_E) ,LSHIFT(Key_de_I) ,LSHIFT(Key_de_O)
// ,LSHIFT(Key_de_LessThan) ,LSHIFT(Key_de_K) ,LSHIFT(Key_de_H) ,Key_de_Semicolon ,Key_de_Colon ,Key_de_Backslash
// ,___ ,___ ,Key_de_Delete ,___ ,___ ,___
// ),
[SYMBOLS] = KEYMAP_STACKED [SYMBOLS] = KEYMAP_STACKED
( (
Key_de_ExlamationMark ,Key_de_DoubleQuote ,Key_de_QuestionMark ,Key_de_Dollar ,Key_de_Percent 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_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_Backslash ,Key_de_At ,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_LeftShift ,Key_de_Spacebar ,___
@ -110,24 +126,24 @@ KEYMAPS(
XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX,
XXX, XXX, XXX, XXX, Key_mouseBtnL, Key_mouseScrollUp, XXX, XXX, XXX, XXX, Key_mouseBtnL, Key_mouseScrollUp,
XXX, Key_mouseWarpNW, Key_mouseWarpN, Key_mouseWarpNE, XXX, XXX, XXX, XXX, XXX, XXX,
XXX, Key_mouseWarpW, Key_mouseWarpIn, Key_mouseWarpE, XXX, XXX, XXX, XXX, XXX, XXX,
XXX, XXX, Key_mouseWarpSW, Key_mouseWarpS, Key_mouseWarpSE, XXX, XXX, XXX, XXX, XXX, XXX, XXX,
Key_mouseScrollDn, Key_mouseBtnR, XXX, XXX, XXX, XXX Key_mouseScrollDn, Key_mouseBtnR, XXX, XXX, XXX, XXX
), ),
[GAME] = KEYMAP_STACKED [GAME] = KEYMAP_STACKED
( (
Key_de_1 ,Key_de_2 ,Key_de_3 ,Key_de_4 ,Key_de_5 Key_de_2 ,Key_de_3 ,Key_de_4 ,Key_de_5 ,Key_de_6
,Key_de_Tab ,Key_de_Q ,Key_de_W ,Key_de_E ,Key_de_T ,Key_de_1 ,Key_de_Q ,Key_de_W ,Key_de_E ,Key_de_R
,Key_de_LeftShift ,Key_de_A ,Key_de_S ,Key_de_D ,Key_de_F ,Key_de_6 ,Key_de_Tab ,Key_de_A ,Key_de_S ,Key_de_D ,Key_de_F ,Key_de_T
,Key_de_LeftControl ,Key_de_Y ,Key_de_X ,Key_de_LeftAlt ,Key_de_C ,Key_de_Spacebar ,___ ,Key_de_Y ,Key_de_X ,Key_de_Escape ,Key_de_C ,Key_de_Escape
,Key_de_7 ,Key_de_8 ,Key_de_9 ,Key_de_0 ,Key_de_F12 ,Key_de_7 ,Key_de_8 ,Key_de_9 ,Key_de_0 ,Key_de_Semicolon
,Key_de_G ,Key_de_L ,Key_de_I ,Key_de_O ,Key_de_F11 ,Key_de_Z ,Key_de_U ,Key_de_I ,Key_de_O ,Key_de_P
,Key_de_I ,Key_de_H ,Key_de_K ,Key_de_U ,Key_de_K ,Key_de_Slash ,Key_de_G ,Key_de_K ,Key_de_H ,Key_de_J ,Key_de_K ,Key_de_Slash
,Key_de_B ,Key_de_M ,Key_de_N ,Key_de_F5 ,UnlockLayer(GAME) ,Key_Enter ,Key_de_V ,Key_de_B ,Key_de_N ,MO(NAVI) ,Key_de_Period ,Key_Enter
), ),
) )

View File

@ -13,20 +13,20 @@
"y": -0.09999999999999998, "y": -0.09999999999999998,
"x": 2 "x": 2
}, },
"$\n\n\n\n\n\n3" "$\n\n\n\n\n\n4"
], ],
[ [
{ {
"y": -0.65, "y": -0.65,
"x": 1 "x": 1
}, },
"§\n\n\n\n\n\n2", "§\n\n\n\n\n\n3",
{ {
"x": 1, "x": 1,
"t": "#000000\n#1842d9", "t": "#000000\n#1842d9",
"a": 4 "a": 4
}, },
"\nF1\n\n\n\n\n\n\n%\n4" "\nF1\n\n\n\n\n\n\n%\n5"
], ],
[ [
{ {
@ -34,7 +34,7 @@
"t": "#000000", "t": "#000000",
"a": 5 "a": 5
}, },
"\"\n\n\n\n\n\n1" "\"\n\n\n\n\n\n2"
], ],
[ [
{ {
@ -43,7 +43,7 @@
"t": "#000000\n#1842d9", "t": "#000000\n#1842d9",
"a": 4 "a": 4
}, },
"\nF2\n\n\n\n\n\n\n&\n5" "\nF2\n\n\n\n\n\n\n&\n6"
], ],
[ [
{ {
@ -73,7 +73,7 @@
"t": "#000000", "t": "#000000",
"a": 5 "a": 5
}, },
"!\n\n\n\n\n\nTAB" "!\n\n\n\n\n\n1"
], ],
[ [
{ {
@ -82,7 +82,7 @@
"t": "#000000\n#1842d9", "t": "#000000\n#1842d9",
"a": 4 "a": 4
}, },
"\nF4\n\n\n\n\n\n\n\nT" "\nF4\n\n\n\n\n\n\n\nR"
], ],
[ [
{ {
@ -108,11 +108,11 @@
{ {
"y": -0.75 "y": -0.75
}, },
"Shift", "TAB",
{ {
"x": 4 "x": 4
}, },
"6" "T"
], ],
[ [
{ {
@ -137,13 +137,13 @@
{ {
"x": 1 "x": 1
}, },
"Alt" "Esc\n\n\n\nShift"
], ],
[ [
{ {
"y": -0.75 "y": -0.75
}, },
"Ctrl", "\n\n\n\nCtrl",
{ {
"x": 4, "x": 4,
"t": "#000000\n\n\n\n#1842d9" "t": "#000000\n\n\n\n#1842d9"
@ -178,7 +178,7 @@
{ {
"x": 1 "x": 1
}, },
"=\n\n\n\n\n\n0" "=\n\n\n\nF11\n\n0"
], ],
[ [
{ {
@ -186,7 +186,7 @@
"x": 4, "x": 4,
"a": 7 "a": 7
}, },
"F12" "?\n\n\n\nF12"
], ],
[ [
{ {
@ -208,7 +208,7 @@
"y": -0.6499999999999999, "y": -0.6499999999999999,
"x": 1 "x": 1
}, },
"L\n\n\n\nF6", "U\n\n\n\nF6",
{ {
"x": 1 "x": 1
}, },
@ -219,38 +219,38 @@
"y": -0.75, "y": -0.75,
"x": 4 "x": 4
}, },
"F11" "P"
], ],
[ [
{ {
"y": -0.8999999999999999 "y": -0.8999999999999999
}, },
"G\n\n\n\nF5" "Z\n\n\n\nF5"
], ],
[ [
{ {
"y": -0.7000000000000002, "y": -0.7000000000000002,
"x": 2 "x": 2
}, },
"U" "K"
], ],
[ [
{ {
"y": -0.6499999999999999, "y": -0.6499999999999999,
"x": 1 "x": 1
}, },
"K", "J",
{ {
"x": 1 "x": 1
}, },
"K" "L"
], ],
[ [
{ {
"y": -0.7500000000000004, "y": -0.7500000000000004,
"x": 4 "x": 4
}, },
"/" "Shift"
], ],
[ [
{ {
@ -273,21 +273,17 @@
"N", "N",
{ {
"x": 1, "x": 1,
"c": "#15ab03",
"t": "#ffffff",
"a": 5 "a": 5
}, },
"unlock\n\n\n\n\n\ngame" ",\n\n\n\n\n\n."
], ],
[ [
{ {
"y": -0.8650000000000002, "y": -0.8650000000000002,
"x": -1, "x": -1,
"c": "#cccccc",
"t": "#000000",
"a": 7 "a": 7
}, },
"B" "V"
], ],
[ [
{ {
@ -300,7 +296,7 @@
{ {
"y": -0.9000000000000004 "y": -0.9000000000000004
}, },
"M" "B"
], ],
[ [
{ {
@ -308,6 +304,6 @@
"y": 2.2350000000000003, "y": 2.2350000000000003,
"x": -1.25 "x": -1.25
}, },
"I" "G"
] ]
] ]

Binary file not shown.

Before

Width:  |  Height:  |  Size: 87 KiB

After

Width:  |  Height:  |  Size: 88 KiB

View File

@ -214,21 +214,22 @@
"<i class='kb kb-Tab-1'></i>\n\n\n\nCtrl", "<i class='kb kb-Tab-1'></i>\n\n\n\nCtrl",
{ {
"x": 4, "x": 4,
"t": "#000000\n#1fa12e\n\n\n#b906d6", "f": 3
},
"Esc\n\n\n\n<i class='kb kb-logo-linux-tux-ibm-invert'></i> LGui"
],
[
{
"y": -0.8999999999999999,
"x": 4,
"t": "#000000\n#1fa12e",
"a": 4, "a": 4,
"fa": [ "fa": [
6, 6,
2 2
] ]
}, },
"\nScr <i class='kb kb-Arrows-Top-4'></i>\n\n\n<i class='kb kb-logo-linux-tux-ibm-invert'></i> LGui\n\n\n\n\nEsc" "\nLclick\n\n\n\n\n\n\n\nSpace"
],
[
{
"y": -0.8999999999999999,
"x": 4
},
"\nLclick\n\n\nNAV\n\n\n\n\nSpace"
], ],
[ [
{ {
@ -247,11 +248,11 @@
"ry": 0.965, "ry": 0.965,
"y": -0.20000000000000018, "y": -0.20000000000000018,
"x": 2, "x": 2,
"t": "#267dff\n#1fa12e\n\n#c76c00\n\n\n\n\n\n000000\n#b906d6", "t": "#267dff\n\n\n#c76c00\n\n\n\n\n\n000000\n#b906d6",
"a": 4, "a": 4,
"fa": [ "fa": [
0, 0,
1, 2,
0, 0,
0, 0,
0, 0,
@ -263,32 +264,31 @@
2 2
] ]
}, },
"8\nN\n\n<i class='kb kb-Arrows-Up'></i>\n\n\n\n\n\nU\nÜ" "8\n\n\n<i class='kb kb-Arrows-Up'></i>\n\n\n\n\n\nU\nÜ"
], ],
[ [
{ {
"y": -0.6499999999999999, "y": -0.6499999999999999,
"x": 1, "x": 1,
"t": "#267dff\n#1fa12e\n\n#c76c00\n#b906d6\n\n\n\n\n000000", "t": "#267dff\n\n\n#c76c00\n#b906d6\n\n\n\n\n000000",
"fa": [ "fa": [
0, 0,
1, 2,
0, 0,
1 1
] ]
}, },
"7\nNW\n\nHOME\nCtrl+L\n\n\n\n\nL", "7\n\n\nHOME\nCtrl+L\n\n\n\n\nL",
{ {
"x": 1, "x": 1,
"t": "#267dff\n#1fa12e\n\n#c76c00\n\n\n\n\n\n000000" "t": "#267dff\n\n\n#c76c00\n\n\n\n\n\n000000"
}, },
"9\nNE\n\nEnd\n\n\n\n\n\nZ" "9\n\n\nEnd\n\n\n\n\n\nZ"
], ],
[ [
{ {
"y": -0.75, "y": -0.75,
"x": 4, "x": 4,
"t": "#267dff\n\n\n#c76c00\n\n\n\n\n\n000000",
"fa": [ "fa": [
4 4
] ]
@ -306,23 +306,23 @@
{ {
"y": -0.7000000000000002, "y": -0.7000000000000002,
"x": 2, "x": 2,
"t": "#267dff\n#1fa12e\n\n#c76c00\n\n\n\n\n\n000000", "t": "#267dff\n\n\n#c76c00\n\n\n\n\n\n000000",
"f2": 1 "f": 3
}, },
"5\ncenter\n\n<i class='kb kb-Arrows-Up'></i>\n\n\n\n\n\nE" "5\n\n\n<i class='kb kb-Arrows-Up'></i>\n\n\n\n\n\nE"
], ],
[ [
{ {
"y": -0.6499999999999999, "y": -0.6499999999999999,
"x": 1, "x": 1,
"f2": 1 "f": 3
}, },
"4\nW\n\n<i class='kb kb-Arrows-Down'></i>\n\n\n\n\n\nN", "4\n\n\n<i class='kb kb-Arrows-Down'></i>\n\n\n\n\n\nN",
{ {
"x": 1, "x": 1,
"f2": 1 "f": 3
}, },
"6\nE\n\n<i class='kb kb-Arrows-Right'></i>\n\n\n\n\n\nI" "6\n\n\n<i class='kb kb-Arrows-Right'></i>\n\n\n\n\n\nI"
], ],
[ [
{ {
@ -331,14 +331,14 @@
"t": "#267dff\n\n\n#c76c00\n\n\n\n\n\n000000\n#b906d6", "t": "#267dff\n\n\n#c76c00\n\n\n\n\n\n000000\n#b906d6",
"fa": [ "fa": [
0, 0,
1,
1,
0, 0,
1, 0,
1, 0,
1, 0,
1, 0,
1, 0,
0,
0,
0, 0,
2 2
] ]
@ -348,8 +348,7 @@
[ [
{ {
"y": -0.8999999999999999, "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<i class='fa fa-mouse-pointer'></i>\n\n<i class='kb kb-Arrows-Left'></i>\nMouse\n\n\n\n\nM" "*\n<i class='fa fa-mouse-pointer'></i>\n\n<i class='kb kb-Arrows-Left'></i>\nMouse\n\n\n\n\nM"
], ],
@ -357,25 +356,22 @@
{ {
"y": -0.7000000000000002, "y": -0.7000000000000002,
"x": 2, "x": 2,
"t": "#267dff\n#1fa12e\n\n\n\n\n\n\n000000\n000000", "t": "#267dff\n\n\n\n\n\n\n\n000000\n000000"
"f2": 1
}, },
"2\nS\n\n\n\n\n\n\n;\n," "2\n\n\n\n\n\n\n\n;\n,"
], ],
[ [
{ {
"y": -0.6499999999999999, "y": -0.6499999999999999,
"x": 1, "x": 1,
"t": "#267dff\n#1fa12e\n\n\n\n\n\n\n\n000000", "t": "#267dff\n\n\n\n\n\n\n\n\n000000"
"f2": 1
}, },
"1\nSW\n\n\n\n\n\n\n\nH", "1\n\n\n\n\n\n\n\n\nH",
{ {
"x": 1, "x": 1,
"t": "#267dff\n#1fa12e\n\n\n\n\n\n\n000000\n000000", "t": "#267dff\n\n\n\n\n\n\n\n000000\n000000"
"f2": 1
}, },
"3\nSE\n\n\n\n\n\n\n:\n." "3\n\n\n\n\n\n\n\n:\n."
], ],
[ [
{ {
@ -383,16 +379,14 @@
"x": 4, "x": 4,
"t": "#267dff", "t": "#267dff",
"sm": "alps", "sm": "alps",
"sb": "matias", "sb": "matias"
"f": 3
}, },
"=\n\n\n\n\n\n\n\n\n/" "=\n\n\n\n\n\n\n\n\n/"
], ],
[ [
{ {
"y": -0.9000000000000004, "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" "0\n\n\n\n\n\n\n\n\nK"
], ],
@ -432,33 +426,32 @@
"<i class='kb kb-Unicode-DeleteRight-Big'></i>\n\n\n\nNAV\n\n<i class='kb kb-Unicode-BackSpace-DeleteLeft-Big'></i>", "<i class='kb kb-Unicode-DeleteRight-Big'></i>\n\n\n\nNAV\n\n<i class='kb kb-Unicode-BackSpace-DeleteLeft-Big'></i>",
{ {
"x": 1, "x": 1,
"c": "#1cc700", "c": "#c76c00",
"t": "#267dff", "t": "#267dff",
"a": 4, "a": 4,
"fa": [ "fa": [
4 4
] ]
}, },
".\n\n\n<i class='kb kb-Arrows-Bottom-2'></i>\n\n\n\n\n\nGAME" ".\n\n\n<i class='kb kb-Arrows-Bottom-2'></i>\n\n\n\n\n\nNAV"
], ],
[ [
{ {
"y": -0.8650000000000002, "y": -0.8650000000000002,
"x": -1, "x": -1,
"c": "#cccccc", "c": "#cccccc",
"t": "#000000\n#1fa12e", "t": "#000000",
"fa": [ "a": 7,
4, "f": 3
2
]
}, },
"\nScr <i class='kb kb-Arrows-Bottom-4'></i>\n\n\n\n\n\n\n\nAlt" "Alt"
], ],
[ [
{ {
"y": -0.8849999999999998, "y": -0.8849999999999998,
"x": 4, "x": 4,
"t": "#267dff\n\n\n\n#b906d6", "t": "#267dff\n\n\n\n#b906d6",
"a": 4,
"f": 8, "f": 8,
"fa": [ "fa": [
4 4

Binary file not shown.

Before

Width:  |  Height:  |  Size: 148 KiB

After

Width:  |  Height:  |  Size: 123 KiB