qmk_me

commit ce7775a2d0567b087ddc42aaeda0ecc461fcd797
parent 51ff02538a641c890d4f3177920f174f10db4126
Author: Jack Sangdahl <jack@pngu.org>
Date:   Sun,  4 Jan 2026 11:55:02 -0700

Remove f60 keymap, add qaz keymap

Diffstat:
D
keyboards/bioi/f60/keymaps/jack/keymap.c
 | 
39
---------------------------------------
A
keyboards/tominabox1/qaz/keymaps/jack/keymap.c
 | 
32
++++++++++++++++++++++++++++++++
A
keyboards/tominabox1/qaz/keymaps/jack/rules.mk
 | 
2
++
M
keyboards/xyz60/keyboard.json
 | 
2
+-
M
keyboards/xyz60/keymaps/jack/keymap.c
 | 
8
++++----
M
qmk.json
 | 
4
++--
M
users/jack/jack.h
 | 
2
+-

7 files changed, 42 insertions(+), 47 deletions(-)
diff --git a/keyboards/bioi/f60/keymaps/jack/keymap.c b/keyboards/bioi/f60/keymaps/jack/keymap.c
@@ -1,39 +0,0 @@
-// Copyright 2025 jack@pngu.org
-// SPDX-License-Identifier: GPL-2.0-or-later
-#include "jack.h"
-#define ___NONE___                                                             \
-  _______, _______, _______, _______, _______, _______, _______, _______,      \
-      _______, _______, _______, _______, _______
-
-// clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [LAYER0] = LAYOUT_jack_60_ts(
-    _______, ___NONE___,
-    _______, ___LAYER00___, KC_BSPC, _______, XXXXXXX,
-    _______, ___LAYER01___, _______, _______,
-    _______, ___LAYER02___, _______,
-    _______, _______, KC_ESC,  SPC_L1, BSPC_L2, _______, _______
-  ),
-  [LAYER1] = LAYOUT_jack_60_ts(
-    _______, ___NONE___,
-    _______, ___LAYER10___, _______, _______, _______,
-    _______, ___LAYER11___, _______, _______,
-    _______, ___LAYER12___, _______,
-    _______, _______, _______, _______, _______, _______, _______
-  ),
-  [LAYER2] = LAYOUT_jack_60_ts(
-    _______, ___NONE___,
-    _______, ___LAYER20___, _______, _______, _______,
-    _______, ___LAYER21___, _______, _______,
-    _______, ___LAYER22___, _______,
-    _______, _______, _______, _______, _______, _______, _______
-  ),
-  [LAYER3] = LAYOUT_jack_60_ts(
-    _______, ___NONE___,
-    _______, ___LAYER30___, _______, _______, _______,
-    _______, ___LAYER31___, _______, _______,
-    _______, ___LAYER32___, _______,
-    _______, _______, _______, _______, _______, _______, _______
-  )
-};
-// clang-format on
diff --git a/keyboards/tominabox1/qaz/keymaps/jack/keymap.c b/keyboards/tominabox1/qaz/keymaps/jack/keymap.c
@@ -0,0 +1,32 @@
+// Copyright 2025 jack@pngu.org
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include "jack.h"
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [LAYER0] = LAYOUT_jack_sp(
+    ___LAYER00___,
+    ___LAYER01___,
+    KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT,
+    _______, _______, KC_ESC, SPC_L1, BSPC_L2, QK_REP, _______, _______
+  ),
+  [LAYER1] = LAYOUT_jack_sp(
+    ___LAYER10___,
+    ___LAYER11___,
+    KC_VOLU, TD(PLY_NXT_PRV), _______, _______, _______, _______, _______, _______, KC_SLSH,
+    _______, _______, ___LAYER13___, _______, _______
+  ),
+  [LAYER2] = LAYOUT_jack_sp(
+    ___LAYER20___,
+    ___LAYER21___,
+    KC_TILD, KC_PLUS, KC_LBRC, KC_RBRC, KC_PERC, KC_AT, KC_COLN, _______, _______,
+    _______, _______, ___LAYER23___, _______, _______
+  ),
+  [LAYER3] = LAYOUT_jack_sp(
+    ___LAYER30___,
+    ___LAYER31___,
+    KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9,
+    _______, _______, ___LAYER33___, _______, _______
+  )
+};
+// clang-format on
diff --git a/keyboards/tominabox1/qaz/keymaps/jack/rules.mk b/keyboards/tominabox1/qaz/keymaps/jack/rules.mk
@@ -0,0 +1,2 @@
+RGBLIGHT_ENABLE = no
+BOOTLOADER = atmel-dfu
diff --git a/keyboards/xyz60/keyboard.json b/keyboards/xyz60/keyboard.json
@@ -15,7 +15,7 @@
         "vid": "0x6A73"
     },
     "layouts": {
-        "LAYOUT_60_ansi_tsangan": {
+        "LAYOUT": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
                 {"matrix": [0, 1], "x": 0, "y": 0},
diff --git a/keyboards/xyz60/keymaps/jack/keymap.c b/keyboards/xyz60/keymaps/jack/keymap.c
@@ -7,28 +7,28 @@
 
 // clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [LAYER0] = LAYOUT_jack_60_ts(
+  [LAYER0] = LAYOUT_jack(
     _______, ___NONE___,
     _______, ___LAYER00___, KC_BSPC, _______, XXXXXXX,
     _______, ___LAYER01___, _______, _______,
     _______, ___LAYER02___, _______,
     _______, _______, KC_ESC,  SPC_L1, BSPC_L2, _______, _______
   ),
-  [LAYER1] = LAYOUT_jack_60_ts(
+  [LAYER1] = LAYOUT_jack(
     _______, ___NONE___,
     _______, ___LAYER10___, _______, _______, _______,
     _______, ___LAYER11___, _______, _______,
     _______, ___LAYER12___, _______,
     _______, _______, _______, _______, _______, _______, _______
   ),
-  [LAYER2] = LAYOUT_jack_60_ts(
+  [LAYER2] = LAYOUT_jack(
     _______, ___NONE___,
     _______, ___LAYER20___, _______, _______, _______,
     _______, ___LAYER21___, _______, _______,
     _______, ___LAYER22___, _______,
     _______, _______, _______, _______, _______, _______, _______
   ),
-  [LAYER3] = LAYOUT_jack_60_ts(
+  [LAYER3] = LAYOUT_jack(
     _______, ___NONE___,
     _______, ___LAYER30___, _______, _______, _______,
     _______, ___LAYER31___, _______, _______,
diff --git a/qmk.json b/qmk.json
@@ -1,11 +1,11 @@
 {
     "userspace_version": "1.1",
     "build_targets": [
-        ["bioi/f60", "jack"],
         ["boardsource/beiwagon", "jack"],
         ["mkh_studio/bully", "jack"],
         ["projectcain/relic", "jack"],
         ["projectcain/vault35", "jack"],
-        ["splitkb/kyria/rev2", "jack"]
+        ["splitkb/kyria/rev2", "jack"],
+        ["tominabox1/qaz", "jack"]
     ]
 }
diff --git a/users/jack/jack.h b/users/jack/jack.h
@@ -90,6 +90,6 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record);
 #define ___LAYER33___ _______, _______, _______, _______
 // clang-format on
 
-#define LAYOUT_jack_60_ts(...) LAYOUT_60_ansi_tsangan(__VA_ARGS__)
+#define LAYOUT_jack_sp(...) LAYOUT_split_space(__VA_ARGS__)
 #define LAYOUT_jack_all(...) LAYOUT_all(__VA_ARGS__)
 #define LAYOUT_jack(...) LAYOUT(__VA_ARGS__)