Merge remote-tracking branch 'origin/master' into develop

10 files changed, 522 insertions, 0 deletions

diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/uqs/config.h b/keyboards/handwired/dactyl_manuform/5x6/keymaps/uqs/config.h
new file mode 100644
index 0000000000..4eca68c542
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/uqs/config.h
@@ -0,0 +1,11 @@
+// Copyright 2022 Ulrich Spörlein (@uqs)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#define USE_SERIAL
+
+#define RGBLED_NUM 12
+#define RGBLED_SPLIT {6,6}
+#define RGBLIGHT_LIMIT_VAL 127
+
+#define EE_HANDS
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/uqs/keymap.c b/keyboards/handwired/dactyl_manuform/5x6/keymaps/uqs/keymap.c
new file mode 100644
index 0000000000..211cd91e12
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/uqs/keymap.c
@@ -0,0 +1,170 @@
+// Copyright 2022 Ulrich Spörlein (@uqs)
+// SPDX-License-Identifier: GPL-2.0-or-later
+// vi:et sw=4 cc=5,15,25,35,45,55,65:
+
+#include "uqs.h"
+
+/*
+ * My custom layout macro that allows for easy diff(1) operations between
+ * various keyboards. It probably doesn't make sense to you.
+ */
+#define LAYOUT_uqs(               \
+    L00, L01, L02, L03, L04, L05, \
+    L10, L11, L12, L13, L14, L15, \
+    L20, L21, L22, L23, L24, L25, \
+    L30, L31, L32, L33, L34, L35, \
+              L42, L43,           \
+         L44, L45, L54,           \
+         L55, L52, L53,           \
+    R00, R01, R02, R03, R04, R05, \
+    R10, R11, R12, R13, R14, R15, \
+    R20, R21, R22, R23, R24, R25, \
+    R30, R31, R32, R33, R34, R35, \
+              R42, R43,           \
+         R51, R40, R41,           \
+         R50, R52, R53            \
+)                                 \
+LAYOUT_5x6(                       \
+  L00, L01, L02, L03, L04, L05,                          R00, R01, R02, R03, R04, R05, \
+  L10, L11, L12, L13, L14, L15,                          R10, R11, R12, R13, R14, R15, \
+  L20, L21, L22, L23, L24, L25,                          R20, R21, R22, R23, R24, R25, \
+  L30, L31, L32, L33, L34, L35,                          R30, R31, R32, R33, R34, R35, \
+            L42, L43,                                              R42, R43,           \
+                      L44, L45,                          R40, R41,                     \
+                                L54, L55,      R50, R51,                               \
+                                L52, L53,      R52, R53                                \
+)
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [L_QWER] = LAYOUT_uqs(
+     KC_GESC,  KC_1,     KC_2,     KC_3,     KC_4,     KC_5,
+     KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,
+     KC_LCTL,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,
+     KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,
+                         KC_LBRC,  KC_RBRC,
+     /*thumb*/ LT_EXTD_ESC, KC_SPC, LT_MOUSE_ALT_SHIFT_INS,
+      /*aux*/  KC_LEAD,  OSM_GUI,  KC_LALT,
+     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINUS,
+     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_BSLS,
+     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,
+     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  RSFT_T(KC_GRV),
+                         KC_MINS,  KC_EQL,
+     /*thumb*/ LT_FUNC_SHIFT_INS, KC_ENT, LT_NUM_BSPC,
+      /*aux*/  KC_RALT,  KC_APP,   KC_LEAD
+  ),
+
+  [L_WASD] = LAYOUT_uqs(
+     KC_ESC,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,
+     KC_T,     KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,
+     KC_G,     KC_LSFT,  KC_A,     KC_S,     KC_D,     KC_F,
+     KC_B,     KC_GRV,   KC_Z,     KC_X,     KC_C,     KC_V,
+                         KC_LBRC,  KC_RBRC,
+     /*thumb*/ KC_LCTL,  KC_SPC,   KC_R,
+      /*aux*/  A(KC_M),  KC_LGUI,  KC_LALT,
+     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_BSPC,
+     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_BSLS,
+     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,
+     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  RSFT_T(KC_GRV),
+                         KC_MINS,  KC_EQL,
+     /*thumb*/ DF(L_COLM), KC_ENT, KC_BSPC,
+      /*aux*/  KC_F5,    KC_RALT,  KC_APP
+  ),
+
+  [L_COLM] = LAYOUT_uqs(
+     KC_NO,    KC_NO,    KC_BTN2,  KC_BTN3,  KC_BTN1,  KC_NO,
+     KC_BTN2,  KC_Q,     KC_W,     KC_F,     KC_P,     KC_B,
+     KC_BTN1,  KC_G_A,   KC_A_R,   KC_S_S,   KC_C_T,   KC_G,
+     KC_BTN3,  KC_Z,     KC_X,     KC_C,     KC_D,     KC_V,
+                         MS_WHUP,  MS_WHDN,
+     /*thumb*/ LT_EXTD_ESC, SFT_T(KC_SPC), LT(L_MOUSE, KC_TAB),
+      /*aux*/  KC_LEAD,  OSM_GUI,  KC_LALT,
+     KC_NO,    KC_BTN1,  KC_BTN2,  KC_BTN3,  KC_NO,    KC_NO,
+     KC_J,     KC_L,     KC_U,     KC_Y,     KC_QUOT,  KC_NO,
+     KC_M,     KC_C_N,   KC_S_E,   KC_A_I,   KC_G_O,   KC_NO,
+     KC_K,     KC_H,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_NO,
+                         KC_NO,    KC_NO,
+     /*thumb*/ LT_FUNC_SHIFT_INS, KC_ENT, LT_NUM_BSPC,
+      /*aux*/  KC_LEAD,  KC_RALT,  KC_APP
+  ),
+
+  // Updated with inspiration from https://forum.colemak.com/topic/2014-extend-extra-extreme/
+  // I like the AltGr trick from https://stevep99.github.io/seniply/ and should probably incorporate some stuff from it.
+  [L_EXTD] = LAYOUT_uqs(
+     _______,  _______,  _______,  _______,  _______,  _______,
+     _______,  KC_BTN1,  KC_SCTAB, KC_PGUP,  KC_CTAB,  KC_LEAD,
+     _______,  OSM_GUI,  OSM_ALT,  OSM_SFT,  OSM_CTL,  KC_RALT,
+     _______,  ALT_TAB,  MS_WHUP,  MS_WHDN,  KC_PGDN,  INS_HARD,
+                         _______,  _______,
+     /*thumb*/ _______,  _______,  _______,
+      /*aux*/  _______,  _______,  _______,
+               /* ^^^^ can't be used */
+     _______,  _______,  _______,  _______,  _______,  _______,
+     KC_HOME,  KC_PGDN,  KC_PGUP,  KC_END,   KC_INS,   KC_NO,
+     KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  KC_DEL,   KC_NO,
+     WIN_LEFT, WIN_DN,   WIN_UP,   WIN_RGHT, KC_PSTE,  KC_NO,  // KC_PSTE works in XTerm to emulate middle-click
+                         _______,  _______,
+     /*thumb*/ _______,  _______,  KC_BSPC,
+      /*aux*/  _______,  _______,  _______
+               /* ^^^^ use these */
+  ),
+
+  // TODO: maybe swap # with ;, that way I can roll :w or :wq which I need
+  // often ... probably better to add a combo?
+  [L_NUM] = LAYOUT_uqs(
+     _______,  KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,
+     _______,  KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,   KC_PERC,
+     _______,  KC_SCLN,  KC_COLN,  KC_LCBR,  KC_LPRN,  KC_LBRC,
+     _______,  KC_CIRC,  KC_AMPR,  KC_RCBR,  KC_RPRN,  KC_RBRC,
+                         KC_GRV,   KC_TILDE,
+     /*thumb*/ KC_ESC,   KC_SPC,   KC_0,
+      /*aux*/  _______,  _______,  _______,
+               /* ^^^^ use these */
+     KC_NUMLOCK,KC_NO,   KC_NO,    KC_NO,    KC_NO,    KC_NO,
+     KC_EQUAL, KC_7,     KC_8,     KC_9,     KC_KP_PLUS,_______,
+     KC_KP_ASTERISK,KC_4,KC_5,     KC_6,     MINS_UNDSCR,_______,
+     KC_COMM,  KC_1,     KC_2,     KC_3,     KC_KP_SLASH,KC_KP_ENTER,  // Enter here, because thumb is occupied
+                         KC_0,     KC_KP_DOT,
+     /*thumb*/ _______,  _______,  _______,
+      /*aux*/  _______,  _______,  _______
+               /* ^^^^ can't be used */
+  ),
+
+  [L_FUNC] = LAYOUT_uqs(
+     _______,  KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,
+     _______,  KC_NO,    KC_MUTE,  KC_VOLD,  KC_VOLU,  DF(L_WASD),
+     _______,  KC_LGUI,  KC_LALT,  KC_LSFT,  KC_LCTL,  DF(L_QWER),
+     _______,  KC_NO,    KC_NO,    KC_NO,    KC_NO,    DF(L_COLM),
+                         KC_NO,    KC_NO,
+     /*thumb*/ _______,  _______,  _______,
+      /*aux*/  _______,  _______,  _______,
+               /* ^^^^ use these */
+     KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,
+     KC_PSCR,  KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_NO,
+     KC_SLCK,  KC_F4,    KC_F5,    KC_F6,    KC_F11,   KC_NO,
+     KC_PAUS,  KC_F1,    KC_F2,    KC_F3,    KC_F12,   KC_NO,
+                         KC_NO,    KC_NO,
+     /*thumb*/ _______,  _______,  _______,
+      /*aux*/  _______,  _______,  _______
+               /* ^^^^ can't be used */
+  ),
+
+  [L_MOUSE] = LAYOUT_uqs(
+     _______,  _______,  _______,  _______,  _______,  _______,
+     _______,  KC_NO,    KC_BTN2,  KC_BTN3,  KC_BTN1,  KC_VOLU,
+     _______,  KC_NO,    KC_ACL0,  KC_ACL1,  KC_ACL2,  KC_VOLD,
+     _______,  KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_MUTE,
+                         KC_NO,    KC_NO,
+     /*thumb*/ _______,  _______,  _______,
+      /*aux*/  _______,  _______,  _______,
+               /* ^^^^ can't be used */
+     _______,  _______,  _______,  _______,  _______,  _______,
+     _______,  _______,  KC_MS_UP, MS_WHUP,  _______,  _______,
+     MS_WHLEFT,KC_MS_L,  KC_MS_D,  KC_MS_R,  MS_WHRGHT,_______,
+     _______,  MS_WHDN,  KC_BTN3,  KC_BTN4,  KC_BTN5,  _______,
+                         KC_NO,    KC_NO,
+     /*thumb*/ KC_NO,    KC_BTN1,  KC_BTN2,
+      /*aux*/  _______,  _______,  _______
+               /* use these ^^^^ */
+  ),
+};
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/uqs/rules.mk b/keyboards/handwired/dactyl_manuform/5x6/keymaps/uqs/rules.mk
new file mode 100644
index 0000000000..2cd3745fa1
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/uqs/rules.mk
@@ -0,0 +1 @@
+#VIA_ENABLE = yes  # doesn't fit with 7 layers :/
diff --git a/keyboards/ploopyco/mouse/keymaps/uqs/keymap.c b/keyboards/ploopyco/mouse/keymaps/uqs/keymap.c
new file mode 100644
index 0000000000..564dad13df
--- /dev/null
+++ b/keyboards/ploopyco/mouse/keymaps/uqs/keymap.c
@@ -0,0 +1,36 @@
+// Copyright 2022 Ulrich Spörlein (@uqs)
+// SPDX-License-Identifier: GPL-2.0-or-later
+// vi:et sw=4:
+
+#include QMK_KEYBOARD_H
+
+enum custom_keycodes {
+    DBL_CLK_NO = SAFE_RANGE,
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        // This works fine in xev(1) or a browser, but not in the game where I
+        // would want it. Maybe need to increase the delay? Also needs to be
+        // rewritten to use Deferred Execution.
+        case DBL_CLK_NO:
+            if (record->event.pressed) {
+                tap_code(KC_BTN2);
+                wait_ms(150);
+                tap_code(KC_BTN2);
+                wait_ms(300);
+                tap_code(KC_N);
+            }
+            return false;
+    }
+    return true;
+}
+
+
+// Layout is:
+// left-most, M1, M3, M2, right-most, fwd, back (on side), tiny middle one
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(KC_E, KC_BTN1, KC_BTN3, KC_BTN2, KC_LSFT, KC_BTN4, KC_BTN5, DF(1)),  // shooters
+    [1] = LAYOUT(KC_1, KC_BTN1, KC_Y, KC_BTN2, DBL_CLK_NO, KC_N, KC_Y, DF(0)),        // stardew valley, sword on 1
+};
diff --git a/keyboards/ploopyco/mouse/keymaps/uqs/rules.mk b/keyboards/ploopyco/mouse/keymaps/uqs/rules.mk
new file mode 100644
index 0000000000..59222a688a
--- /dev/null
+++ b/keyboards/ploopyco/mouse/keymaps/uqs/rules.mk
@@ -0,0 +1 @@
+#VIA_ENABLE = yes
diff --git a/keyboards/preonic/keymaps/uqs/keymap.c b/keyboards/preonic/keymaps/uqs/keymap.c
new file mode 100644
index 0000000000..ec22890388
--- /dev/null
+++ b/keyboards/preonic/keymaps/uqs/keymap.c
@@ -0,0 +1,117 @@
+// Copyright 2022 Ulrich Spörlein (@uqs)
+// SPDX-License-Identifier: GPL-2.0-or-later
+// vi:et sw=4 cc=5,15,25,35,45,55,65:
+
+#include "uqs.h"
+
+/*
+ * My custom layout macro that allows for easy diff(1) operations between
+ * various keyboards. It probably doesn't make sense to you.
+ */
+#define LAYOUT_uqs(               \
+    k00, k01, k02, k03, k04, k05, \
+    k10, k11, k12, k13, k14, k15, \
+    k20, k21, k22, k23, k24, k25, \
+    k30, k31, k32, k33, k34, k35, \
+         k43, k44,                \
+    k40, k41, k42,                \
+    k06, k07, k08, k09, k0a, k0b, \
+    k16, k17, k18, k19, k1a, k1b, \
+    k26, k27, k28, k29, k2a, k2b, \
+    k36, k37, k38, k39, k3a, k3b, \
+              k46, k48,           \
+                   k49, k4a, k4b  \
+)                                 \
+LAYOUT_preonic_2x2u( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
+    k40, k41, k42, k43, k44,      k46,      k48, k49, k4a, k4b \
+)
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [L_QWER] = LAYOUT_uqs(
+     KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,
+     KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,
+     KC_LCTL,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,
+     KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,
+
+     /*thumb*/ LT_EXTD_ESC, KC_SPC,
+      /*aux*/  KC_NO,    KC_LGUI,  KC_LALT,
+     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINUS,
+     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_BSLS,
+     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,
+     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,
+     /*thumb*/ KC_ENT,   LT_NUM_BSPC,
+      /*aux*/  MO(L_FUNC), KC_NO,  KC_NO
+  ),
+  [L_EXTD] = LAYOUT_uqs(
+     KC_F11,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,
+     _______,  KC_BTN1,  KC_SCTAB, KC_PGUP,  KC_CTAB,  KC_LEAD,
+     _______,  OSM_GUI,  OSM_ALT,  OSM_SFT,  OSM_CTL,  KC_RALT,
+     _______,  ALT_TAB,  MS_WHUP,  MS_WHDN,  KC_PGDN,  INS_HARD,
+     /*thumb*/ _______,  _______,
+      /*aux*/  _______,  _______,  _______,
+               /* ^^^^ can't be used */
+     KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F12,
+     KC_HOME,  KC_PGDN,  KC_PGUP,  KC_END,   KC_INS,   KC_NO,
+     KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  KC_DEL,   KC_NO,
+     WIN_LEFT, WIN_DN,   WIN_UP,   WIN_RGHT, KC_PSTE,  KC_NO,
+     /*thumb*/ _______,  KC_BSPC,
+      /*aux*/  _______,  _______,  KC_ENTER
+               /* ^^^^ use these */
+  ),
+
+  [L_NUM] = LAYOUT_uqs(
+     KC_F11,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,
+     _______,  KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,   KC_PERC,
+     _______,  KC_SCLN,  KC_COLN,  KC_LCBR,  KC_LPRN,  KC_LBRC,
+     _______,  KC_CIRC,  KC_AMPR,  KC_RCBR,  KC_RPRN,  KC_RBRC,
+     /*thumb*/ KC_ESC,   _______,
+      /*aux*/  _______,  _______,  _______,
+               /* ^^^^ use these */
+     KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F12,
+     KC_EQUAL, KC_7,     KC_8,     KC_9,     KC_KP_PLUS,_______,
+     KC_KP_ASTERISK,KC_4,KC_5,     KC_6,     MINS_UNDSCR,_______,
+     KC_COMM,  KC_1,     KC_2,     KC_3,     KC_KP_SLASH,KC_KP_ENTER,  // Enter here, because thumb is occupied
+     /*thumb*/ _______,  _______,
+      /*aux*/  KC_0,     KC_KP_DOT, _______
+               /* ^^^^ can't be used */
+  ),
+
+  [L_FUNC] = LAYOUT_uqs(
+     _______,  KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,
+     _______,  KC_NO,    KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_NO,
+     _______,  KC_LGUI,  KC_LALT,  KC_LSFT,  KC_LCTL,  KC_NO,
+     _______,  KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,
+     /*thumb*/ _______,  _______,
+      /*aux*/  _______,  _______,  _______,
+               /* ^^^^ use these */
+     KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,
+     KC_PSCR,  KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_NO,
+     KC_SLCK,  KC_F4,    KC_F5,    KC_F6,    KC_F11,   KC_NO,
+     KC_PAUS,  KC_F1,    KC_F2,    KC_F3,    KC_F12,   KC_NO,
+     /*thumb*/ _______,  _______,
+      /*aux*/  _______,  _______,  _______
+               /* ^^^^ can't be used */
+  ),
+
+  [L_MOUSE] = LAYOUT_uqs(
+     KC_NO,    _______,  _______,  _______,  _______,  _______,
+     KC_NO,    KC_NO,    KC_BTN2,  KC_BTN3,  KC_BTN1,  KC_VOLU,
+     KC_NO,    KC_NO,    KC_ACL0,  KC_ACL1,  KC_ACL2,  KC_VOLD,
+     KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_MUTE,
+     /*thumb*/ _______,  _______,
+      /*aux*/  _______,  _______,  _______,
+               /* ^^^^ can't be used */
+     _______,  _______,  _______,  _______,  _______,  _______,
+     _______,  _______,  KC_MS_UP, MS_WHUP,  _______,  _______,
+     MS_WHLEFT,KC_MS_L,  KC_MS_D,  KC_MS_R,  MS_WHRGHT,_______,
+     _______,  MS_WHDN,  KC_BTN3,  KC_BTN4,  KC_BTN5,  _______,
+     /*thumb*/ KC_BTN1,  KC_BTN2,
+      /*aux*/  KC_NO,    KC_NO,    KC_NO
+               /* use these ^^^^ */
+  ),
+};
diff --git a/keyboards/preonic/keymaps/uqs/rules.mk b/keyboards/preonic/keymaps/uqs/rules.mk
new file mode 100644
index 0000000000..ca99fa107c
--- /dev/null
+++ b/keyboards/preonic/keymaps/uqs/rules.mk
@@ -0,0 +1,14 @@
+LTO_ENABLE=no
+AUDIO_ENABLE=no
+ENCODER_ENABLE=no
+
+# Broken with gcc >6, see https://github.com/qmk/qmk_firmware/issues/6753
+# (yes, different option, but I suspect the code has moved around)
+# This produces working firmware on Arch Linux with GCC 11, but is still broken
+# on Debian with 8.3.1
+RGBLIGHT_ENABLE=no
+RGB_MATRIX_ENABLE=no
+
+# not required, but helps on debian where there is a soft/hard float confusion.
+# but see above, gcc 8.3.1 still fucks up the firmware.
+USE_FPU=no
diff --git a/keyboards/splitkb/kyria/keymaps/uqs/config.h b/keyboards/splitkb/kyria/keymaps/uqs/config.h
new file mode 100644
index 0000000000..ae34b0e04d
--- /dev/null
+++ b/keyboards/splitkb/kyria/keymaps/uqs/config.h
@@ -0,0 +1,13 @@
+// Copyright 2022 Ulrich Spörlein (@uqs)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#ifdef RGBLIGHT_ENABLE
+  //#define RGBLIGHT_ANIMATIONS
+  #define RGBLIGHT_HUE_STEP 8
+  #define RGBLIGHT_SAT_STEP 8
+  #define RGBLIGHT_VAL_STEP 8
+  #define RGBLIGHT_LIMIT_VAL 150
+#endif
+
+#define EE_HANDS
diff --git a/keyboards/splitkb/kyria/keymaps/uqs/keymap.c b/keyboards/splitkb/kyria/keymaps/uqs/keymap.c
new file mode 100644
index 0000000000..53b6ee77b1
--- /dev/null
+++ b/keyboards/splitkb/kyria/keymaps/uqs/keymap.c
@@ -0,0 +1,158 @@
+// Copyright 2022 Ulrich Spörlein (@uqs)
+// SPDX-License-Identifier: GPL-2.0-or-later
+// vi:et sw=4 cc=5,15,25,35,45,55,65:
+
+#include "uqs.h"
+
+/*
+ * My custom layout macro that allows for easy diff(1) operations between
+ * various keyboards. It probably doesn't make sense to you.
+ */
+#define LAYOUT_uqs(               \
+    L00, L01, L02, L03, L04, L05, \
+    L12, L13, L14, L15, L16, L17, \
+    L24, L25, L26, L27, L28, L29, \
+              L40, L41,           \
+         L42, L43, L44,           \
+         L30, L31,                \
+    R06, R07, R08, R09, R10, R11, \
+    R18, R19, R20, R21, R22, R23, \
+    R34, R35, R36, R37, R38, R39, \
+              R48, R49,           \
+         R45, R46, R47,           \
+         R32, R33                 \
+)                                 \
+LAYOUT_stack(                     \
+    L00, L01, L02, L03, L04, L05,                   \
+    L12, L13, L14, L15, L16, L17,                   \
+    L24, L25, L26, L27, L28, L29, L30, L31,         \
+                   L40, L41, L42, L43, L44,         \
+                                                    \
+                  R06, R07, R08, R09, R10, R11,     \
+                  R18, R19, R20, R21, R22, R23,     \
+        R32, R33, R34, R35, R36, R37, R38, R39,     \
+        R45, R46, R47, R48, R49                     \
+)
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [L_QWER] = LAYOUT_uqs(
+     KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,
+     KC_LCTL,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,
+     KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,
+                         KC_LBRC,  KC_RBRC,
+     /*thumb*/ LT_EXTD_ESC, KC_SPC, LT_MOUSE_ALT_SHIFT_INS,
+      /*aux*/  OSM_GUI,  KC_LALT,
+     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_BSLS,
+     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,
+     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  RSFT_T(KC_GRV),
+                         KC_MINS,  KC_EQL,
+     /*thumb*/ LT_FUNC_SHIFT_INS, KC_ENT, LT_NUM_BSPC,
+      /*aux*/  KC_RALT,  KC_APP
+  ),
+
+  [L_WASD] = LAYOUT_uqs(
+     KC_T,     KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,
+     KC_G,     KC_LSFT,  KC_A,     KC_S,     KC_D,     KC_F,
+     KC_B,     KC_GRV,   KC_Z,     KC_X,     KC_C,     KC_V,
+                         KC_LBRC,  KC_RBRC,
+     /*thumb*/ KC_LCTL,  KC_SPC,   KC_R,
+      /*aux*/  OSM_GUI,  KC_LALT,
+     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_BSLS,
+     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,
+     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  RSFT_T(KC_GRV),
+                         KC_MINS,  KC_EQL,
+     /*thumb*/ DF(L_COLM), KC_ENT, KC_BSPC,
+      /*aux*/  KC_RALT,  KC_APP
+  ),
+
+  [L_COLM] = LAYOUT_uqs(
+     KC_BTN2,  KC_Q,     KC_W,     KC_F,     KC_P,     KC_B,
+     KC_BTN1,  KC_G_A,   KC_A_R,   KC_S_S,   KC_C_T,   KC_G,
+     KC_BTN3,  KC_Z,     KC_X,     KC_C,     KC_D,     KC_V,
+                         MS_WHUP,  MS_WHDN,
+     /*thumb*/ LT_EXTD_ESC, SFT_T(KC_SPC), LT(L_MOUSE, KC_TAB),
+      /*aux*/  OSM_GUI,  KC_LALT,
+     KC_J,     KC_L,     KC_U,     KC_Y,     KC_QUOT,  KC_NO,
+     KC_M,     KC_C_N,   KC_S_E,   KC_A_I,   KC_G_O,   KC_NO,
+     KC_K,     KC_H,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_NO,
+                         KC_NO,    KC_NO,
+     /*thumb*/ LT_FUNC_SHIFT_INS, KC_ENT, LT_NUM_BSPC,
+      /*aux*/  KC_RALT,  KC_APP
+  ),
+
+  // Updated with inspiration from https://forum.colemak.com/topic/2014-extend-extra-extreme/
+  // I like the AltGr trick from https://stevep99.github.io/seniply/ and should probably incorporate some stuff from it.
+  [L_EXTD] = LAYOUT_uqs(
+     _______,  KC_BTN1,  KC_SCTAB, KC_PGUP,  KC_CTAB,  KC_LEAD,
+     _______,  OSM_GUI,  OSM_ALT,  OSM_SFT,  OSM_CTL,  KC_RALT,
+     _______,  ALT_TAB,  MS_WHUP,  MS_WHDN,  KC_PGDN,  INS_HARD,
+                         _______,  _______,
+     /*thumb*/ _______,  _______,  _______,
+      /*aux*/  _______,  _______,
+               /* ^^^^ can't be used */
+     KC_HOME,  KC_PGDN,  KC_PGUP,  KC_END,   KC_INS,   KC_NO,
+     KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  KC_DEL,   KC_NO,
+     WIN_LEFT, WIN_DN,   WIN_UP,   WIN_RGHT, KC_PSTE,  KC_NO,  // KC_PSTE works in XTerm to emulate middle-click
+                         _______,  _______,
+     /*thumb*/ _______,  _______,  KC_BSPC,
+      /*aux*/  _______,  _______
+               /* ^^^^ use these */
+  ),
+
+  // TODO: maybe swap # with ;, that way I can roll :w or :wq which I need
+  // often ... probably better to add a combo?
+  [L_NUM] = LAYOUT_uqs(
+     _______,  KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,   KC_PERC,
+     _______,  KC_SCLN,  KC_COLN,  KC_LCBR,  KC_LPRN,  KC_LBRC,
+     _______,  KC_CIRC,  KC_AMPR,  KC_RCBR,  KC_RPRN,  KC_RBRC,
+                         KC_GRV,   KC_TILDE,
+     /*thumb*/ KC_ESC,   KC_SPC,   KC_0,
+      /*aux*/  _______,_______,
+               /* ^^^^ use these */
+
+     KC_EQUAL, KC_7,     KC_8,     KC_9,     KC_KP_PLUS,_______,
+     KC_KP_ASTERISK,KC_4,KC_5,     KC_6,     MINS_UNDSCR,_______,
+     KC_COMM,  KC_1,     KC_2,     KC_3,     KC_KP_SLASH,KC_KP_ENTER,  // Enter here, because thumb is occupied
+                         KC_0,     KC_KP_DOT,
+     /*thumb*/ _______,  _______,  _______,
+      /*aux*/  _______,  _______
+               /* ^^^^ can't be used */
+  ),
+
+  [L_FUNC] = LAYOUT_uqs(
+     _______,  KC_NO,    KC_MUTE,  KC_VOLD,  KC_VOLU,  DF(L_WASD),
+     _______,  KC_LGUI,  KC_LALT,  KC_LSFT,  KC_LCTL,  DF(L_QWER),
+     _______,  KC_NO,    KC_NO,    KC_NO,    KC_NO,    DF(L_COLM),
+                         KC_NO,    KC_NO,
+     /*thumb*/ KC_NO,    KC_NO,    KC_NO,
+      /*aux*/  _______,  _______,
+               /* ^^^^ use these */
+
+     KC_PSCR,  KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_NO,
+     KC_SLCK,  KC_F4,    KC_F5,    KC_F6,    KC_F11,   KC_NO,
+     KC_PAUS,  KC_F1,    KC_F2,    KC_F3,    KC_F12,   KC_NO,
+                         KC_NO,    KC_NO,
+     /*thumb*/ _______,  _______,  _______,
+      /*aux*/  _______,  _______
+               /* ^^^^ can't be used */
+  ),
+
+  [L_MOUSE] = LAYOUT_uqs(
+     _______,  KC_NO,    KC_BTN2,  KC_BTN3,  KC_BTN1,  KC_VOLU,
+     _______,  KC_NO,    KC_ACL0,  KC_ACL1,  KC_ACL2,  KC_VOLD,
+     _______,  KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_MUTE,
+                         KC_NO,    KC_NO,
+     /*thumb*/ _______,  _______,  _______,
+      /*aux*/  _______,  _______,
+               /* ^^^^ can't be used */
+
+     _______,  _______,  KC_MS_UP, MS_WHUP,  _______,  _______,
+     MS_WHLEFT,KC_MS_L,  KC_MS_D,  KC_MS_R,  MS_WHRGHT,_______,
+     _______,  MS_WHDN,  KC_BTN3,  KC_BTN4,  KC_BTN5,  _______,
+                         KC_NO,    KC_NO,
+     /*thumb*/ KC_NO,    KC_BTN1,  KC_BTN2,
+      /*aux*/  _______,  _______
+               /* use these ^^^^ */
+  ),
+};
diff --git a/keyboards/splitkb/kyria/keymaps/uqs/rules.mk b/keyboards/splitkb/kyria/keymaps/uqs/rules.mk
new file mode 100644
index 0000000000..517f469b6d
--- /dev/null
+++ b/keyboards/splitkb/kyria/keymaps/uqs/rules.mk
@@ -0,0 +1 @@
+OLED_ENABLE = no