Merge upstream master to 2022 Q4 breaking change

12 files changed, 0 insertions, 441 deletions

diff --git a/keyboards/hillside/46/keymaps/default/config.h b/keyboards/hillside/46/keymaps/default/config.h
deleted file mode 100644
index d209c914bf..0000000000
--- a/keyboards/hillside/46/keymaps/default/config.h
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright 2022 Michael McCoyd (@mmccoyd)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-// Some boards have issues detecting handedness using the vbus voltage.
-// Such as Elite-C v3, but not v3.1 on. Also apparently some ProMicro boards.
-// For those boands, use usb detection instead.
-// #define SPLIT_USB_DETECT
diff --git a/keyboards/hillside/46/keymaps/default/keymap.json b/keyboards/hillside/46/keymaps/default/keymap.json
deleted file mode 100644
index b24aafa32b..0000000000
--- a/keyboards/hillside/46/keymaps/default/keymap.json
+++ /dev/null
@@ -1,88 +0,0 @@
-{    "version": 1,
-    "notes": "",
-    "documentation": "\"This file is a QMK Configurator export. You can import this at <https://config.qmk.fm>. It can also be used directly with QMK's source code.\n\nTo setup your QMK environment check out the tutorial: <https://docs.qmk.fm/#/newbs>\n\nYou can convert this file to a keymap.c using this command: `qmk json2c {keymap}`\n\nYou can compile this keymap using this command: `qmk compile {keymap}`\"\n",
-    "keyboard": "hillside/46",
-    "keymap": "default",
-    "layout": "LAYOUT",
-    "layers": [
-        ["KC_GRV"      , "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_LCTL"     , "KC_Z"    , "KC_X"         , "KC_C"   , "KC_V"   , "KC_B"      , "KC_ESC",
-         "ANY(CW_TOGG)", "KC_N"    , "KC_M"         , "KC_COMM", "KC_DOT" , "KC_SLSH"   , "KC_QUOT",
-
-         "KC_LGUI"     , "KC_LALT" , "OSM(MOD_LSFT)", "MO(3)",
-         "MO(4)"       , "KC_SPC"  , "KC_LALT"      , "KC_RGUI"
-
-        ],
-        ["KC_GRV"      , "KC_QUOT" , "KC_COMM"      , "KC_DOT" , "KC_P"   , "KC_Y",
-         "KC_F"        , "KC_G"    , "KC_C"         , "KC_R"   , "KC_L"   , "KC_BSPC",
-
-         "KC_TAB"      , "KC_A"    , "KC_O"         , "KC_E"   , "KC_U"   , "KC_I",
-         "KC_D"        , "KC_H"    , "KC_T"         , "KC_N"   , "KC_S"   , "KC_ENT",
-
-         "KC_LCTL"     , "KC_SCLN" , "KC_Q"         , "KC_J"   , "KC_K"   , "KC_X"      , "KC_ESC",
-         "ANY(CW_TOGG)", "KC_B"    , "KC_M"         , "KC_W"   , "KC_V"   , "KC_Z"      , "KC_SLSH",
-
-         "KC_LGUI"     , "KC_LALT" , "OSM(MOD_LSFT)", "MO(3)",
-         "MO(4)"       , "KC_SPC"  , "KC_LALT"      , "KC_RGUI"
-
-        ],
-        ["KC_GRV"      , "KC_Q"    , "KC_W"         , "KC_F"   , "KC_P"   , "KC_B",
-         "KC_J"        , "KC_L"    , "KC_U"         , "KC_Y"   , "KC_SCLN", "KC_BSPC",
-
-         "KC_TAB"      , "KC_A"    , "KC_R"         , "KC_S"   , "KC_T"   , "KC_G",
-         "KC_M"        , "KC_N"    , "KC_E"         , "KC_I"   , "KC_O"   , "KC_ENT",
-
-         "KC_LCTL"     , "KC_Z"    , "KC_TRNS"      , "KC_C"   , "KC_D"   , "KC_V"      , "KC_ESC",
-         "ANY(CW_TOGG)", "KC_K"    , "KC_H"         , "KC_COMM", "KC_DOT" , "KC_SLSH"   , "KC_QUOT",
-
-         "KC_LGUI"     , "KC_LALT" , "OSM(MOD_LSFT)", "MO(3)",
-         "MO(4)"       , "KC_SPC"  , "KC_LALT"      , "KC_RGUI"
-
-        ],
-        ["LCTL(KC_C)"  , "KC_1"    , "KC_2"         , "KC_3"   , "KC_4"   , "KC_5",
-         "KC_6"        , "KC_7"    , "KC_8"         , "KC_9"   , "KC_0"   , "KC_TRNS",
-
-         "LCTL(KC_X)"  , "KC_LGUI" , "KC_LALT"      , "KC_LCTL", "KC_LSFT", "LCTL(KC_V)",
-         "KC_PGUP"     , "KC_LEFT" , "KC_UP"        , "KC_DOWN", "KC_RGHT", "KC_PGDN",
-
-         "KC_TRNS"     , "KC_F1"   , "KC_F2"        , "KC_F3"  , "KC_F4"  , "KC_F5"     , "LCTL(KC_Z)",
-         "LCTL(KC_Y)"  , "KC_F6"   , "KC_F7"        , "KC_F8"  , "KC_F9"  , "KC_F10"    , "KC_RCTL",
-
-         "KC_TRNS"     , "KC_TRNS" , "KC_TRNS"      , "KC_TRNS",
-         "MO(5)"       , "KC_TRNS" , "KC_TRNS"      , "KC_TRNS"
-
-        ],
-        ["KC_INS"      , "KC_EXLM" , "KC_AT"        , "KC_HASH", "KC_DLR" , "KC_PERC",
-         "KC_CIRC"     , "KC_AMPR" , "KC_ASTR"      , "KC_LPRN", "KC_RPRN", "KC_DEL",
-
-         "KC_NO"       , "KC_BSLS" , "KC_MINS"      , "KC_EQL" , "KC_LBRC", "KC_RBRC",
-         "KC_HOME"     , "KC_RSFT" , "KC_RCTL"      , "KC_LALT", "KC_RGUI", "KC_END",
-
-         "KC_TRNS"     , "KC_PIPE" , "KC_UNDS"      , "KC_PLUS", "KC_LCBR", "KC_RCBR"   , "OSM(MOD_RALT)",
-         "KC_APP"      , "KC_MUTE" , "KC_VOLD"      , "KC_VOLU", "KC_MPLY", "KC_NO"     , "KC_RCTL",
-
-         "KC_TRNS"     , "KC_TRNS" , "KC_TRNS"      , "MO(5)",
-         "KC_TRNS"     , "KC_TRNS" , "KC_TRNS"      , "KC_TRNS"
-
-        ],
-        ["KC_NO"       , "DF(0)"   , "DF(1)"        , "DF(2)"  , "AG_SWAP", "CG_SWAP",
-         "KC_NO"       , "KC_F11"  , "KC_F12"       , "KC_PSCR", "KC_NO"  , "EE_CLR",
-
-         "KC_NO"       , "KC_NO"   , "KC_BRID"      , "KC_BRIU", "AG_NORM", "CG_NORM",
-         "RGB_MOD"     , "RGB_VAI" , "RGB_HUI"      , "RGB_SAI", "KC_NO"  , "KC_NO",
-
-         "KC_NO"       , "KC_LGUI" , "KC_LALT"      , "KC_LCTL", "KC_LSFT", "KC_NO"     , "KC_NO",
-         "RGB_TOG"     , "RGB_RMOD", "RGB_VAD"      , "RGB_HUD", "RGB_SAD", "KC_NO"     , "QK_BOOT",
-
-         "KC_NO"       , "KC_NO"   , "KC_NO"        , "KC_TRNS",
-         "KC_TRNS"     , "KC_NO"   , "KC_NO"        , "KC_NO"
-
-        ]
-    ],
-    "author": "@mmccoyd"
-}
diff --git a/keyboards/hillside/46/keymaps/default/readme.md b/keyboards/hillside/46/keymaps/default/readme.md
deleted file mode 100644
index 64356ebaa7..0000000000
--- a/keyboards/hillside/46/keymaps/default/readme.md
+++ /dev/null
@@ -1,136 +0,0 @@
-# Hillside 46 Default Keymap
-
-For easier initial use, this keymap follows the layout of more standard keyboards where possible. It is a starting point for you to tweak over time to suit your preferences better. You can easily customize it with the [QMK configurator](https://config.qmk.fm/#/hillside/46/LAYOUT).
-
-Some of its key features are:
-
-- Numbers and symbols along the top row of their layers for familiarity.
-- Comfortable modifier and function or symbol combinations on the non-base layers using modifiers on the home row of the symbol and number/function layers.
-- A layer with both navigation and editing keys allows document editing without leaving the layer.
-- QWERTY, Colemak-DH and Dvorak base layer options.
-
-## Base Layer
-
-
-![Base QWERTY layer](https://imgur.com/C2kxwOuh.png)
-
-The base layer provides a very standard key layout with four differences:
-
-- Numbers, functions and most symbols are accessed with number and symbol shift keys.
-- Escape is on the upper left thumb.
-- The left thumb has a shift key that affects the next key pressed. So to get 'A', press and release the thumb shift key, press 'a'. You can also hold the key down, and it will work like a standard shift key.
-- Caps word toggles a mode that capitalizes all letters until something other than a letter, digit, dash, underscore, delete or backspace is typed. The mode also times out five seconds after the last key press.
-- The Menu and AltGr keys are on a layer.
-
-The default layout is QWERTY with alternatives of Dvorak and Colemak-DH, and the alt/option and win/command key locations are swappable for windows or mac.
-
-<details>
-<summary>Details of Dvorak and Colemak-DH</summary>
-The Dvorak and Colemak-DH base layers have identical non-alpha and non-symbol keys as the QWERTY base layer.
-![Base Dvorak layer](https://imgur.com/5gGk2rOh.png)
-![Base Colemak layer](https://imgur.com/xExBB8eh.png)
-</details>
-
-
-## Navigation, Editing, Number and Function Layer
-
-![Navigation layer](https://imgur.com/Obx6oRTh.png)
-
-Holding down the Nav/Edit key accesses the navigation, editing, number and function layer:
-
-- Numbers are along the top row, and function keys are on the bottom.
-- The arrow keys on the right can be combined with the home row modifiers on the left to easily move around and select text, which can then be cut, copied and pasted.
-
-
-## Symbol and Media Layer
-
-![Symbol layer](https://imgur.com/mzcB2JFh.png)
-
-Holding down the SYM key accesses the symbol layer:
-
-- The symbols not present on the base layer are along the top row and left side, arranged similarly to a large keyboard.
-- Duplicates of the modifier keys are along the right home keys. This positioning allows a very comfortable combination of any set of modifiers plus a key on the left side of the board.
-- Forward delete is on the upper right, taking backspace's place.
-- The Window OS application menu key is on the right upper thumb. 
-- The AltGr key affects the next key pressed so that it can combine with a key on any layer. It changes the meaning of the next key pressed after the AltGr key is pressed and released. For example, to do AltGr-h: press SYM, press and release AltGr, release SYM, press and release h.
-
-
-## Adjust Layer
-
-![Adjust layer](https://imgur.com/r3Ip7hxh.png)
-
-Simultaneously holding down the Sym and Nav/Edit keys enables keys to adjust keyboard settings:
-
-- The base layer can be set to QWERTY, Colemak-DH or Dvorak, although the keyboard reverts to QWERTY each time it is plugged in.
-- Alt/option and GUI/command can be swapped for mac users or restored to the windows norm.
-- The backlight LEDs can be enabled, disabled, and controlled.
-- BOOT allows loading new firmware, such as for keymap changes.
-
-## Make it Yours
-
-If you are coming from a traditional keyboard,
-  with a large set of physical keys,
-  learning to use a column staggered (ergo) and layer-based keyboard,
-  which uses layers instead of finger reaches to access numbers, symbols and functions,
-  will be an adjustment for your muscle memory and your mental keyboard map.
-This default layout tries to simplify that adjustment by keeping things in the expected spots when possible.
-
-Yet this layout is only a decent compromise and is not optimal for each user.
-The online [configurator](https://config.qmk.fm/#/hillside/46/LAYOUT) makes it easy to tweak this layout to your needs.
-You can add additional layers or completely switch around what these do.
-
-A good metaphor is to think of your keymap as a bonsai tree that you tweak slightly over time
-  in response to ideas of how it might serve you better.
-
-Some changes you might consider making:
-
-- If you are on a mac, switch the editing keys from ctrl-x to cmd-x.
-- Put some of your most-used key combinations on the unused keys
-  on the symbol layer.
-- Instead of holding down the thumb key to keep the symbol layer active,
-  you could use a one-shot layer key.
-  One-shot modifiers are likely less stress on your hands and may even be faster.
-  You would still be able to hold it down instead.
-- Instead of holding down the key for the number layer,
-  you could make it a layer toggle.
-
-Here are some other keymaps for inspiration and ideas:
-
-- The [Ferris default](https://github.com/qmk/qmk_firmware/tree/master/keyboards/ferris/keymaps/default) uses more advanced features as it has far fewer keys to work with.
-- The [Miryoku](https://github.com/manna-harbour/miryoku/tree/master/docs/reference) keymap ensures that all modifiers are comfortably available with each character key.
-- The [Kyria default](https://github.com/qmk/qmk_firmware/tree/master/keyboards/splitkb/kyria/keymaps/default) has different keymap choices.
-
-## Why no keymap.c
-
-The online configurator provides a straightforward visual way
-   to work with a simple layout and uses a .json keymap format.
-So this default ```keymap.json``` was created with the online configurator.
-
-If you wish, you can edit the ```keymap.json``` directly in a text editor,  compile it and flash it.
-
-Or, you can use the graphical configurator to edit the keymap. To do that:
-
-- Open the [QMK configurator](https://config.qmk.fm/#/hillside/46/LAYOUT)
-- Using the green up arrow button, load the keymap from ```qmk_firmware/keyboards/hillside/46/keymaps/default/keymap.json```
-- Make the changes you wish to the layout
-- Save the keymap using the green down arrow button.
-- Move the downloaded keymap back into your QMK repository 
-     at the same location as above.
-- Rename it back to keymap.json
-- Compile and flash the firmware.
-
-You can combine a .json based keymap with more advanced features
-  specified in .c files with a bit more complexity.
-For example, see
- [pierrec83's Kyria map](https://github.com/qmk/qmk_firmware/tree/master/keyboards/splitkb/kyria/keymaps/pierrec83).
- 
-
-### Pretty Printing
- 
-The QMK configurator's .json download has only one key per line,
-so it is hard to visualize the keymap if editing manually.
-If you want, the Hillside git repo has a pretty-printing script for the keymap.json file.
- 
-As with anything downloaded from the internet, you should take some steps to assure yourself that the script will not harm your computer nor steal your data. The script is short, so reading it should at least convince you it is rearranging and printing the keymap feed to it, not reading any banking data on your computer.
-See the [Hillside wiki](https://github.com/mmccoyd/hillside/wiki) for the script.
-
diff --git a/keyboards/hillside/46/keymaps/default/rules.mk b/keyboards/hillside/46/keymaps/default/rules.mk
deleted file mode 100644
index 4711d2ff74..0000000000
--- a/keyboards/hillside/46/keymaps/default/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-CAPS_WORD_ENABLE = yes
diff --git a/keyboards/hillside/46/keymaps/default_dot_c/config.h b/keyboards/hillside/46/keymaps/default_dot_c/config.h
deleted file mode 100644
index d209c914bf..0000000000
--- a/keyboards/hillside/46/keymaps/default_dot_c/config.h
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright 2022 Michael McCoyd (@mmccoyd)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-// Some boards have issues detecting handedness using the vbus voltage.
-// Such as Elite-C v3, but not v3.1 on. Also apparently some ProMicro boards.
-// For those boands, use usb detection instead.
-// #define SPLIT_USB_DETECT
diff --git a/keyboards/hillside/46/keymaps/default_dot_c/keymap.c b/keyboards/hillside/46/keymaps/default_dot_c/keymap.c
deleted file mode 100644
index 8a1a7cfbe2..0000000000
--- a/keyboards/hillside/46/keymaps/default_dot_c/keymap.c
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright 2022 Michael McCoyd (@mmccoyd)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-
-enum layers {
-    _QWERTY = 0,
-    _NAV,
-    _SYM,
-    _ADJUST,
-};
-
-#define xxxxxxx KC_NO
-
-#define LY_NAV MO(_NAV)
-#define LY_SYM MO(_SYM)
-#define LY_ADJ MO(_ADJUST)
-#define ALT_GR OSM(MOD_RALT)
-#define OSM_SFT OSM(MOD_LSFT)
-#define PLY_PAU  KC_MEDIA_PLAY_PAUSE
-
-#define UNDO LCTL(KC_Z)
-#define CUT  LCTL(KC_X)
-#define COPY LCTL(KC_C)
-#define PASTE LCTL(KC_V)
-#define REDO LCTL(KC_Y)
-// (For OS X, you'll want to change these editing keys to LGUI(KC_Z) etc.)
-
-
-// clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_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,
-     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_LCTL, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_ESC,                       CW_TOGG, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_QUOT,
-                                         KC_LGUI, KC_LALT, OSM_SFT, LY_NAV ,    LY_SYM , KC_SPC , KC_LALT, KC_RGUI
-    ),
-    [_NAV] = LAYOUT(
-     COPY   , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   ,                                        KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , _______,
-     CUT    , KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, PASTE  ,                                        KC_PGUP, KC_LEFT, KC_UP  , KC_DOWN, KC_RGHT, KC_PGDN,
-     _______, KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , UNDO   ,                      REDO   , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_RCTL,
-                                         _______, _______, _______, _______,    LY_ADJ , _______, _______, _______
-    ),
-    [_SYM] = LAYOUT(
-     KC_INS,  KC_EXLM, KC_AT  , KC_HASH, KC_DLR , KC_PERC,                                        KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL,
-     xxxxxxx, KC_BSLS, KC_MINS, KC_EQL , KC_LBRC, KC_RBRC,                                        KC_HOME, KC_RSFT, KC_RCTL, KC_LALT, KC_RGUI, KC_END,
-     _______, KC_PIPE, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, ALT_GR ,                      KC_APP , KC_MUTE, KC_VOLD, KC_VOLU, KC_MPLY, xxxxxxx, KC_RCTL,
-                                         _______, _______, _______, LY_ADJ ,    _______, _______, _______, _______ 
-    ),
-    [_ADJUST] = LAYOUT(
-     xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, AG_SWAP, CG_SWAP,                                        xxxxxxx, KC_F11 , KC_F12 , KC_PSCR, xxxxxxx, EE_CLR,
-     xxxxxxx, xxxxxxx, KC_BRID, KC_BRIU, AG_NORM, CG_NORM,                                        RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, xxxxxxx, xxxxxxx, 
-     xxxxxxx, KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, xxxxxxx, xxxxxxx,                     RGB_TOG, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, xxxxxxx, QK_BOOT,
-                                         xxxxxxx, xxxxxxx, xxxxxxx, _______,    _______, xxxxxxx, xxxxxxx, xxxxxxx
-    ),
-};
-
-//  Template:
-//    [_INDEX] = LAYOUT(
-//     _______, _______, _______, _______, _______, _______,                                        _______, _______, _______, _______, _______, _______, 
-//     _______, _______, _______, _______, _______, _______,                                        _______, _______, _______, _______, _______, _______, 
-//     _______, _______, _______, _______, _______, _______, _______,                      _______, _______, _______, _______, _______, _______, _______,
-//                                         _______, _______, _______, _______,    _______, _______, _______, _______
-//    ),
diff --git a/keyboards/hillside/46/keymaps/default_dot_c/readme.md b/keyboards/hillside/46/keymaps/default_dot_c/readme.md
deleted file mode 100644
index 713a4f383b..0000000000
--- a/keyboards/hillside/46/keymaps/default_dot_c/readme.md
+++ /dev/null
@@ -1,25 +0,0 @@
-# Default Hillside 46 Layout (in .c format)
-
-This layout is for those who prefer defining their layout in a keymap.c,
-  instead of graphically with a keymap.json.
-It is the same as the [default keymap.json layout](https://github.com/qmk/qmk_firmware/blob/master/keyboards/hillside/46/keymaps/default),
-  except for having only a QWERTY base layer.
-  
-The make and flash commands are
-
-```
-make hillside/46:default_dot_c
-make hillside/46:default_doc_c:flash
-
-```
-
-It also serves as a simple, clean layout 
-  to verify that the configuration and switches work.
-Use the [QMK Configurator Tester](https://config.qmk.fm/#/test) 
- to see that the switches produce output.
-All the keys should register on the layout tester 
-  except for the caps word and the two layer keys.
-The LEDs should glow a nice red.
-If they do not, you may need to clear the persistent EEPROM settings with the
-  EE_CLR key on the adjust layer,
-  or enable them with the RGB_TOG key.
diff --git a/keyboards/hillside/46/keymaps/default_dot_c/rules.mk b/keyboards/hillside/46/keymaps/default_dot_c/rules.mk
deleted file mode 100644
index 4711d2ff74..0000000000
--- a/keyboards/hillside/46/keymaps/default_dot_c/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-CAPS_WORD_ENABLE = yes
diff --git a/keyboards/hillside/46/keymaps/manna-harbour_miryoku/config.h b/keyboards/hillside/46/keymaps/manna-harbour_miryoku/config.h
deleted file mode 100644
index fa808ef681..0000000000
--- a/keyboards/hillside/46/keymaps/manna-harbour_miryoku/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2022 Davide Masserut (@mssdvd)
-// Copyright 2019 Manna Harbour
-// https://github.com/manna-harbour/miryoku
-
-// 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
-
-#define XXX KC_NO
-
-// clang-format off
-#if defined MIRYOKU_MAPPING_EXTENDED_THUMBS
-#define LAYOUT_miryoku( \
-     K00, K01, K02, K03, K04,                          K05, K06, K07, K08, K09, \
-     K10, K11, K12, K13, K14,                          K15, K16, K17, K18, K19, \
-     K20, K21, K22, K23, K24,                          K25, K26, K27, K28, K29, \
-     N30, N31, K32, K33, K34,                          K35, K36, K37, N38, N39 \
-) \
-LAYOUT( \
-XXX, K00, K01, K02, K03, K04,                     K05, K06, K07, K08, K09, XXX, \
-XXX, K10, K11, K12, K13, K14,                     K15, K16, K17, K18, K19, XXX, \
-XXX, K20, K21, K22, K23, K24, XXX,      XXX, K25, K26, K27, K28, K29, XXX, \
-               XXX, K32, K33, K34,      K35, K36, K37, XXX \
-)
-#else
-#define LAYOUT_miryoku( \
-     K00, K01, K02, K03, K04,                          K05, K06, K07, K08, K09, \
-     K10, K11, K12, K13, K14,                          K15, K16, K17, K18, K19, \
-     K20, K21, K22, K23, K24,                          K25, K26, K27, K28, K29, \
-     N30, N31, K32, K33, K34,                          K35, K36, K37, N38, N39 \
-) \
-LAYOUT( \
-XXX, K00, K01, K02, K03, K04,                     K05, K06, K07, K08, K09, XXX, \
-XXX, K10, K11, K12, K13, K14,                     K15, K16, K17, K18, K19, XXX, \
-XXX, K20, K21, K22, K23, K24, XXX,      XXX, K25, K26, K27, K28, K29, XXX, \
-               K32, K33, K34, XXX,      XXX, K35, K36, K37 \
-)
-#endif
diff --git a/keyboards/hillside/46/keymaps/manna-harbour_miryoku/keymap.c b/keyboards/hillside/46/keymaps/manna-harbour_miryoku/keymap.c
deleted file mode 100644
index dbab7f9820..0000000000
--- a/keyboards/hillside/46/keymaps/manna-harbour_miryoku/keymap.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2019 Manna Harbour
-// https://github.com/manna-harbour/miryoku
-
-// 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/>.
diff --git a/keyboards/hillside/46/keymaps/via/keymap.c b/keyboards/hillside/46/keymaps/via/keymap.c
deleted file mode 100644
index 8a1a7cfbe2..0000000000
--- a/keyboards/hillside/46/keymaps/via/keymap.c
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright 2022 Michael McCoyd (@mmccoyd)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-
-enum layers {
-    _QWERTY = 0,
-    _NAV,
-    _SYM,
-    _ADJUST,
-};
-
-#define xxxxxxx KC_NO
-
-#define LY_NAV MO(_NAV)
-#define LY_SYM MO(_SYM)
-#define LY_ADJ MO(_ADJUST)
-#define ALT_GR OSM(MOD_RALT)
-#define OSM_SFT OSM(MOD_LSFT)
-#define PLY_PAU  KC_MEDIA_PLAY_PAUSE
-
-#define UNDO LCTL(KC_Z)
-#define CUT  LCTL(KC_X)
-#define COPY LCTL(KC_C)
-#define PASTE LCTL(KC_V)
-#define REDO LCTL(KC_Y)
-// (For OS X, you'll want to change these editing keys to LGUI(KC_Z) etc.)
-
-
-// clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_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,
-     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_LCTL, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_ESC,                       CW_TOGG, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_QUOT,
-                                         KC_LGUI, KC_LALT, OSM_SFT, LY_NAV ,    LY_SYM , KC_SPC , KC_LALT, KC_RGUI
-    ),
-    [_NAV] = LAYOUT(
-     COPY   , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   ,                                        KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , _______,
-     CUT    , KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, PASTE  ,                                        KC_PGUP, KC_LEFT, KC_UP  , KC_DOWN, KC_RGHT, KC_PGDN,
-     _______, KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , UNDO   ,                      REDO   , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_RCTL,
-                                         _______, _______, _______, _______,    LY_ADJ , _______, _______, _______
-    ),
-    [_SYM] = LAYOUT(
-     KC_INS,  KC_EXLM, KC_AT  , KC_HASH, KC_DLR , KC_PERC,                                        KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL,
-     xxxxxxx, KC_BSLS, KC_MINS, KC_EQL , KC_LBRC, KC_RBRC,                                        KC_HOME, KC_RSFT, KC_RCTL, KC_LALT, KC_RGUI, KC_END,
-     _______, KC_PIPE, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, ALT_GR ,                      KC_APP , KC_MUTE, KC_VOLD, KC_VOLU, KC_MPLY, xxxxxxx, KC_RCTL,
-                                         _______, _______, _______, LY_ADJ ,    _______, _______, _______, _______ 
-    ),
-    [_ADJUST] = LAYOUT(
-     xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, AG_SWAP, CG_SWAP,                                        xxxxxxx, KC_F11 , KC_F12 , KC_PSCR, xxxxxxx, EE_CLR,
-     xxxxxxx, xxxxxxx, KC_BRID, KC_BRIU, AG_NORM, CG_NORM,                                        RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, xxxxxxx, xxxxxxx, 
-     xxxxxxx, KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, xxxxxxx, xxxxxxx,                     RGB_TOG, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, xxxxxxx, QK_BOOT,
-                                         xxxxxxx, xxxxxxx, xxxxxxx, _______,    _______, xxxxxxx, xxxxxxx, xxxxxxx
-    ),
-};
-
-//  Template:
-//    [_INDEX] = LAYOUT(
-//     _______, _______, _______, _______, _______, _______,                                        _______, _______, _______, _______, _______, _______, 
-//     _______, _______, _______, _______, _______, _______,                                        _______, _______, _______, _______, _______, _______, 
-//     _______, _______, _______, _______, _______, _______, _______,                      _______, _______, _______, _______, _______, _______, _______,
-//                                         _______, _______, _______, _______,    _______, _______, _______, _______
-//    ),
diff --git a/keyboards/hillside/46/keymaps/via/rules.mk b/keyboards/hillside/46/keymaps/via/rules.mk
deleted file mode 100644
index fcd5f229ea..0000000000
--- a/keyboards/hillside/46/keymaps/via/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-CAPS_WORD_ENABLE = yes
-VIA_ENABLE = yes