From 2b926774cae11e55001435d0475436137afda7fb Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Tue, 21 May 2024 05:00:53 -0700
Subject: [PATCH] Migrate `LOCKING_*_ENABLE` to Data-Driven: H, Part 1 (#23759)

Affects:

  - `h0oni/deskpad`
  - `h0oni/hotduck`
  - `halfcliff`
  - `halokeys/elemental75`
  - `han60`
  - `hardlineworks/otd_plus`
  - `helix/rev3_4rows`
  - `helix/rev3_5rows`
  - `hfdkb/ac001`
  - `hidtech/bastyl`
  - `hineybush/h08_ocelot`
  - `hineybush/h10`
  - `hineybush/h60`
  - `hineybush/h65`
  - `hineybush/h65_hotswap`
  - `hineybush/h660s`
  - `hineybush/h75_singa`
  - `hineybush/h87a`
  - `hineybush/h88`
  - `hineybush/hbcp`
  - `hineybush/hineyg80`
  - `hineybush/physix`
  - `hineybush/sm68`
  - `hnahkb/freyr`
  - `hnahkb/stella`
  - `hnahkb/vn66`
  - `horizon`
  - `hotdox`
  - `hs60/v1`
---
 keyboards/h0oni/deskpad/config.h              | 22 -----------
 keyboards/h0oni/deskpad/keyboard.json         |  6 +++
 keyboards/h0oni/hotduck/config.h              | 22 -----------
 keyboards/h0oni/hotduck/keyboard.json         |  6 +++
 keyboards/halfcliff/config.h                  |  5 ---
 keyboards/halfcliff/keyboard.json             |  6 +++
 keyboards/halokeys/elemental75/config.h       | 22 -----------
 keyboards/halokeys/elemental75/keyboard.json  |  6 ++-
 keyboards/han60/config.h                      | 39 -------------------
 keyboards/han60/keyboard.json                 |  6 +++
 keyboards/hardlineworks/otd_plus/config.h     |  7 ----
 .../hardlineworks/otd_plus/keyboard.json      |  6 +++
 keyboards/helix/rev3_4rows/config.h           |  5 ---
 keyboards/helix/rev3_4rows/info.json          |  6 +++
 keyboards/helix/rev3_5rows/config.h           |  5 ---
 keyboards/helix/rev3_5rows/info.json          |  6 +++
 keyboards/hfdkb/ac001/config.h                |  5 ---
 keyboards/hfdkb/ac001/keyboard.json           |  6 ++-
 keyboards/hidtech/bastyl/config.h             |  2 -
 keyboards/hidtech/bastyl/keyboard.json        |  6 +++
 keyboards/hineybush/h08_ocelot/config.h       | 39 -------------------
 keyboards/hineybush/h08_ocelot/keyboard.json  |  6 +++
 keyboards/hineybush/h10/config.h              | 23 -----------
 keyboards/hineybush/h10/keyboard.json         |  6 +++
 keyboards/hineybush/h60/config.h              | 23 -----------
 keyboards/hineybush/h60/keyboard.json         |  6 +++
 keyboards/hineybush/h65/config.h              | 39 -------------------
 keyboards/hineybush/h65/keyboard.json         |  6 +++
 keyboards/hineybush/h65_hotswap/config.h      | 39 -------------------
 keyboards/hineybush/h65_hotswap/keyboard.json |  6 +++
 keyboards/hineybush/h660s/config.h            | 39 -------------------
 keyboards/hineybush/h660s/keyboard.json       |  6 +++
 keyboards/hineybush/h75_singa/config.h        | 39 -------------------
 keyboards/hineybush/h75_singa/keyboard.json   |  6 +++
 keyboards/hineybush/h87a/config.h             | 23 -----------
 keyboards/hineybush/h87a/keyboard.json        |  6 +++
 keyboards/hineybush/h88/config.h              | 23 -----------
 keyboards/hineybush/h88/keyboard.json         |  6 +++
 keyboards/hineybush/hbcp/config.h             |  5 ---
 keyboards/hineybush/hbcp/keyboard.json        |  6 +++
 keyboards/hineybush/hineyg80/config.h         |  7 ----
 keyboards/hineybush/hineyg80/keyboard.json    |  6 +++
 keyboards/hineybush/physix/config.h           | 39 -------------------
 keyboards/hineybush/physix/keyboard.json      |  6 +++
 keyboards/hineybush/sm68/config.h             | 39 -------------------
 keyboards/hineybush/sm68/keyboard.json        |  6 +++
 keyboards/hnahkb/freyr/config.h               | 39 -------------------
 keyboards/hnahkb/freyr/keyboard.json          |  6 +++
 keyboards/hnahkb/stella/config.h              | 39 -------------------
 keyboards/hnahkb/stella/keyboard.json         |  6 +++
 keyboards/hnahkb/vn66/config.h                |  5 ---
 keyboards/hnahkb/vn66/keyboard.json           |  6 +++
 keyboards/horizon/config.h                    | 23 -----------
 keyboards/horizon/keyboard.json               |  6 +++
 keyboards/hotdox/config.h                     |  5 ---
 keyboards/hotdox/keyboard.json                |  6 +++
 keyboards/hs60/v1/config.h                    |  5 ---
 keyboards/hs60/v1/keyboard.json               |  6 +++
 58 files changed, 172 insertions(+), 629 deletions(-)
 delete mode 100644 keyboards/h0oni/deskpad/config.h
 delete mode 100644 keyboards/h0oni/hotduck/config.h
 delete mode 100644 keyboards/halokeys/elemental75/config.h
 delete mode 100644 keyboards/han60/config.h
 delete mode 100644 keyboards/hardlineworks/otd_plus/config.h
 delete mode 100644 keyboards/hineybush/h08_ocelot/config.h
 delete mode 100644 keyboards/hineybush/h10/config.h
 delete mode 100644 keyboards/hineybush/h60/config.h
 delete mode 100644 keyboards/hineybush/h65/config.h
 delete mode 100644 keyboards/hineybush/h65_hotswap/config.h
 delete mode 100644 keyboards/hineybush/h660s/config.h
 delete mode 100644 keyboards/hineybush/h75_singa/config.h
 delete mode 100644 keyboards/hineybush/h87a/config.h
 delete mode 100644 keyboards/hineybush/h88/config.h
 delete mode 100644 keyboards/hineybush/hineyg80/config.h
 delete mode 100644 keyboards/hineybush/physix/config.h
 delete mode 100644 keyboards/hineybush/sm68/config.h
 delete mode 100644 keyboards/hnahkb/freyr/config.h
 delete mode 100644 keyboards/hnahkb/stella/config.h
 delete mode 100644 keyboards/horizon/config.h

diff --git a/keyboards/h0oni/deskpad/config.h b/keyboards/h0oni/deskpad/config.h
deleted file mode 100644
index 441e3b8c1a..0000000000
--- a/keyboards/h0oni/deskpad/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2021 Hydrogen BD <support@hgenbd.com>
- *
- * 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
-
-/* 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
diff --git a/keyboards/h0oni/deskpad/keyboard.json b/keyboards/h0oni/deskpad/keyboard.json
index 471d101693..d240acf9d3 100644
--- a/keyboards/h0oni/deskpad/keyboard.json
+++ b/keyboards/h0oni/deskpad/keyboard.json
@@ -20,6 +20,12 @@
         "mousekey": true,
         "nkro": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["D0", "D4", "D1"],
         "rows": ["D7", "C6"]
diff --git a/keyboards/h0oni/hotduck/config.h b/keyboards/h0oni/hotduck/config.h
deleted file mode 100644
index 4c8c95e41e..0000000000
--- a/keyboards/h0oni/hotduck/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2021 Md Mashur Shalehin, aka h0oni <mashursakib1920@gmail.com>
- *
- * 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
-
-/* 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
diff --git a/keyboards/h0oni/hotduck/keyboard.json b/keyboards/h0oni/hotduck/keyboard.json
index c034e7a3a4..605d614d6a 100644
--- a/keyboards/h0oni/hotduck/keyboard.json
+++ b/keyboards/h0oni/hotduck/keyboard.json
@@ -17,6 +17,12 @@
         "nkro": true,
         "rgblight": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1", "D2", "D3"],
         "rows": ["B6", "B2", "B3", "B1", "F7", "F6", "F5"]
diff --git a/keyboards/halfcliff/config.h b/keyboards/halfcliff/config.h
index d3c5de4338..be92d93d93 100644
--- a/keyboards/halfcliff/config.h
+++ b/keyboards/halfcliff/config.h
@@ -24,8 +24,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MATRIX_ROW_PINS { F5, F6, F7, D7, B5, F5, F6, F7, D7, B5 }
 #define MATRIX_COL_PINS { B4, E6, C6, B6, B2 }
-
-/* 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
diff --git a/keyboards/halfcliff/keyboard.json b/keyboards/halfcliff/keyboard.json
index 1f60537b24..a864c4ce33 100644
--- a/keyboards/halfcliff/keyboard.json
+++ b/keyboards/halfcliff/keyboard.json
@@ -34,6 +34,12 @@
         "mousekey": false,
         "extrakey": false
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/halokeys/elemental75/config.h b/keyboards/halokeys/elemental75/config.h
deleted file mode 100644
index ea52da2928..0000000000
--- a/keyboards/halokeys/elemental75/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
- /* Copyright 2022 Halokeys
-  *
-  * 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
-
-/* 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
diff --git a/keyboards/halokeys/elemental75/keyboard.json b/keyboards/halokeys/elemental75/keyboard.json
index ccb1de12b6..866916b69b 100644
--- a/keyboards/halokeys/elemental75/keyboard.json
+++ b/keyboards/halokeys/elemental75/keyboard.json
@@ -32,7 +32,11 @@
         "term": 300
     },
     "qmk": {
-        "tap_keycode_delay": 10
+        "tap_keycode_delay": 10,
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
     },
     "ws2812": {
         "pin": "A10"
diff --git a/keyboards/han60/config.h b/keyboards/han60/config.h
deleted file mode 100644
index 9c95070341..0000000000
--- a/keyboards/han60/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2021 farhandsome
-
-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
-
-/* 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
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/han60/keyboard.json b/keyboards/han60/keyboard.json
index d1dcff6baf..41d33b1ba8 100644
--- a/keyboards/han60/keyboard.json
+++ b/keyboards/han60/keyboard.json
@@ -16,6 +16,12 @@
         "mousekey": true,
         "nkro": false
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"],
         "rows": ["D5", "D3", "D2", "D1", "D0"]
diff --git a/keyboards/hardlineworks/otd_plus/config.h b/keyboards/hardlineworks/otd_plus/config.h
deleted file mode 100644
index 5f36081323..0000000000
--- a/keyboards/hardlineworks/otd_plus/config.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-/* 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
diff --git a/keyboards/hardlineworks/otd_plus/keyboard.json b/keyboards/hardlineworks/otd_plus/keyboard.json
index 50a7eb2224..e0afc03893 100644
--- a/keyboards/hardlineworks/otd_plus/keyboard.json
+++ b/keyboards/hardlineworks/otd_plus/keyboard.json
@@ -16,6 +16,12 @@
         "mousekey": true,
         "nkro": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["B3", "B2", "B1", "B7", "B0", "F1", "D7", "F7", "C7"],
         "rows": ["D2", "D4", "D1", "E6", "F5", "C6", "B6", "F6", "F0", "D0", "D6", "D3"]
diff --git a/keyboards/helix/rev3_4rows/config.h b/keyboards/helix/rev3_4rows/config.h
index cc1a925295..56d9a13feb 100644
--- a/keyboards/helix/rev3_4rows/config.h
+++ b/keyboards/helix/rev3_4rows/config.h
@@ -43,11 +43,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Custom font */
 #define OLED_FONT_H "keyboards/helix/common/glcdfont.c"
 
-/* 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
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/helix/rev3_4rows/info.json b/keyboards/helix/rev3_4rows/info.json
index ce7bcde3e0..5e9fd2dcd8 100644
--- a/keyboards/helix/rev3_4rows/info.json
+++ b/keyboards/helix/rev3_4rows/info.json
@@ -8,6 +8,12 @@
     "pid": "0x0004",
     "device_version": "0.0.1"
   },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
   "rgb_matrix": {
     "driver": "ws2812",
     "sat_steps": 8,
diff --git a/keyboards/helix/rev3_5rows/config.h b/keyboards/helix/rev3_5rows/config.h
index 733f8b5a55..84173da2de 100644
--- a/keyboards/helix/rev3_5rows/config.h
+++ b/keyboards/helix/rev3_5rows/config.h
@@ -43,11 +43,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Custom font */
 #define OLED_FONT_H "keyboards/helix/common/glcdfont.c"
 
-/* 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
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/helix/rev3_5rows/info.json b/keyboards/helix/rev3_5rows/info.json
index e867f03326..b61db7df86 100644
--- a/keyboards/helix/rev3_5rows/info.json
+++ b/keyboards/helix/rev3_5rows/info.json
@@ -8,6 +8,12 @@
     "pid": "0x0003",
     "device_version": "0.0.1"
   },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
   "rgb_matrix": {
     "driver": "ws2812",
     "sat_steps": 8,
diff --git a/keyboards/hfdkb/ac001/config.h b/keyboards/hfdkb/ac001/config.h
index e069609fad..d82b460254 100644
--- a/keyboards/hfdkb/ac001/config.h
+++ b/keyboards/hfdkb/ac001/config.h
@@ -16,11 +16,6 @@
 
 #pragma once
 
-/* 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
-
 /* SPI Config for spi flash*/
 #define SPI_DRIVER SPIDQ
 #define SPI_SCK_PIN B3
diff --git a/keyboards/hfdkb/ac001/keyboard.json b/keyboards/hfdkb/ac001/keyboard.json
index daf3e735f0..87f6e40bc3 100644
--- a/keyboards/hfdkb/ac001/keyboard.json
+++ b/keyboards/hfdkb/ac001/keyboard.json
@@ -46,7 +46,11 @@
         "pin": "A1"
     },
     "qmk": {
-        "tap_keycode_delay": 5
+        "tap_keycode_delay": 5,
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
     },
     "processor": "WB32FQ95",
     "bootloader": "wb32-dfu",
