[Keyboard] Brick (#19851)

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Jason Chestnut <jason@Jasons-MacBook-Pro.local>

13 files changed, 306 insertions, 196 deletions

diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson
index 4295d0700c..5fe31c4fb1 100644
--- a/data/mappings/keyboard_aliases.hjson
+++ b/data/mappings/keyboard_aliases.hjson
@@ -92,6 +92,9 @@
     "bpiphany/pegasushoof": {
         "target": "bpiphany/pegasushoof/2013"
     },
+    "brick": {
+        "target": "pauperboards/brick"
+    },
     "chavdai40": {
         "target": "chavdai40/rev1"
     },
diff --git a/keyboards/brick/brick.h b/keyboards/brick/brick.h
deleted file mode 100644
index 0e9a7e7c61..0000000000
--- a/keyboards/brick/brick.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Copyright 2023 Juno Nguyen <juno.ngx@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
-
-#include "quantum.h"
-#define  XXX KC_NO
-
-#define LAYOUT_ortho_2x2u( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-         k31, k32, k33,   k35,       k36,   k38, k39, k3a       \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
-    { XXX, k31, k32, k33, XXX, k35, k36, XXX, k38, k39, k3a, XXX } \
-}
-
-#define LAYOUT_mit( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-         k31, k32, k33, k34,    k35,   k37, k38, k39, k3a       \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
-    { XXX, k31, k32, k33, k34, k35, XXX, k37, k38, k39, k3a, XXX } \
-}
-
-#define LAYOUT_ortho_4x12( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b } \
-}
-
diff --git a/keyboards/brick/config.h b/keyboards/brick/config.h
deleted file mode 100644
index adb3238c6a..0000000000
--- a/keyboards/brick/config.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright 2023 Juno Nguyen <juno.ngx@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
-
-#define MATRIX_ROW_PINS { D3, D5, F0, F1 }
-#define MATRIX_COL_PINS { B1, B3, F7, F6, D4, D6, D7, B4, B5, B6, C6, C7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D2
-#ifdef RGB_DI_PIN
-#    define RGBLED_NUM 8
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#    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
-#endif
-
-#define ENCODERS_PAD_A { F4 }
-#define ENCODERS_PAD_B { F5 }
\ No newline at end of file
diff --git a/keyboards/brick/info.json b/keyboards/brick/info.json
deleted file mode 100644
index d20615dbbd..0000000000
--- a/keyboards/brick/info.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    "keyboard_name": "Brick",
-    "manufacturer": "Pauper",
-    "url": "https://p3dstore.com/products/cervello-pcb-only-group-buy",
-    "maintainer": "JunoNgx",
-    "usb": {
-        "vid": "0xFEFE",
-        "pid": "0x0001",
-        "device_version": "1.0.0"
-    },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
-    "community_layouts": [ "ortho_4x12" ],
-    "layouts": {
-        "LAYOUT_ortho_2x2u": {
-            "layout": [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Back Space", "x":11, "y":0}, {"label":"Esc", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"'", "x":11, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"/", "x":10, "y":2}, {"label":"Return", "x":11, "y":2}, {"label":"Ctrl", "x":1, "y":3}, {"label":"Alt", "x":2, "y":3}, {"label":"Super", "x":3, "y":3}, {"x":4, "y":3, "w":2}, {"x":6, "y":3, "w":2}, {"label":"&larr;", "x":8, "y":3}, {"label":"&darr;", "x":9, "y":3}, {"label":"&uarr;", "x":10, "y":3}]
-        },
-        "LAYOUT_mit": {
-            "layout": [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Back Space", "x":11, "y":0}, {"label":"Esc", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"'", "x":11, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"/", "x":10, "y":2}, {"label":"Return", "x":11, "y":2}, {"label":"Ctrl", "x":1, "y":3}, {"label":"Alt", "x":2, "y":3}, {"label":"Super", "x":3, "y":3}, {"label":"&dArr;", "x":4, "y":3}, {"x":5, "y":3, "w":2}, {"label":"&uArr;", "x":7, "y":3}, {"label":"&larr;", "x":8, "y":3}, {"label":"&darr;", "x":9, "y":3}, {"label":"&uarr;", "x":10, "y":3}]
-        },
-        "LAYOUT_ortho_4x12": {
-            "layout": [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Back Space", "x":11, "y":0}, {"label":"Esc", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"'", "x":11, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"/", "x":10, "y":2}, {"label":"Return", "x":11, "y":2}, {"x":0, "y":3}, {"label":"Ctrl", "x":1, "y":3}, {"label":"Alt", "x":2, "y":3}, {"label":"Super", "x":3, "y":3}, {"label":"&dArr;", "x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"label":"&uArr;", "x":7, "y":3}, {"label":"&larr;", "x":8, "y":3}, {"label":"&darr;", "x":9, "y":3}, {"label":"&uarr;", "x":10, "y":3}, {"label":"&rarr;", "x":11, "y":3}]
-        }
-    }
-}
diff --git a/keyboards/brick/readme.md b/keyboards/brick/readme.md
deleted file mode 100644
index c7894743d0..0000000000
--- a/keyboards/brick/readme.md
+++ /dev/null
@@ -1,24 +0,0 @@
-# Brick
-
-A 40% ortholinear Planck-shaped keyboard with bottom blockers for Cervello. Created by Pauper.
-
-* Keyboard Maintainer: [Juno Nguyen](https://github.com/JunoNgx)
-* Hardware Availability: [P3D Store](https://p3dstore.com/collections/invisibolt-acrylic-cases/products/cervello-invisibolt-acrylic-keyboard-case-and-pcb)
-
-Make example for this keyboard (after setting up your build environment):
-
-    make brick:default
-
-Flashing example for this keyboard:
-
-    make brick:default:flash
-    
-## Bootloader
-
-Enter the bootloader in 3 ways:
-
-* **Bootmagic reset**: Hold down Escape and plug in the keyboard.
-* **Physical reset button**: Briefly press the reset button below the pro-micro.
-* **Keycode in layout**: The `QK_BOOT` key can be found by holding `FUNC` in between the space bars and pressing `ESC`.
-
-See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/brick/rules.mk b/keyboards/brick/rules.mk
deleted file mode 100644
index e0c821feb2..0000000000
--- a/keyboards/brick/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes
-LTO_ENABLE = yes
diff --git a/keyboards/brick/brick.c b/keyboards/pauperboards/brick/brick.c
index 8c97cf97ff..13df995e54 100644
--- a/keyboards/brick/brick.c
+++ b/keyboards/pauperboards/brick/brick.c
@@ -1,4 +1,4 @@
-/* Copyright 2023 Juno Nguyen <juno.ngx@gmail.com>
+/* Copyright 2023 Jason Chestnut <pauperboards@gmail.com> @pauperboards
  *
  * 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
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "brick.h"
+#include "quantum.h"
 
 #ifdef ENCODER_ENABLE
 bool encoder_update_kb(uint8_t index, bool clockwise) {
@@ -28,4 +28,4 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
     }
     return true;
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/keyboards/pauperboards/brick/info.json b/keyboards/pauperboards/brick/info.json
new file mode 100644
index 0000000000..a5dd2522cd
--- /dev/null
+++ b/keyboards/pauperboards/brick/info.json
@@ -0,0 +1,245 @@
+{
+    "keyboard_name": "Brick",
+    "manufacturer": "pauperboards",
+    "url": "https://p3dstore.com/products/cervello-pcb-only-group-buy",
+    "maintainer": "pauper",
+    "usb": {
+        "vid": "0xFEFE",
+        "pid": "0x0001",
+        "device_version": "0.2.0"
+    },
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "rows": [ "D3", "D5", "F0", "F1" ],
+        "cols": [ "B1", "B3", "F7", "F6", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7" ]
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "encoder": true,
+        "rgblight": true,
+        "lto": true
+    },
+    "encoder": {
+        "rotary": [
+            { "pin_a": "F4", "pin_b": "F5", "resolution": 4 }
+        ]
+    },
+    "rgblight": {
+        "pin": "D2",
+        "led_count": 8,
+        "hue_steps": 8,
+        "brightness_steps": 8,
+        "saturation_steps": 8,
+        "animations": {
+            "alternating": true,
+            "breathing": true,
+            "christmas": true,
+            "knight": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "rgb_test": true,
+            "snake": false,
+            "static_gradient": true,
+            "twinkle": true
+        }
+    },
+    "layouts": {
+        "LAYOUT_ortho_2x2u": {
+            "layout": [
+                { "matrix": [0,0], "label": "Tab", "x": 0, "y": 0 },
+                { "matrix": [0,1], "label": "Q", "x": 1, "y": 0 },
+                { "matrix": [0,2], "label": "W", "x": 2, "y": 0 },
+                { "matrix": [0,3], "label": "E", "x": 3, "y": 0 },
+                { "matrix": [0,4], "label": "R", "x": 4, "y": 0 },
+                { "matrix": [0,5], "label": "T", "x": 5, "y": 0 },
+                { "matrix": [0,6], "label": "Y", "x": 6, "y": 0 },
+                { "matrix": [0,7], "label": "U", "x": 7, "y": 0 },
+                { "matrix": [0,8], "label": "I", "x": 8, "y": 0 },
+                { "matrix": [0,9], "label": "O", "x": 9, "y": 0 },
+                { "matrix": [0,10], "label": "P", "x": 10, "y": 0 },
+                { "matrix": [0,11], "label": "BS", "x": 11, "y": 0 },
+                { "matrix": [1,0], "label": "Esc", "x": 0, "y": 1 },
+                { "matrix": [1,1], "label": "A", "x": 1, "y": 1 },
+                { "matrix": [1,2], "label": "S", "x": 2, "y": 1 },
+                { "matrix": [1,3], "label": "D", "x": 3, "y": 1 },
+                { "matrix": [1,4], "label": "F", "x": 4, "y": 1 },
+                { "matrix": [1,5], "label": "G", "x": 5, "y": 1 },
+                { "matrix": [1,6], "label": "H", "x": 6, "y": 1 },
+                { "matrix": [1,7], "label": "J", "x": 7, "y": 1 },
+                { "matrix": [1,8], "label": "K", "x": 8, "y": 1 },
+                { "matrix": [1,9], "label": "L", "x": 9, "y": 1 },
+                { "matrix": [1,10], "label": ";", "x": 10, "y": 1 },
+                { "matrix": [1,11], "label": "'", "x": 11, "y": 1 },
+                { "matrix": [2,0], "label": "Shift", "x": 0, "y": 2 },
+                { "matrix": [2,1], "label": "Z", "x": 1, "y": 2 },
+                { "matrix": [2,2], "label": "X", "x": 2, "y": 2 },
+                { "matrix": [2,3], "label": "C", "x": 3, "y": 2 },
+                { "matrix": [2,4], "label": "V", "x": 4, "y": 2 },
+                { "matrix": [2,5], "label": "B", "x": 5, "y": 2 },
+                { "matrix": [2,6], "label": "N", "x": 6, "y": 2 },
+                { "matrix": [2,7], "label": "M", "x": 7, "y": 2 },
+                { "matrix": [2,8], "label": ",", "x": 8, "y": 2 },
+                { "matrix": [2,9], "label": ".", "x": 9, "y": 2 },
+                { "matrix": [2,10], "label": "/", "x": 10, "y": 2 },
+                { "matrix": [2,11], "label": "Return", "x": 11, "y": 2 },
+                { "matrix": [3,1], "label": "Ctrl", "x": 1, "y": 3 },
+                { "matrix": [3,2], "label": "Alt", "x": 2, "y": 3 },
+                { "matrix": [3,3], "label": "Super", "x": 3, "y": 3 },
+                { "matrix": [3,5], "label": "Space", "x": 4, "y": 3, "w": 2 },
+                { "matrix": [3,6], "label": "Space", "x": 6, "y": 3, "w": 2 },
+                { "matrix": [3,8], "label": "&larr;", "x": 8, "y": 3 },
+                { "matrix": [3,9], "label": "&darr;", "x": 9, "y": 3 },
+                { "matrix": [3,10], "label": "&uarr;", "x": 10, "y": 3 }
+            ]
+        },
+        "LAYOUT_mit": {
+            "layout": [
+                { "matrix": [0,0], "label": "Tab", "x": 0, "y": 0 },
+                { "matrix": [0,1], "label": "Q", "x": 1, "y": 0 },
+                { "matrix": [0,2], "label": "W", "x": 2, "y": 0 },
+                { "matrix": [0,3], "label": "E", "x": 3, "y": 0 },
+                { "matrix": [0,4], "label": "R", "x": 4, "y": 0 },
+                { "matrix": [0,5], "label": "T", "x": 5, "y": 0 },
+                { "matrix": [0,6], "label": "Y", "x": 6, "y": 0 },
+                { "matrix": [0,7], "label": "U", "x": 7, "y": 0 },
+                { "matrix": [0,8], "label": "I", "x": 8, "y": 0 },
+                { "matrix": [0,9], "label": "O", "x": 9, "y": 0 },
+                { "matrix": [0,10], "label": "P", "x": 10, "y": 0 },
+                { "matrix": [0,11], "label": "BS", "x": 11, "y": 0 },
+                { "matrix": [1,0], "label": "Esc", "x": 0, "y": 1 },
+                { "matrix": [1,1], "label": "A", "x": 1, "y": 1 },
+                { "matrix": [1,2], "label": "S", "x": 2, "y": 1 },
+                { "matrix": [1,3], "label": "D", "x": 3, "y": 1 },
+                { "matrix": [1,4], "label": "F", "x": 4, "y": 1 },
+                { "matrix": [1,5], "label": "G", "x": 5, "y": 1 },
+                { "matrix": [1,6], "label": "H", "x": 6, "y": 1 },
+                { "matrix": [1,7], "label": "J", "x": 7, "y": 1 },
+                { "matrix": [1,8], "label": "K", "x": 8, "y": 1 },
+                { "matrix": [1,9], "label": "L", "x": 9, "y": 1 },
+                { "matrix": [1,10], "label": ";", "x": 10, "y": 1 },
+                { "matrix": [1,11], "label": "'", "x": 11, "y": 1 },
+                { "matrix": [2,0], "label": "Shift", "x": 0, "y": 2 },
+                { "matrix": [2,1], "label": "Z", "x": 1, "y": 2 },
+                { "matrix": [2,2], "label": "X", "x": 2, "y": 2 },
+                { "matrix": [2,3], "label": "C", "x": 3, "y": 2 },
+                { "matrix": [2,4], "label": "V", "x": 4, "y": 2 },
+                { "matrix": [2,5], "label": "B", "x": 5, "y": 2 },
+                { "matrix": [2,6], "label": "N", "x": 6, "y": 2 },
+                { "matrix": [2,7], "label": "M", "x": 7, "y": 2 },
+                { "matrix": [2,8], "label": ",", "x": 8, "y": 2 },
+                { "matrix": [2,9], "label": ".", "x": 9, "y": 2 },
+                { "matrix": [2,10], "label": "/", "x": 10, "y": 2 },
+                { "matrix": [2,11], "label": "Return", "x": 11, "y": 2 },
+                { "matrix": [3,1], "label": "Ctrl", "x": 1, "y": 3 },
+                { "matrix": [3,2], "label": "Alt", "x": 2, "y": 3 },
+                { "matrix": [3,3], "label": "Super", "x": 3, "y": 3 },
+                { "matrix": [3,4], "label": "&dArr;", "x": 4, "y": 3 },
+                { "matrix": [3,5], "label": "Space", "x": 5, "y": 3, "w": 2 },
+                { "matrix": [3,7], "label": "&uArr;", "x": 7, "y": 3 },
+                { "matrix": [3,8], "label": "&larr;", "x": 8, "y": 3 },
+                { "matrix": [3,9], "label": "&darr;", "x": 9, "y": 3 },
+                { "matrix": [3,10], "label": "&uarr;", "x": 10, "y": 3 }
+            ]
+        },
+        "LAYOUT_ortho_4x12_hhkb": {
+            "layout": [
+                { "matrix": [0,0], "label": "Tab", "x": 0, "y": 0 },
+                { "matrix": [0,1], "label": "Q", "x": 1, "y": 0 },
+                { "matrix": [0,2], "label": "W", "x": 2, "y": 0 },
+                { "matrix": [0,3], "label": "E", "x": 3, "y": 0 },
+                { "matrix": [0,4], "label": "R", "x": 4, "y": 0 },
+                { "matrix": [0,5], "label": "T", "x": 5, "y": 0 },
+                { "matrix": [0,6], "label": "Y", "x": 6, "y": 0 },
+                { "matrix": [0,7], "label": "U", "x": 7, "y": 0 },
+                { "matrix": [0,8], "label": "I", "x": 8, "y": 0 },
+                { "matrix": [0,9], "label": "O", "x": 9, "y": 0 },
+                { "matrix": [0,10], "label": "P", "x": 10, "y": 0 },
+                { "matrix": [0,11], "label": "BS", "x": 11, "y": 0 },
+                { "matrix": [1,0], "label": "Esc", "x": 0, "y": 1 },
+                { "matrix": [1,1], "label": "A", "x": 1, "y": 1 },
+                { "matrix": [1,2], "label": "S", "x": 2, "y": 1 },
+                { "matrix": [1,3], "label": "D", "x": 3, "y": 1 },
+                { "matrix": [1,4], "label": "F", "x": 4, "y": 1 },
+                { "matrix": [1,5], "label": "G", "x": 5, "y": 1 },
+                { "matrix": [1,6], "label": "H", "x": 6, "y": 1 },
+                { "matrix": [1,7], "label": "J", "x": 7, "y": 1 },
+                { "matrix": [1,8], "label": "K", "x": 8, "y": 1 },
+                { "matrix": [1,9], "label": "L", "x": 9, "y": 1 },
+                { "matrix": [1,10], "label": ";", "x": 10, "y": 1 },
+                { "matrix": [1,11], "label": "'", "x": 11, "y": 1 },
+                { "matrix": [2,0], "label": "Shift", "x": 0, "y": 2 },
+                { "matrix": [2,1], "label": "Z", "x": 1, "y": 2 },
+                { "matrix": [2,2], "label": "X", "x": 2, "y": 2 },
+                { "matrix": [2,3], "label": "C", "x": 3, "y": 2 },
+                { "matrix": [2,4], "label": "V", "x": 4, "y": 2 },
+                { "matrix": [2,5], "label": "B", "x": 5, "y": 2 },
+                { "matrix": [2,6], "label": "N", "x": 6, "y": 2 },
+                { "matrix": [2,7], "label": "M", "x": 7, "y": 2 },
+                { "matrix": [2,8], "label": ",", "x": 8, "y": 2 },
+                { "matrix": [2,9], "label": ".", "x": 9, "y": 2 },
+                { "matrix": [2,10], "label": "/", "x": 10, "y": 2 },
+                { "matrix": [2,11], "label": "Return", "x": 11, "y": 2 },
+                { "matrix": [3,1], "label": "Ctrl", "x": 1, "y": 3 },
+                { "matrix": [3,2], "label": "Alt", "x": 2, "y": 3 },
+                { "matrix": [3,3], "label": "Super", "x": 3, "y": 3 },
+                { "matrix": [3,4], "label": "&dArr", "x": 4, "y": 3 },
+                { "matrix": [3,5], "label": "Space", "x": 5, "y": 3 },
+                { "matrix": [3,6], "label": "Space", "x": 6, "y": 3 },
+                { "matrix": [3,7], "label": "&uArr;", "x": 7, "y": 3 },
+                { "matrix": [3,8], "label": "Super", "x": 8, "y": 3 },
+                { "matrix": [3,9], "label": "Alt", "x": 9, "y": 3 },
+                { "matrix": [3,10], "label": "Ctrl", "x": 10, "y": 3 }
+            ]
+        },
+        "LAYOUT_ortho_bigbar": {
+            "layout": [
+                { "matrix": [0,0], "label": "Tab", "x": 0, "y": 0 },
+                { "matrix": [0,1], "label": "Q", "x": 1, "y": 0 },
+                { "matrix": [0,2], "label": "W", "x": 2, "y": 0 },
+                { "matrix": [0,3], "label": "E", "x": 3, "y": 0 },
+                { "matrix": [0,4], "label": "R", "x": 4, "y": 0 },
+                { "matrix": [0,5], "label": "T", "x": 5, "y": 0 },
+                { "matrix": [0,6], "label": "Y", "x": 6, "y": 0 },
+                { "matrix": [0,7], "label": "U", "x": 7, "y": 0 },
+                { "matrix": [0,8], "label": "I", "x": 8, "y": 0 },
+                { "matrix": [0,9], "label": "O", "x": 9, "y": 0 },
+                { "matrix": [0,10], "label": "P", "x": 10, "y": 0 },
+                { "matrix": [0,11], "label": "BS", "x": 11, "y": 0 },
+                { "matrix": [1,0], "label": "Esc", "x": 0, "y": 1 },
+                { "matrix": [1,1], "label": "A", "x": 1, "y": 1 },
+                { "matrix": [1,2], "label": "S", "x": 2, "y": 1 },
+                { "matrix": [1,3], "label": "D", "x": 3, "y": 1 },
+                { "matrix": [1,4], "label": "F", "x": 4, "y": 1 },
+                { "matrix": [1,5], "label": "G", "x": 5, "y": 1 },
+                { "matrix": [1,6], "label": "H", "x": 6, "y": 1 },
+                { "matrix": [1,7], "label": "J", "x": 7, "y": 1 },
+                { "matrix": [1,8], "label": "K", "x": 8, "y": 1 },
+                { "matrix": [1,9], "label": "L", "x": 9, "y": 1 },
+                { "matrix": [1,10], "label": ";", "x": 10, "y": 1 },
+                { "matrix": [1,11], "label": "'", "x": 11, "y": 1 },
+                { "matrix": [2,0], "label": "Shift", "x": 0, "y": 2 },
+                { "matrix": [2,1], "label": "Z", "x": 1, "y": 2 },
+                { "matrix": [2,2], "label": "X", "x": 2, "y": 2 },
+                { "matrix": [2,3], "label": "C", "x": 3, "y": 2 },
+                { "matrix": [2,4], "label": "V", "x": 4, "y": 2 },
+                { "matrix": [2,5], "label": "B", "x": 5, "y": 2 },
+                { "matrix": [2,6], "label": "N", "x": 6, "y": 2 },
+                { "matrix": [2,7], "label": "M", "x": 7, "y": 2 },
+                { "matrix": [2,8], "label": ",", "x": 8, "y": 2 },
+                { "matrix": [2,9], "label": ".", "x": 9, "y": 2 },
+                { "matrix": [2,10], "label": "/", "x": 10, "y": 2 },
+                { "matrix": [2,11], "label": "Return", "x": 11, "y": 2 },
+                { "matrix": [3,1], "label": "Ctrl", "x": 1, "y": 3, "w": 1.5 },
+                { "matrix": [3,5], "label": "Space", "x": 2.5, "y": 3, "w": 7 },
+                { "matrix": [3,10], "label": "Alt", "x": 9.5, "y": 3, "w": 1.5 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/brick/keymaps/default/keymap.c b/keyboards/pauperboards/brick/keymaps/default/keymap.c
index f488834ea4..a008d2d8c2 100644
--- a/keyboards/brick/keymaps/default/keymap.c
+++ b/keyboards/pauperboards/brick/keymaps/default/keymap.c
@@ -1,4 +1,4 @@
-/* Copyright 2023 Juno Nguyen <juno.ngx@gmail.com>
+/* Copyright 2023 Jason Chestnut <pauperboards@gmail.com> @pauperboards
  *
  * 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
@@ -24,16 +24,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * |------+------+------+------+------+-------------+------+------+------+------+------|
      * | Tab  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
      * |------+------+------+------+------+------|------+------+------+------+------+------|
-     * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |  Up  |Enter |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * | Ctrl |  GUI | Caps |  Alt |Layer1|    Space    |Layer2|  /   | Left | Down |Right |
-     * `-----------------------------------------------------------------------------------'
+     * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
+     * `------+------+------+------+------+------+------+------+------+------+------+------'
+     *        | Caps | Ctrl |  Alt |   Space L1  |   Space L2  |  Alt | GUI  | Ctrl |
+     *        `---------------------------------------------------------------------'
      */
-    [0] = LAYOUT_ortho_4x12 (
+    [0] = LAYOUT_ortho_2x2u (
         KC_ESC,  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_QUOT,
         KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,  KC_B,   KC_N,   KC_M,  KC_COMM, KC_DOT,  KC_UP,   KC_ENT,
-        KC_LCTL, KC_LGUI, KC_CAPS, KC_LALT, MO(1), KC_SPC, KC_SPC, MO(2), KC_SLSH, KC_LEFT, KC_DOWN, KC_RGHT
+                 KC_CAPS, KC_LCTL, KC_LALT, LT(1,KC_SPC),  LT(2,KC_SPC),  KC_LALT, KC_LGUI, KC_LCTL
     ),
 
     /* Layer 1
@@ -44,14 +44,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * |------+------+------+------+------+------|------+------+------+------+------+------|
      * |      |      |      |      |      |      |      |      |      |      |      |      |
      * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * | Reset|      |      |      |      |      |      |      |      |      |      |      |
-     * `-----------------------------------------------------------------------------------'
+     *        |      |      |      |             |             |      |      |      |
+     *        `---------------------------------------------------------------------'
      */
-    [1] = LAYOUT_ortho_4x12 (
+    [1] = LAYOUT_ortho_2x2u (
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______,
         _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, _______, KC_F11,  KC_F12,  _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+                 _______, _______, _______,          _______, _______,          _______, _______, _______
     ),
 
     /* Layer 2 (r_ Indicates RGB Controls)
@@ -60,15 +60,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * |------+------+------+------+------+-------------+------+------+------+------+------|
      * |      |r_TOG |r_Mode|r_Hue+|r_Hue-|      |      |   -  |   =  |   [  |   ]  |  \   |
      * |------+------+------+------+------+------|------+------+------+------+------+------|
-     * |      |BL_TOG|BL_STEP|     |      |      |      |      |      |      |      |      |
+     * |      |BL_TOG|BL_STEP|     |      |      |      |      |      |      |      | BOOT |
      * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |      |      |      |      |      |      |      |      |      |      |      |
-     * `-----------------------------------------------------------------------------------'
+     *        |      |      |      |             |             |      |      |      |
+     *        `---------------------------------------------------------------------'
      */
-    [2] = LAYOUT_ortho_4x12 (
+    [2] = LAYOUT_ortho_2x2u (
         _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______,
         _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, _______, _______, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
-        _______, BL_TOGG, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______
+        _______, BL_TOGG, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
+                 _______, _______, _______,          _______, _______,          _______, _______, _______
     )
 };
diff --git a/keyboards/brick/keymaps/via/keymap.c b/keyboards/pauperboards/brick/keymaps/via/keymap.c
index 693cc71752..e5b8e24e7f 100644
--- a/keyboards/brick/keymaps/via/keymap.c
+++ b/keyboards/pauperboards/brick/keymaps/via/keymap.c
@@ -1,4 +1,4 @@
-/* Copyright 2023 Juno Nguyen <juno.ngx@gmail.com>
+/* Copyright 2023 Jason Chestnut <pauperboards@gmail.com> @pauperboards
  *
  * 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
@@ -18,31 +18,31 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-    [0] = LAYOUT_ortho_4x12 (
+    [0] = LAYOUT_ortho_4x12_hhkb (
         KC_ESC,  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_QUOT,
         KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,  KC_B,   KC_N,   KC_M,  KC_COMM, KC_DOT,  KC_UP,   KC_ENT,
-        KC_LCTL, KC_LGUI, KC_CAPS, KC_LALT, MO(1), KC_SPC, KC_SPC, MO(2), KC_SLSH, KC_LEFT, KC_DOWN, KC_RGHT
+                 KC_LGUI, KC_CAPS, KC_LALT, MO(1), KC_SPC, KC_SPC, MO(2), KC_SLSH, KC_LEFT, KC_DOWN
     ),
 
-    [1] = LAYOUT_ortho_4x12 (
+    [1] = LAYOUT_ortho_4x12_hhkb (
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______,
         _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, _______, KC_F11,  KC_F12,  _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+                 QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______
     ),
 
-    [2] = LAYOUT_ortho_4x12 (
+    [2] = LAYOUT_ortho_4x12_hhkb (
         _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______,
         _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, _______, _______, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
         _______, BL_TOGG, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______
+                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
     ),
 
-    [3] = LAYOUT_ortho_4x12 (
+    [3] = LAYOUT_ortho_4x12_hhkb (
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+                 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     )
 };
diff --git a/keyboards/brick/keymaps/via/rules.mk b/keyboards/pauperboards/brick/keymaps/via/rules.mk
index 036bd6d1c3..036bd6d1c3 100644
--- a/keyboards/brick/keymaps/via/rules.mk
+++ b/keyboards/pauperboards/brick/keymaps/via/rules.mk
diff --git a/keyboards/pauperboards/brick/readme.md b/keyboards/pauperboards/brick/readme.md
new file mode 100644
index 0000000000..1c627a21d0
--- /dev/null
+++ b/keyboards/pauperboards/brick/readme.md
@@ -0,0 +1,28 @@
+# Brick
+
+![Brick, top view](https://i.imgur.com/BLJ6Tumh.jpg)
+![Brick, layout options](https://i.imgur.com/JhsWzY7h.png)
+
+Brick is a 12u, 4 row ortholinear keyboard designed as a drop in replacement for PCBs like the Niu Mini. Brick features a USB-C port, an ATMega32u4, RGB underglow, three possible rotary encoder locations, and multiple ortho layout options.
+
+* Keyboard Maintainer: [pauper](https://github.com/pauperboards)
+* Hardware Supported:
+    * Brick v0.1 - prototype first run with red solder mask and needing a bodge wire across the top row encoder location.
+    * Brick v0.2 - same layout and components as v0.1, but with the bodge fixed. This version was run as part of Cervello group buy by [P3DStore](http://p3dstore.com).
+* Hardware Availability: Some remaining pcbs might be available for purchase from [P3D](http://p3dstore.com/collections/pcbs/products/cervello-pcb-only-group-buy).
+
+Make example for this keyboard (after setting up your build environment):
+
+    make pauperboards/brick:default
+
+Flashing example for this keyboard:
+    
+    make pauperboards/brick:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+Enter the bootloader in one of 2 ways:
+
+* **Physical Reset Button**: Briefly press the button on the underside of the pcb, near the MCU.
+* **Keycode**: Press the key mapped to `QK_BOOT` in your keymap, if available.
diff --git a/keyboards/pauperboards/brick/rules.mk b/keyboards/pauperboards/brick/rules.mk
new file mode 100644
index 0000000000..333c4e5973
--- /dev/null
+++ b/keyboards/pauperboards/brick/rules.mk
@@ -0,0 +1 @@
+# This file intenionally left blank