Merge upstream master to 2022 Q4 breaking change

23 files changed, 0 insertions, 1312 deletions

diff --git a/keyboards/lazydesigners/bolt/config.h b/keyboards/lazydesigners/bolt/config.h
deleted file mode 100644
index 341abfbc53..0000000000
--- a/keyboards/lazydesigners/bolt/config.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-Copyright 2020 LAZYDESIGNERS
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 12
-
-#define MATRIX_ROW_PINS { F0, C7, B6, D5 }
-#define MATRIX_COL_PINS { F1, F4, F5, F6, F7, C6, B3, B7, D0, D3, D2, D1 }
-
-#define DIODE_DIRECTION COL2ROW
-
-/* RBG underglow */
-#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-	#define RGBLIGHT_SLEEP
-	#define RGBLED_NUM 13
-	/* #define RGBLIGHT_HUE_STEP 8 */
-	/* #define RGBLIGHT_SAT_STEP 8 */
-	/* #define RGBLIGHT_VAL_STEP 8 */
-#endif
diff --git a/keyboards/lazydesigners/bolt/keymaps/default/keymap.c b/keyboards/lazydesigners/bolt/keymaps/default/keymap.c
deleted file mode 100644
index c1f9870ad6..0000000000
--- a/keyboards/lazydesigners/bolt/keymaps/default/keymap.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright 2020 LAZYDESIGNERS
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-#define LT2_TAB LT(2, KC_TAB)
-#define LT1_SPC LT(1, KC_SPC)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(
-               QK_GESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-               LT2_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
-               KC_LSFT,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,             KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_UP,   MO(2),
-               KC_LCTL,  KC_LALT,                   KC_LGUI, LT1_SPC,          KC_SPC,  LT1_SPC,                   KC_LEFT, KC_DOWN, KC_RGHT
-             ),
-    [1] = LAYOUT(
-               QK_BOOT,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                      KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_NO,
-               KC_INS,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                     KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
-               KC_NO,    KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,           KC_F12,  KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
-               KC_VOLD,  KC_MUTE,                   KC_VOLU, KC_TRNS,          KC_TRNS, KC_NO,                     KC_NO,   KC_NO,   KC_NO
-             ),
-    [2] = LAYOUT(
-               QK_BOOT,    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,                     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
-               KC_NO,    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,                     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
-               KC_NO,    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,            KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
-               KC_NO,    KC_NO,                     KC_NO,   KC_NO,            KC_NO,   KC_NO,                     KC_NO,   KC_NO,   KC_NO
-             ),
-};
diff --git a/keyboards/lazydesigners/bolt/keymaps/via/keymap.c b/keyboards/lazydesigners/bolt/keymaps/via/keymap.c
deleted file mode 100644
index 11c4a8409d..0000000000
--- a/keyboards/lazydesigners/bolt/keymaps/via/keymap.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright 2020 LAZYDESIGNERS
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(
-               QK_GESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-               KC_TAB,   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
-               KC_LSFT,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,             KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_UP,   MO(2),
-               KC_LCTL,  KC_LALT,                   KC_LGUI, KC_SPC,           KC_SPC,  MO(1),                     KC_LEFT, KC_DOWN, KC_RGHT
-             ),
-    [1] = LAYOUT(
-               QK_BOOT,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                      KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_NO,
-               KC_INS,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                     KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
-               KC_NO,    KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,           KC_F12,  KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
-               KC_VOLD,  KC_MUTE,                   KC_VOLU, KC_TRNS,          KC_TRNS, KC_NO,                     KC_NO,   KC_NO,   KC_NO  
-             ),
-    [2] = LAYOUT(
-               QK_BOOT,    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,                     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
-               KC_NO,    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,                     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
-               KC_NO,    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,            KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
-               KC_NO,    KC_NO,                     KC_NO,   KC_NO,            KC_NO,   KC_NO,                     KC_NO,   KC_NO,   KC_NO
-             ),
-    [3] = LAYOUT(
-               KC_NO,    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,                     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
-               KC_NO,    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,                     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
-               KC_NO,    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,            KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO, 
-               KC_NO,    KC_NO,                     KC_NO,   KC_NO,            KC_NO,   KC_NO,                     KC_NO,   KC_NO,   KC_NO   
-             ),   
-};
diff --git a/keyboards/lazydesigners/dimple/config.h b/keyboards/lazydesigners/dimple/config.h
deleted file mode 100644
index 87e9167712..0000000000
--- a/keyboards/lazydesigners/dimple/config.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-Copyright 2019 Erovia
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 12
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D0, D1, D2, D3 }
-#define MATRIX_COL_PINS { B0, B1, B2, B3, D4, D6, D7, B4, B5, B6, C6, C7 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/* RBG underglow */
-#define RGB_DI_PIN B7
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-	#define RGBLIGHT_SLEEP
-	#define RGBLED_NUM 50
-	/* #define RGBLIGHT_HUE_STEP 8 */
-	/* #define RGBLIGHT_SAT_STEP 8 */
-	/* #define RGBLIGHT_VAL_STEP 8 */
-#endif
diff --git a/keyboards/lazydesigners/dimple/staggered/info.json b/keyboards/lazydesigners/dimple/staggered/info.json
deleted file mode 100644
index cdce3c767c..0000000000
--- a/keyboards/lazydesigners/dimple/staggered/info.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "keyboard_name": "Dimple", 
-    "manufacturer": "LazyDesigners",
-    "url": "http://lazydesigners.cn", 
-    "maintainer": "Erovia", 
-    "usb": {
-        "vid": "0x4C44",
-        "pid": "0x0040",
-        "device_version": "0.0.1"
-    }
-}
diff --git a/keyboards/lazydesigners/dimple/staggered/keymaps/default/keymap.c b/keyboards/lazydesigners/dimple/staggered/keymaps/default/keymap.c
deleted file mode 100644
index 3e0c6340f6..0000000000
--- a/keyboards/lazydesigners/dimple/staggered/keymaps/default/keymap.c
+++ /dev/null
@@ -1,130 +0,0 @@
-/* Copyright 2019 Erovia
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-enum custom_layers {
-	_QWERTY,
-	_LOWER,
-	_RAISE,
-	_ADJUST
-};
-
-// Act as Shift on hold and as CapsLock on tap
-#define SFT_CPS LSFT_T(KC_CAPS)
-// Left space on tap, LOWER on hold
-#define SPC_LOW LT(_LOWER, KC_SPC)
-// Left space on tap, UPPER on hold
-#define SPC_UPR LT(_RAISE, KC_SPC)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/*
- * ,---------------------------------------------------------------.
- * |Esc | Q  | W  | E  | R  | T  | Y  | U  | I  | O  | P  |  Bspc  |
- * |---------------------------------------------------------------|
- * | Tab  | A  | S  | D  | F  | G  | H  | J  | K  | L  | '  |Enter |
- * |---------------------------------------------------------------|
- * | Shift  | Z  | X  | C  | V  | B  | N  | M  | ,  | Up |    .    |
- * |---------------------------------------------------------------|
- *      |Ctrl|Gui |Alt | Spc/Lwr |   Spc/Rse   |Left|Down|Rght|
- *      `-----------------------------------------------------'
- */
-
-	[_QWERTY] = LAYOUT(
-		QK_GESC, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-		KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_QUOT, KC_ENT,
-		SFT_CPS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_UP,   KC_DOT,
-		KC_LCTL, KC_LGUI, KC_LALT, SPC_LOW,  SPC_UPR,  KC_LEFT, KC_DOWN, KC_RGHT
-	),
-
-/*
- * ,---------------------------------------------------------------.
- * | ~  | !  | @  | #  | $  | %  | ^  | &  | *  | (  | )  |        |
- * |---------------------------------------------------------------|
- * | Del  | F1 | F2 | F3 | F4 | F5 | F6 | _  | +  | {  | }  |  |   |
- * |---------------------------------------------------------------|
- * |        | F7 | F8 | F9 |F10 |F11 |F12 |    | ;  |PgUp|   /     |
- * |---------------------------------------------------------------|
- *      |    |    |    |         |             |Home|PgDn|End |
- *      `-----------------------------------------------------'
- */
-
-	[_LOWER] = LAYOUT(
-		KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_NO,
-		KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
-		KC_NO,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NO,   KC_SCLN, KC_PGUP, KC_SLSH,
-		KC_NO,   KC_NO,   KC_NO,   KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END
-	),
-
-/*
- * ,---------------------------------------------------------------.
- * | `  | 1  | 2  | 3  | 4  | 5  | 6  | 7  | 8  | 9  | 0  |        |
- * |---------------------------------------------------------------|
- * | Ins  | F1 | F2 | F3 | F4 | F5 | F6 | -  | =  | [  | ]  |  \   |
- * |---------------------------------------------------------------|
- * |        | F7 | F8 | F9 |F10 |F11 |F12  |    |    |   |         |
- * |---------------------------------------------------------------|
- *      |VolD|Mute|VolU|         |             |    |    |    |
- *      `-----------------------------------------------------'
- */
-
-	[_RAISE] = LAYOUT(
-		KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_NO,
-		KC_INS,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
-		KC_NO,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NO,   KC_NO,   KC_NO,   KC_NO,
-		KC_VOLD, KC_MUTE, KC_VOLU, KC_TRNS, KC_TRNS, KC_NO,   KC_NO,   KC_NO
-	),
-
-/*
- * ,---------------------------------------------------------------.
- * |EEPR|RST |    |    |    |    |    |    |    |    |    |        |
- * |---------------------------------------------------------------|
- * |      |    |    |    |    |    |    |    |    |    |    |      |
- * |---------------------------------------------------------------|
- * |        |    |    |    |    |    |     |    |    |   |         |
- * |---------------------------------------------------------------|
- *      |RGB-|RGB |RGB+|         |             |    |    |    |
- *      `-----------------------------------------------------'
- */
-
-	[_ADJUST] = LAYOUT(
-		EE_CLR,  QK_BOOT, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
-		KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
-		KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
-		RGB_VAD, RGB_TOG, RGB_VAI, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO
-	),
-};
-
-#ifdef KEYBOARD_lazydesigner_dimple_staggered_rev1
-layer_state_t layer_state_set_user(layer_state_t state) {
-	state = update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-	switch (get_highest_layer(state)) {
-		case _LOWER:
-			rgblight_sethsv_noeeprom(HSV_GREEN);
-			break;
-		case _RAISE:
-			rgblight_sethsv_noeeprom(HSV_GOLD);
-			break;
-		case _ADJUST:
-			rgblight_sethsv_noeeprom(HSV_RED);
-			break;
-		default:
-			rgblight_sethsv_noeeprom(HSV_WHITE);
-			break;
-	}
-	return state;
-}
-#endif
diff --git a/keyboards/lazydesigners/dimple/staggered/keymaps/erovia/keymap.c b/keyboards/lazydesigners/dimple/staggered/keymaps/erovia/keymap.c
deleted file mode 100644
index 1f8d3d5969..0000000000
--- a/keyboards/lazydesigners/dimple/staggered/keymaps/erovia/keymap.c
+++ /dev/null
@@ -1,162 +0,0 @@
-/* Copyright 2019 Erovia
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-#include "erovia.h"
-
-// Left space on tap, LOWER on hold
-#define SPC_LOW LT(_LOWER, KC_TAB)
-// Left space on tap, UPPER on hold
-#define SPC_UPR LT(_RAISE, KC_SPC)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/*
- * ,---------------------------------------------------------------.
- * | `  | Q  | W  | E  | R  | T  | Y  | U  | I  | O  | P  |  Bspc  |
- * |---------------------------------------------------------------|
- * | Esc  | A  | S  | D  | F  | G  | H  | J  | K  | L  | '  |  .   |
- * |---------------------------------------------------------------|
- * | Shift  | Z  | X  | C  | V  | B  | N  | M  | ,  | .  |  Enter  |
- * |---------------------------------------------------------------|
- *      |Ctrl|Gui |Alt | Spc/Lwr |   Spc/Rse   |    |    |    |
- *      `-----------------------------------------------------'
- */
-
-	[_QWERTY] = LAYOUT(
-		KC_GRV,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-		VIM_ESC, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_QUOT, KC_DOT,
-		TD_SHFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,   TD_ENTR,
-		KC_LCTL, KC_LGUI, KC_LALT, SPC_LOW,  SPC_UPR,  KC_NO, KC_NO, KC_NO
-	),
-
-/*
- * ,---------------------------------------------------------------.
- * | `  | Q  | W  | E  | R  | T  | Y  | U  | I  | O  | P  |  Bspc  |
- * |---------------------------------------------------------------|
- * | Esc  | A  | S  | D  | F  | G  | H  | J  | K  | L  | '  |  '   |
- * |---------------------------------------------------------------|
- * | Shift  | Z  | X  | C  | V  | B  | N  | M  | ,  | .  |  Enter  |
- * |---------------------------------------------------------------|
- *      |Ctrl|Gui |Alt | Spc/Lwr |   Spc/Rse   |    |    |    |
- *      `-----------------------------------------------------'
- */
-
-	[_COLEMAK] = LAYOUT(
-		KC_GRV,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_B,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN,    KC_BSPC,
-		VIM_ESC, KC_A,    KC_R,    KC_S,    KC_T,    KC_G,    KC_M,    KC_N,    KC_E,    KC_I,    KC_O,       KC_QUOT,
-		TD_SHFT, KC_Z,    KC_X,    KC_C,    KC_D,    KC_V,    KC_K,    KC_H,    KC_COMM, KC_DOT,  TD_ENTR,
-		KC_LCTL, KC_LGUI, KC_LALT, SPC_LOW,  SPC_UPR,  KC_NO, KC_NO, KC_NO
-	),
-
-/*
- * ,---------------------------------------------------------------.
- * | ~  | !  | @  | #  | $  | %  | ^  | &  | *  | (  | )  |        |
- * |---------------------------------------------------------------|
- * | Del  | F1 | F2 | F3 | F4 | F5 | F6 | _  | +  | {  | }  |  |   |
- * |---------------------------------------------------------------|
- * |        | F7 | F8 | F9 |F10 |F11 |F12 |    | ;  |PgUp|   /     |
- * |---------------------------------------------------------------|
- *      |    |    |    |         |             |Home|PgDn|End |
- *      `-----------------------------------------------------'
- */
-
-	[_LOWER] = LAYOUT(
-		KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_TRNS,
-		KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
-		KC_NO,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NO,   KC_SCLN, KC_PGUP, KC_SLSH,
-		KC_NO,   KC_NO,   KC_NO,   KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END
-	),
-
-/*
- * ,---------------------------------------------------------------.
- * | `  | 1  | 2  | 3  | 4  | 5  | 6  | 7  | 8  | 9  | 0  |        |
- * |---------------------------------------------------------------|
- * | Ins  | F1 | F2 | F3 | F4 | F5 | F6 | -  | =  | [  | ]  |  \   |
- * |---------------------------------------------------------------|
- * |        | F7 | F8 | F9 |F10 |F11 |F12  |    |    |   |         |
- * |---------------------------------------------------------------|
- *      |VolD|Mute|VolU|         |             |    |    |    |
- *      `-----------------------------------------------------'
- */
-
-	[_RAISE] = LAYOUT(
-		KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_TRNS,
-		KC_INS,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
-		KC_NO,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NO,   KC_NO,   KC_NO,   KC_NO,
-		KC_VOLD, KC_MUTE, KC_VOLU, KC_TRNS, KC_TRNS, KC_NO,   KC_NO,   KC_NO
-	),
-
-/*
- * ,---------------------------------------------------------------.
- * |EEPR|RST |    |    |    |    |    |    |    |    |    |        |
- * |---------------------------------------------------------------|
- * |Leader|    |    |    |    |    |    |    |    |    |    |      |
- * |---------------------------------------------------------------|
- * |        |    |    |    |    |    |     |    |    |   |         |
- * |---------------------------------------------------------------|
- *      |RGB-|RGB |RGB+|         |             |    |    |    |
- *      `-----------------------------------------------------'
- */
-
-	[_ADJUST] = LAYOUT(
-		EE_CLR,  QK_BOOT, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
-		QK_LEAD, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   QWERTY,  COLEMAK, KC_NO,   KC_NO,   KC_NO,   KC_NO,
-		KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
-		RGB_VAD, RGB_TOG, RGB_VAI, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO
-	),
-
-/*
- * ,---------------------------------------------------------------.
- * |    |    |    |    |    |    |    |    |    |    |    |        |
- * |---------------------------------------------------------------|
- * |      |    |    |    |    |    | H  | J  | K  | L  |    |      |
- * |---------------------------------------------------------------|
- * |        |    |    |    |    |    |     |    |    |Up |         |
- * |---------------------------------------------------------------|
- *      |    |    |    |         |             |Left|Down|Rght|
- *      `-----------------------------------------------------'
- */
-
-	[_VIM] = LAYOUT(
-		EE_CLR,  QK_BOOT, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
-		KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_H,    KC_J,    KC_K,    KC_L,    KC_NO,   KC_NO,
-		KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_UP,   KC_NO,
-		RGB_VAD, RGB_TOG, RGB_VAI, KC_NO,   KC_NO,   KC_LEFT, KC_DOWN, KC_RGHT
-	),
-};
-
-layer_state_t layer_state_set_keymap(layer_state_t state) {
-	state = update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-	switch (biton32(state)) {
-		case _LOWER:
-			rgblight_sethsv_noeeprom(HSV_GREEN);
-			break;
-		case _RAISE:
-			rgblight_sethsv_noeeprom(HSV_GOLD);
-			break;
-		case _ADJUST:
-			rgblight_sethsv_noeeprom(HSV_RED);
-			break;
-		default:
-			rgblight_sethsv_noeeprom(HSV_WHITE);
-			break;
-	}
-	return state;
-}
-
-void keyboard_post_init_user(void) {
-	dimple_led_off();
-}
diff --git a/keyboards/lazydesigners/dimple/staggered/keymaps/via/keymap.c b/keyboards/lazydesigners/dimple/staggered/keymaps/via/keymap.c
deleted file mode 100644
index 70498628ef..0000000000
--- a/keyboards/lazydesigners/dimple/staggered/keymaps/via/keymap.c
+++ /dev/null
@@ -1,23 +0,0 @@
-#include QMK_KEYBOARD_H
-
-/* THIS FILE WAS GENERATED!
- *
- * This file was generated by QMK CLI. You may or may not want to
- * edit it directly.
- */
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[0] = LAYOUT(QK_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, KC_ENT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_UP, KC_DOT, KC_LCTL, KC_LGUI, KC_LALT, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT),
-	[1] = LAYOUT(KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO),
-	[2] = LAYOUT(KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO),
-	[3] = LAYOUT(KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO)
-};
-
-bool led_update_user(led_t led_state) {
-    if (led_state.caps_lock) {
-        dimple_led_on();
-    } else {
-        dimple_led_off();
-    }
-    return false;
-}
diff --git a/keyboards/lazydesigners/dimple/staggered/rev1/info.json b/keyboards/lazydesigners/dimple/staggered/rev1/info.json
deleted file mode 100644
index 7fe8c59ccb..0000000000
--- a/keyboards/lazydesigners/dimple/staggered/rev1/info.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"label":"Esc", "x":0, "y":0, "matrix": [0, 0]},
-                {"label":"Q", "x":1, "y":0, "matrix": [0, 1]},
-                {"label":"W", "x":2, "y":0, "matrix": [0, 2]},
-                {"label":"E", "x":3, "y":0, "matrix": [0, 3]},
-                {"label":"R", "x":4, "y":0, "matrix": [0, 4]},
-                {"label":"T", "x":5, "y":0, "matrix": [0, 5]},
-                {"label":"Y", "x":6, "y":0, "matrix": [0, 6]},
-                {"label":"U", "x":7, "y":0, "matrix": [0, 7]},
-                {"label":"I", "x":8, "y":0, "matrix": [0, 8]},
-                {"label":"O", "x":9, "y":0, "matrix": [0, 9]},
-                {"label":"P", "x":10, "y":0, "matrix": [0, 10]},
-                {"label":"Back<br>Space", "x":11, "y":0, "w":1.5, "matrix": [0, 11]},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.25, "matrix": [1, 0]},
-                {"label":"A", "x":1.25, "y":1, "matrix": [1, 1]},
-                {"label":"S", "x":2.25, "y":1, "matrix": [1, 2]},
-                {"label":"D", "x":3.25, "y":1, "matrix": [1, 3]},
-                {"label":"F", "x":4.25, "y":1, "matrix": [1, 4]},
-                {"label":"G", "x":5.25, "y":1, "matrix": [1, 5]},
-                {"label":"H", "x":6.25, "y":1, "matrix": [1, 6]},
-                {"label":"J", "x":7.25, "y":1, "matrix": [1, 7]},
-                {"label":"K", "x":8.25, "y":1, "matrix": [1, 8]},
-                {"label":"L", "x":9.25, "y":1, "matrix": [1, 9]},
-                {"label":"'", "x":10.25, "y":1, "matrix": [1, 10]},
-                {"label":"Enter", "x":11.25, "y":1, "w":1.25, "matrix": [1, 11]},
-
-                {"label":"Shift", "x":0, "y":2, "w":1.75, "matrix": [2, 0]},
-                {"label":"Z", "x":1.75, "y":2, "matrix": [2, 1]},
-                {"label":"X", "x":2.75, "y":2, "matrix": [2, 2]},
-                {"label":"C", "x":3.75, "y":2, "matrix": [2, 3]},
-                {"label":"V", "x":4.75, "y":2, "matrix": [2, 4]},
-                {"label":"B", "x":5.75, "y":2, "matrix": [2, 5]},
-                {"label":"N", "x":6.75, "y":2, "matrix": [2, 6]},
-                {"label":"M", "x":7.75, "y":2, "matrix": [2, 7]},
-                {"label":",", "x":8.75, "y":2, "matrix": [2, 8]},
-                {"label":"Up", "x":9.75, "y":2, "matrix": [2, 9]},
-                {"label":".", "x":10.75, "y":2, "w":1.75, "matrix": [2, 10]},
-
-                {"label":"Ctrl", "x":0.75, "y":3, "matrix": [3, 0]},
-                {"label":"Gui", "x":1.75, "y":3, "matrix": [3, 2]},
-                {"label":"Alt", "x":2.75, "y":3, "matrix": [3, 3]},
-                {"label":"Space", "x":3.75, "y":3, "w":2.25, "matrix": [3, 4]},
-                {"label":"Space", "x":6, "y":3, "w":2.75, "matrix": [3, 6]},
-                {"label":"Left", "x":8.75, "y":3, "matrix": [3, 7]},
-                {"label":"Down", "x":9.75, "y":3, "matrix": [3, 8]},
-                {"label":"Right", "x":10.75, "y":3, "matrix": [3, 9]}
-            ]
-        }
-    }
-}
diff --git a/keyboards/lazydesigners/dimple/staggered/rev2/info.json b/keyboards/lazydesigners/dimple/staggered/rev2/info.json
deleted file mode 100644
index 7fe8c59ccb..0000000000
--- a/keyboards/lazydesigners/dimple/staggered/rev2/info.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"label":"Esc", "x":0, "y":0, "matrix": [0, 0]},
-                {"label":"Q", "x":1, "y":0, "matrix": [0, 1]},
-                {"label":"W", "x":2, "y":0, "matrix": [0, 2]},
-                {"label":"E", "x":3, "y":0, "matrix": [0, 3]},
-                {"label":"R", "x":4, "y":0, "matrix": [0, 4]},
-                {"label":"T", "x":5, "y":0, "matrix": [0, 5]},
-                {"label":"Y", "x":6, "y":0, "matrix": [0, 6]},
-                {"label":"U", "x":7, "y":0, "matrix": [0, 7]},
-                {"label":"I", "x":8, "y":0, "matrix": [0, 8]},
-                {"label":"O", "x":9, "y":0, "matrix": [0, 9]},
-                {"label":"P", "x":10, "y":0, "matrix": [0, 10]},
-                {"label":"Back<br>Space", "x":11, "y":0, "w":1.5, "matrix": [0, 11]},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.25, "matrix": [1, 0]},
-                {"label":"A", "x":1.25, "y":1, "matrix": [1, 1]},
-                {"label":"S", "x":2.25, "y":1, "matrix": [1, 2]},
-                {"label":"D", "x":3.25, "y":1, "matrix": [1, 3]},
-                {"label":"F", "x":4.25, "y":1, "matrix": [1, 4]},
-                {"label":"G", "x":5.25, "y":1, "matrix": [1, 5]},
-                {"label":"H", "x":6.25, "y":1, "matrix": [1, 6]},
-                {"label":"J", "x":7.25, "y":1, "matrix": [1, 7]},
-                {"label":"K", "x":8.25, "y":1, "matrix": [1, 8]},
-                {"label":"L", "x":9.25, "y":1, "matrix": [1, 9]},
-                {"label":"'", "x":10.25, "y":1, "matrix": [1, 10]},
-                {"label":"Enter", "x":11.25, "y":1, "w":1.25, "matrix": [1, 11]},
-
-                {"label":"Shift", "x":0, "y":2, "w":1.75, "matrix": [2, 0]},
-                {"label":"Z", "x":1.75, "y":2, "matrix": [2, 1]},
-                {"label":"X", "x":2.75, "y":2, "matrix": [2, 2]},
-                {"label":"C", "x":3.75, "y":2, "matrix": [2, 3]},
-                {"label":"V", "x":4.75, "y":2, "matrix": [2, 4]},
-                {"label":"B", "x":5.75, "y":2, "matrix": [2, 5]},
-                {"label":"N", "x":6.75, "y":2, "matrix": [2, 6]},
-                {"label":"M", "x":7.75, "y":2, "matrix": [2, 7]},
-                {"label":",", "x":8.75, "y":2, "matrix": [2,