diff --git a/keyboards/hidtech/bastyl/config.h b/keyboards/hidtech/bastyl/config.h
index a033888b41..455c1771d8 100644
--- a/keyboards/hidtech/bastyl/config.h
+++ b/keyboards/hidtech/bastyl/config.h
@@ -18,6 +18,4 @@
 
 #pragma once
 
-#define LOCKING_SUPPORT_ENABLE
-#define LOCKING_RESYNC_ENABLE
 #define MASTER_RIGHT
diff --git a/keyboards/hidtech/bastyl/keyboard.json b/keyboards/hidtech/bastyl/keyboard.json
index 5c3a9fcfcf..7ebb915739 100644
--- a/keyboards/hidtech/bastyl/keyboard.json
+++ b/keyboards/hidtech/bastyl/keyboard.json
@@ -17,6 +17,12 @@
         "nkro": false,
         "rgblight": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["B4", "E6", "C6", "B1", "B3", "B2"],
         "rows": ["D7", "B5", "F7", "F6", "B6"]
diff --git a/keyboards/hineybush/h08_ocelot/config.h b/keyboards/hineybush/h08_ocelot/config.h
deleted file mode 100644
index 474c1d6701..0000000000
--- a/keyboards/hineybush/h08_ocelot/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2021 hineybush
-
-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
-
-/* 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
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/hineybush/h08_ocelot/keyboard.json b/keyboards/hineybush/h08_ocelot/keyboard.json
index 0e6ccb732b..bca579aab8 100644
--- a/keyboards/hineybush/h08_ocelot/keyboard.json
+++ b/keyboards/hineybush/h08_ocelot/keyboard.json
@@ -17,6 +17,12 @@
         "nkro": true,
         "rgblight": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["F4", "C7", "D0", "D1"],
         "rows": ["B4", "B6"]
diff --git a/keyboards/hineybush/h10/config.h b/keyboards/hineybush/h10/config.h
deleted file mode 100644
index 994b108d8e..0000000000
--- a/keyboards/hineybush/h10/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2020 hineybush
-
-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
-
-/* 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
diff --git a/keyboards/hineybush/h10/keyboard.json b/keyboards/hineybush/h10/keyboard.json
index 924acb515f..73205f85ff 100644
--- a/keyboards/hineybush/h10/keyboard.json
+++ b/keyboards/hineybush/h10/keyboard.json
@@ -17,6 +17,12 @@
         "mousekey": false,
         "nkro": false
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["F0", "C7", "B1", "B2"],
         "rows": ["B0", "C6", "B6", "B5", "B4", "D7"]
diff --git a/keyboards/hineybush/h60/config.h b/keyboards/hineybush/h60/config.h
deleted file mode 100644
index 994b108d8e..0000000000
--- a/keyboards/hineybush/h60/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2020 hineybush
-
-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
-
-/* 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
diff --git a/keyboards/hineybush/h60/keyboard.json b/keyboards/hineybush/h60/keyboard.json
index 63d41a55b4..8a019d42da 100644
--- a/keyboards/hineybush/h60/keyboard.json
+++ b/keyboards/hineybush/h60/keyboard.json
@@ -19,6 +19,12 @@
         "rgblight": true,
         "sleep_led": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["B3", "D0", "D1", "D2", "D3", "D5", "D6", "C7", "F0", "F1", "F4", "F5", "F6", "F7"],
         "rows": ["B6", "B5", "B4", "D7", "E6"]
diff --git a/keyboards/hineybush/h65/config.h b/keyboards/hineybush/h65/config.h
deleted file mode 100644
index 474c1d6701..0000000000
--- a/keyboards/hineybush/h65/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2021 hineybush
-
-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
-
-/* 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
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/hineybush/h65/keyboard.json b/keyboards/hineybush/h65/keyboard.json
index cacc673311..8560c7774c 100644
--- a/keyboards/hineybush/h65/keyboard.json
+++ b/keyboards/hineybush/h65/keyboard.json
@@ -18,6 +18,12 @@
         "nkro": false,
         "rgblight": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "B0", "B1", "B2", "B3"],
         "rows": ["D7", "D6", "D4", "D1", "D0"]
diff --git a/keyboards/hineybush/h65_hotswap/config.h b/keyboards/hineybush/h65_hotswap/config.h
deleted file mode 100644
index 474c1d6701..0000000000
--- a/keyboards/hineybush/h65_hotswap/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2021 hineybush
-
-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
-
-/* 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
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/hineybush/h65_hotswap/keyboard.json b/keyboards/hineybush/h65_hotswap/keyboard.json
index 0cabdf074b..510836f22f 100644
--- a/keyboards/hineybush/h65_hotswap/keyboard.json
+++ b/keyboards/hineybush/h65_hotswap/keyboard.json
@@ -18,6 +18,12 @@
         "nkro": false,
         "rgblight": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "B0", "B1", "B2", "B3"],
         "rows": ["D7", "D6", "D4", "D1", "D0"]
diff --git a/keyboards/hineybush/h660s/config.h b/keyboards/hineybush/h660s/config.h
deleted file mode 100644
index 373b97179e..0000000000
--- a/keyboards/hineybush/h660s/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2020 Josh Hinnebusch
-
-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
-
-/* 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
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/hineybush/h660s/keyboard.json b/keyboards/hineybush/h660s/keyboard.json
index de658ff129..d76664080e 100644
--- a/keyboards/hineybush/h660s/keyboard.json
+++ b/keyboards/hineybush/h660s/keyboard.json
@@ -19,6 +19,12 @@
         "rgblight": true,
         "sleep_led": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5"],
         "rows": ["B1", "E6", "B3", "D3", "D2"]
diff --git a/keyboards/hineybush/h75_singa/config.h b/keyboards/hineybush/h75_singa/config.h
deleted file mode 100644
index 2e3e430422..0000000000
--- a/keyboards/hineybush/h75_singa/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2019 hineybush
-
-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
-
-/* 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
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/hineybush/h75_singa/keyboard.json b/keyboards/hineybush/h75_singa/keyboard.json
index a313213e67..30dbd8d6a1 100644
--- a/keyboards/hineybush/h75_singa/keyboard.json
+++ b/keyboards/hineybush/h75_singa/keyboard.json
@@ -18,6 +18,12 @@
         "nkro": false,
         "rgblight": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "B2", "D4", "D5", "D3"],
         "rows": ["B0", "B1", "D0", "D1", "D2", "D6"]
diff --git a/keyboards/hineybush/h87a/config.h b/keyboards/hineybush/h87a/config.h
deleted file mode 100644
index 68b99c1a55..0000000000
--- a/keyboards/hineybush/h87a/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2018 Josh Hinnebusch
-
-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
-
-/* 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
diff --git a/keyboards/hineybush/h87a/keyboard.json b/keyboards/hineybush/h87a/keyboard.json
index 196a3aa8fe..e9096201d9 100644
--- a/keyboards/hineybush/h87a/keyboard.json
+++ b/keyboards/hineybush/h87a/keyboard.json
@@ -21,6 +21,12 @@
         "nkro": false,
         "rgblight": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "D2"],
         "rows": ["B0", "B1", "B2", "B3", "D0", "D1", "B5", "B6", "D7", "B4", "D6", "D4"]
diff --git a/keyboards/hineybush/h88/config.h b/keyboards/hineybush/h88/config.h
deleted file mode 100644
index 8099d5a0e4..0000000000
--- a/keyboards/hineybush/h88/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2019 Josh Hinnebusch
-
-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
-
-/* 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
diff --git a/keyboards/hineybush/h88/keyboard.json b/keyboards/hineybush/h88/keyboard.json
index 2adb661273..e74a3f3623 100644
--- a/keyboards/hineybush/h88/keyboard.json
+++ b/keyboards/hineybush/h88/keyboard.json
@@ -21,6 +21,12 @@
         "nkro": false,
         "rgblight": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "D2"],
         "rows": ["B0", "B1", "B2", "B3", "D0", "D1", "B5", "B6", "D7", "B4", "D6", "D4"]
diff --git a/keyboards/hineybush/hbcp/config.h b/keyboards/hineybush/hbcp/config.h
index f76948d482..bde356232d 100644
--- a/keyboards/hineybush/hbcp/config.h
+++ b/keyboards/hineybush/hbcp/config.h
@@ -34,8 +34,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define MATRIX_ROW_PINS { B1, B6, D0, C7, C6, C5 }
 #define MATRIX_COL_PINS { F0, F1, F2, F3, F4, F5, F6, F7, A0, A1, A2, A3, A4, A5, B5, B4, B3, B2 }
-
-/* 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
diff --git a/keyboards/hineybush/hbcp/keyboard.json b/keyboards/hineybush/hbcp/keyboard.json
index ab36bfaea0..f03c4d5754 100644
--- a/keyboards/hineybush/hbcp/keyboard.json
+++ b/keyboards/hineybush/hbcp/keyboard.json
@@ -46,6 +46,12 @@
         "backlight": true,
         "rgblight": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/hineybush/hineyg80/config.h b/keyboards/hineybush/hineyg80/config.h
deleted file mode 100644
index 5f36081323..0000000000
--- a/keyboards/hineybush/hineyg80/config.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-/* 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
diff --git a/keyboards/hineybush/hineyg80/keyboard.json b/keyboards/hineybush/hineyg80/keyboard.json
index fa6e340120..933d689225 100644
--- a/keyboards/hineybush/hineyg80/keyboard.json
+++ b/keyboards/hineybush/hineyg80/keyboard.json
@@ -16,6 +16,12 @@
         "mousekey": true,
         "nkro": false
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["C7", "F7", "F6", "F5", "F4", "F1", "F0", "B7", "B0"],
         "rows": ["B2", "B3", "D0", "B1", "D2", "D1", "D5", "D3", "D6", "D4", "B4", "D7"]
diff --git a/keyboards/hineybush/physix/config.h b/keyboards/hineybush/physix/config.h
deleted file mode 100644
index 2e3e430422..0000000000
--- a/keyboards/hineybush/physix/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2019 hineybush
-
-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
-
-/* 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
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/hineybush/physix/keyboard.json b/keyboards/hineybush/physix/keyboard.json
index a08e09af18..b7b1c05393 100644
--- a/keyboards/hineybush/physix/keyboard.json
+++ b/keyboards/hineybush/physix/keyboard.json
@@ -18,6 +18,12 @@
         "nkro": false,
         "rgblight": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "B3", "B2", "B1", "B0", "B5", "B4", "D7", "D6", "D4"],
         "rows": ["D0", "D1", "D2", "C7", "C6"]
diff --git a/keyboards/hineybush/sm68/config.h b/keyboards/hineybush/sm68/config.h
deleted file mode 100644
index 2e3e430422..0000000000
--- a/keyboards/hineybush/sm68/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2019 hineybush
-
-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
-
-/* 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
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/hineybush/sm68/keyboard.json b/keyboards/hineybush/sm68/keyboard.json
index d4280b6747..8350ca0380 100644
--- a/keyboards/hineybush/sm68/keyboard.json
+++ b/keyboards/hineybush/sm68/keyboard.json
@@ -17,6 +17,12 @@
         "nkro": false,
         "rgblight": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D3", "D2"],
         "rows": ["B2", "B1", "B0", "D4", "D1"]
diff --git a/keyboards/hnahkb/freyr/config.h b/keyboards/hnahkb/freyr/config.h
deleted file mode 100644
index 9f9d81bea9..0000000000
--- a/keyboards/hnahkb/freyr/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2019 HnahKB
-
-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
-
-/* 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
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/hnahkb/freyr/keyboard.json b/keyboards/hnahkb/freyr/keyboard.json
index 4ddc37d3dc..635c9d5989 100644
--- a/keyboards/hnahkb/freyr/keyboard.json
+++ b/keyboards/hnahkb/freyr/keyboard.json
@@ -17,6 +17,12 @@
         "mousekey": false,
         "nkro": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["B4", "D7", "D6", "D4", "B5", "C7", "C6", "F5", "F6", "F7"],
         "rows": ["D3", "B2", "B1", "B0", "E6", "F0", "D2", "D5", "F4", "F1"]
diff --git a/keyboards/hnahkb/stella/config.h b/keyboards/hnahkb/stella/config.h
deleted file mode 100644
index 9f9d81bea9..0000000000
--- a/keyboards/hnahkb/stella/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2019 HnahKB
-
-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
-
-/* 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
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/hnahkb/stella/keyboard.json b/keyboards/hnahkb/stella/keyboard.json
index 13abbffbec..7c69ec3de2 100644
--- a/keyboards/hnahkb/stella/keyboard.json
+++ b/keyboards/hnahkb/stella/keyboard.json
@@ -18,6 +18,12 @@
         "nkro": false,
         "rgblight": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["B4", "D7", "D6", "D4", "B5", "C7", "C6", "F5", "F6", "F7"],
         "rows": ["D3", "B2", "B1", "B0", "E6", "F0", "D2", "D5", "F4", "F1"]
diff --git a/keyboards/hnahkb/vn66/config.h b/keyboards/hnahkb/vn66/config.h
index 0369461b67..b8f23d935b 100644
--- a/keyboards/hnahkb/vn66/config.h
+++ b/keyboards/hnahkb/vn66/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* 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
-
 /* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
  * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
  */
diff --git a/keyboards/hnahkb/vn66/keyboard.json b/keyboards/hnahkb/vn66/keyboard.json
index 6934fd1f8f..a83948f5cd 100644
--- a/keyboards/hnahkb/vn66/keyboard.json
+++ b/keyboards/hnahkb/vn66/keyboard.json
@@ -22,6 +22,12 @@
         "nkro": false,
         "rgblight": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["F6", "F5", "F4", "F1", "F0", "C6", "C7", "B5", "B4", "D7", "D6", "D4", "D5", "D3"],
         "rows": ["B1", "B2", "B3", "D2", "F7"]
diff --git a/keyboards/horizon/config.h b/keyboards/horizon/config.h
deleted file mode 100644
index 24264fee6c..0000000000
--- a/keyboards/horizon/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2021 Steven Karrmann
-
-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
-
-/* 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
diff --git a/keyboards/horizon/keyboard.json b/keyboards/horizon/keyboard.json
index 0d1c633e5f..0fea8cb74c 100644
--- a/keyboards/horizon/keyboard.json
+++ b/keyboards/horizon/keyboard.json
@@ -16,6 +16,12 @@
     "mousekey": true,
     "nkro": false
   },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
   "matrix_pins": {
     "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6", "B5", "B4", "E6", "D7", "C6", "D4", "D0"],
     "rows": ["D3", "D2", "D1", "F4"]
diff --git a/keyboards/hotdox/config.h b/keyboards/hotdox/config.h
index 60d9fe6217..c745817616 100644
--- a/keyboards/hotdox/config.h
+++ b/keyboards/hotdox/config.h
@@ -11,11 +11,6 @@
 #define MOUSEKEY_MAX_SPEED      7
 #define MOUSEKEY_WHEEL_DELAY    0
 
-/* 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
-
 /* key combination for command */
 #ifndef IS_COMMAND
 #define IS_COMMAND() ( \
diff --git a/keyboards/hotdox/keyboard.json b/keyboards/hotdox/keyboard.json
index 5d2c3ec5ac..dee1decb94 100644
--- a/keyboards/hotdox/keyboard.json
+++ b/keyboards/hotdox/keyboard.json
@@ -21,6 +21,12 @@
         "backlight": true,
         "unicode": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "tapping": {
       "toggle": 1
     },
diff --git a/keyboards/hs60/v1/config.h b/keyboards/hs60/v1/config.h
index 95730e10e4..1bbc88ac1d 100644
--- a/keyboards/hs60/v1/config.h
+++ b/keyboards/hs60/v1/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* 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
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/keyboards/hs60/v1/keyboard.json b/keyboards/hs60/v1/keyboard.json
index 3c07491a3d..f4a05dfe27 100644
--- a/keyboards/hs60/v1/keyboard.json
+++ b/keyboards/hs60/v1/keyboard.json
@@ -75,6 +75,12 @@
     "nkro": true,
     "rgb_matrix": true
   },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
   "community_layouts": ["60_ansi", "60_iso"],
   "layouts": {
     "LAYOUT_60_iso": {