Rework LAYOUT_alice support; add LAYOUT_alice_split_bs (qmk#11106)

* Add LAYOUT_alice support: fallacy * Add LAYOUT_alice support: kb_elmo/sesame * Add LAYOUT_alice support: cheshire/curiosity * Add LAYOUT_alice support: evyd13/wonderland * Add LAYOUT_alice support: mechlovin/adelais * Update LAYOUT_alice support: projectkb/alice The PR that added Alice community layout support for the projectkb/alice/rev2 simultaneously broke support for every other keyboard that supported LAYOUT_alice. This commit partially reverts the offending PR. `LAYOUT_alice` for the projectkb/alice has been renamed to `LAYOUT_alice_split_bs`, and a correct 65-key `LAYOUT_alice` has been added. Additionally, the `LAYOUTS` rule has been moved to keyboard level as the layout macros are shared between rev1 and rev2 boards, which means the layout options are the same for both revisions. * Update ramonimbao/aelith info.json Keyboard source was already correct to support LAYOUT_alice, but the layout tree was missing from info.json. * Fork `alice` Community Layout... ... into Standard and Split Backspace versions Also updates stanrc85's layout keymap to use 65 keys instead of the Split Backspace 66-key version. * Update LAYOUT_alice support: sneakbox/aliceclone Rework the sneakbox/aliceclone to use the Split Backspace Alice layout. * Update LAYOUT_alice support: zoo/wampus The layout macro that was `LAYOUT_alice` was 66 keys. This layout macro has been renamed to `LAYOUT_alice_split_bs`, and a 65-key `LAYOUT_alice` has been added. Additionally, the 66-key macro has been rearranged to accept its keycodes in the intended order for Community Layout support. * Update keyboards for `LAYOUT_alice_split_bs` support * LAYOUT_alice_split_bs support: ergosaurus * LAYOUT_alice_split_bs support: handwired/colorlice * LAYOUT_alice(_split_bs) support: handwired/owlet60 * LAYOUT_alice_split_bs support: nightly_boards/alter/rev1 * LAYOUT_alice(_split_bs) support: sck/osa * LAYOUT_alice_split_bs support: tgr/alice * LAYOUT_alice(_split_bs) support: tkc/osav2 * LAYOUT_alice_split_bs support: xelus/valor/rev1
besselfunct · Dec 3, 2020 · 138c3e7 · 138c3e7
1 parent a5a65fb
commit 138c3e7
Show file tree

Hide file tree

Showing 74 changed files with 933 additions and 123 deletions.
diff --git a/keyboards/cheshire/curiosity/curiosity.h b/keyboards/cheshire/curiosity/curiosity.h
@@ -26,7 +26,7 @@
  * The second converts the arguments into a two-dimensional array which
  * represents the switch matrix.
  */
-#define LAYOUT_default( \
+#define LAYOUT_alice_split_bs( \
   K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \
   K100, K101, K102, K103, K104, K105, K106,       K108, K109, K110, K111, K112, K113, K114, K115, \
   K200, K201, K202, K203, K204, K205, K206,       K208, K209, K210, K211, K212, K213,      K215,  \
@@ -40,3 +40,20 @@
     { ____, K301, K302, K303, K304, K305, K306, ____, K308, K309, K310, K311, K312, K313, K314, K315}, \
     { ____, K401, ____, K403, ____, K405, K406, ____, ____, K409, ____, K411, ____, ____, K414, ____}, \
 }
+
+#define LAYOUT_alice( \
+  K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013,       K015, \
+  K100, K101, K102, K103, K104, K105, K106,       K108, K109, K110, K111, K112, K113, K114, K115, \
+  K200, K201, K202, K203, K204, K205, K206,       K208, K209, K210, K211, K212, K213,      K215,  \
+        K301, K302, K303, K304, K305, K306,       K308, K309, K310, K311, K312, K313, K314, K315, \
+        K401,       K403,       K405, K406,             K409,       K411,                K414 \
+) \
+{ \
+    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, ____, K015}, \
+    { K100, K101, K102, K103, K104, K105, K106, ____, K108, K109, K110, K111, K112, K113, K114, K115}, \
+    { K200, K201, K202, K203, K204, K205, K206, ____, K208, K209, K210, K211, K212, K213, ____, K215}, \
+    { ____, K301, K302, K303, K304, K305, K306, ____, K308, K309, K310, K311, K312, K313, K314, K315}, \
+    { ____, K401, ____, K403, ____, K405, K406, ____, ____, K409, ____, K411, ____, ____, K414, ____}, \
+}
+
+#define LAYOUT_default LAYOUT_alice_split_bs
diff --git a/keyboards/cheshire/curiosity/info.json b/keyboards/cheshire/curiosity/info.json
@@ -4,7 +4,7 @@
     "width": 19.75,
     "height": 5.25,
     "layouts": {
-        "LAYOUT_default": {
+        "LAYOUT_alice_split_bs": {
             "layout": [
                 {"label":"Esc", "x":0.5, "y":0},
                 {"label":"`", "x":1.75, "y":0.25},
@@ -69,6 +69,79 @@
                 {"label":"Shift", "x":17, "y":3.25, "w":1.75},
                 {"label":"Fn", "x":18.75, "y":3.25},
 
+                {"label":"Ctrl", "x":1.5, "y":4.25, "w":1.5},
+                {"label":"Alt", "x":5, "y":4.25, "w":1.5},
+                {"label":"Space", "x":6.5, "y":4.25, "w":2},
+                {"label":"Menu", "x":8.5, "y":4.25},
+                {"label":"Space", "x":10.25, "y":4.25, "w":2.75},
+                {"label":"Alt", "x":13, "y":4.25, "w":1.5},
+                {"label":"Ctrl", "x":18, "y":4.25, "w":1.5}
+            ]
+        },
+        "LAYOUT_alice": {
+            "layout": [
+                {"label":"Esc", "x":0.5, "y":0},
+                {"label":"`", "x":1.75, "y":0.25},
+                {"label":"1", "x":2.75, "y":0.25},
+                {"label":"2", "x":3.75, "y":0},
+                {"label":"3", "x":4.75, "y":0.25},
+                {"label":"4", "x":5.75, "y":0.25},
+                {"label":"5", "x":6.75, "y":0.25},
+                {"label":"6", "x":7.75, "y":0.25},
+                {"label":"7", "x":11, "y":0.25},
+                {"label":"8", "x":12, "y":0.25},
+                {"label":"9", "x":13, "y":0.25},
+                {"label":"0", "x":14, "y":0.25},
+                {"label":"-", "x":15, "y":0},
+                {"label":"=", "x":16, "y":0.25},
+                {"label":"Backspace", "x":17, "y":0.25, "w":2},
+
+                {"label":"PgUp", "x":0.25, "y":1},
+                {"label":"Tab", "x":1.5, "y":1.25, "w":1.5},
+                {"label":"Q", "x":3, "y":1.25},
+                {"label":"W", "x":4.25, "y":1.25},
+                {"label":"E", "x":5.25, "y":1.25},
+                {"label":"R", "x":6.25, "y":1.25},
+                {"label":"T", "x":7.25, "y":1.25},
+                {"label":"Y", "x":10.5, "y":1.25},
+                {"label":"U", "x":11.5, "y":1.25},
+                {"label":"I", "x":12.5, "y":1.25},
+                {"label":"O", "x":13.5, "y":1.25},
+                {"label":"P", "x":14.75, "y":1.25},
+                {"label":"{", "x":15.75, "y":1.25},
+                {"label":"}", "x":16.75, "y":1.25},
+                {"label":"|", "x":17.75, "y":1.25, "w":1.5},
+
+                {"label":"PgDn", "x":0, "y":2},
+                {"label":"Caps Lock", "x":1.5, "y":2.25, "w":1.75},
+                {"label":"A", "x":3.25, "y":2.25},
+                {"label":"S", "x":4.5, "y":2.25},
+                {"label":"D", "x":5.5, "y":2.25},
+                {"label":"F", "x":6.5, "y":2.25},
+                {"label":"G", "x":7.5, "y":2.25},
+                {"label":"H", "x":10.75, "y":2.25},
+                {"label":"J", "x":11.75, "y":2.25},
+                {"label":"K", "x":12.75, "y":2.25},
+                {"label":"L", "x":13.75, "y":2.25},
+                {"label":":", "x":15.25, "y":2.25},
+                {"label":"\"", "x":16.25, "y":2.25},
+                {"label":"Enter", "x":17.25, "y":2.25, "w":2.25},
+
+                {"label":"Shift", "x":1.5, "y":3.25, "w":2.25},
+                {"label":"Z", "x":3.75, "y":3.25},
+                {"label":"X", "x":5, "y":3.25},
+                {"label":"C", "x":6, "y":3.25},
+                {"label":"V", "x":7, "y":3.25},
+                {"label":"B", "x":8, "y":3.25},
+                {"label":"Fn", "x":10.25, "y":3.25},
+                {"label":"N", "x":11.25, "y":3.25},
+                {"label":"M", "x":12.25, "y":3.25},
+                {"label":"<", "x":13.25, "y":3.25},
+                {"label":">", "x":15, "y":3.25},
+                {"label":"?", "x":16, "y":3.25},
+                {"label":"Shift", "x":17, "y":3.25, "w":1.75},
+                {"label":"Fn", "x":18.75, "y":3.25},
+
                 {"label":"Ctrl", "x":1.5, "y":4.25, "w":1.5},
                 {"label":"Alt", "x":5, "y":4.25, "w":1.5},
                 {"label":"Space", "x":6.5, "y":4.25, "w":2},

diff --git a/keyboards/cheshire/curiosity/rules.mk b/keyboards/cheshire/curiosity/rules.mk
@@ -15,3 +15,5 @@ SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 NKRO_ENABLE = no            # USB Nkey Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+
+LAYOUTS = alice alice_split_bs
diff --git a/keyboards/coarse/cordillera/rules.mk b/keyboards/coarse/cordillera/rules.mk
@@ -18,5 +18,7 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 BLUETOOTH_ENABLE = no       # Enable Bluetooth
 AUDIO_ENABLE = no           # Audio output
 
+LAYOUTS = alice alice_split_bs
+
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/ergosaurus/ergosaurus.h b/keyboards/ergosaurus/ergosaurus.h
@@ -19,7 +19,7 @@
 
 #define KNO KC_NO
 
-#define LAYOUT( \
+#define LAYOUT_alice_split_bs( \
   K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07, K17, \
   K20, K30, K21, K31, K22, K32, K23,      K33, K24, K34, K25, K35, K26, K36, K27, \
   K40, K50, K41, K51, K42, K52, K43,      K53, K44, K54, K45, K55, K46,      K47, \
@@ -36,3 +36,5 @@
   {  KNO, K71, K72, K73, K74, K75, K76, KNO  }, \
   {  K80, K81, K82, K83, K84, K85, KNO, K87  }  \
 }
+
+#define LAYOUT LAYOUT_alice_split_bs
diff --git a/keyboards/ergosaurus/info.json b/keyboards/ergosaurus/info.json
@@ -4,7 +4,7 @@
     "width": 19.75,
     "height": 5.25,
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_alice_split_bs": {
             "layout": [
                 {"label":"`", "x":0.5, "y":0},
                 {"label":"Esc", "x":1.75, "y":0.25},

diff --git a/keyboards/ergosaurus/keymaps/default/keymap.c b/keyboards/ergosaurus/keymaps/default/keymap.c
@@ -21,23 +21,23 @@
 
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [BASE] = LAYOUT(
+  [BASE] = LAYOUT_alice_split_bs(
       KC_GRV,  KC_ESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS,  KC_DEL,
       KC_PGUP, KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,             KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
       KC_PGDN, KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,             KC_H,   KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
                KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,             KC_B,   KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(LOWER),
                KC_LGUI,          KC_LALT, KC_ENT, MO(RAISE),                            KC_SPC,           KC_RALT,                          KC_RCTL
     ),
 
-    [LOWER] = LAYOUT(
+    [LOWER] = LAYOUT_alice_split_bs(
       _______,  KC_GRV, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,  _______,
       _______,  _______,  _______, _______,  _______, _______, _______,          _______, _______, _______, _______, _______, KC_UP, _______, _______,
       _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, KC_LEFT, KC_RIGHT,          _______,
                 _______, _______,  _______,  _______, _______, _______,          _______, _______, _______, _______, _______, KC_DOWN, _______, _______,
                 _______,          _______, _______, _______,                            _______,          _______,                              _______
     ),
 
-    [RAISE] = LAYOUT(
+    [RAISE] = LAYOUT_alice_split_bs(
       _______,  _______, _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,  _______,  _______,  _______,  _______,
       _______,  _______,  _______, _______,  _______, _______, _______,          _______, _______, KC_UP, _______, _______, _______, _______, _______,
       _______, _______, _______, _______, _______, _______, _______,          _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______,          _______,

diff --git a/keyboards/ergosaurus/rules.mk b/keyboards/ergosaurus/rules.mk
@@ -30,3 +30,5 @@ UNICODE_ENABLE = no         # Unicode
 BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 AUDIO_ENABLE = no           # Audio output on port C6
 FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches
+
+LAYOUTS = alice_split_bs
diff --git a/keyboards/evyd13/wonderland/info.json b/keyboards/evyd13/wonderland/info.json
@@ -5,7 +5,7 @@
     "width": 18.25,
     "height": 5,
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_alice_split_bs": {
             "key_count": 66,
             "layout": [
                 {"label":"k10", "x":0, "y":0},
@@ -75,6 +75,75 @@
                 {"label":"k4a", "x":12.25, "y":4, "w":1.5},
                 {"label":"k4e", "x":16.75, "y":4, "w":1.5}
             ]
+        },
+        "LAYOUT_alice": {
+            "layout": [
+                {"label":"k10", "x":0, "y":0},
+                {"label":"k00", "x":1.25, "y":0},
+                {"label":"k01", "x":2.25, "y":0},
+                {"label":"k02", "x":3.25, "y":0},
+                {"label":"k03", "x":4.25, "y":0},
+                {"label":"k04", "x":5.25, "y":0},
+                {"label":"k05", "x":6.25, "y":0},
+                {"label":"k06", "x":7.25, "y":0},
+                {"label":"k07", "x":10.25, "y":0},
+                {"label":"k08", "x":11.25, "y":0},
+                {"label":"k09", "x":12.25, "y":0},
+                {"label":"k0a", "x":13.25, "y":0},
+                {"label":"k0b", "x":14.25, "y":0},
+                {"label":"k0c", "x":15.25, "y":0},
+                {"label":"k0e", "x":16.25, "y":0, "w":2},
+                {"label":"k20", "x":0, "y":1},
+                {"label":"k11", "x":1.25, "y":1, "w":1.5},
+                {"label":"k12", "x":2.75, "y":1},
+                {"label":"k13", "x":3.75, "y":1},
+                {"label":"k14", "x":4.75, "y":1},
+                {"label":"k15", "x":5.75, "y":1},
+                {"label":"k16", "x":6.75, "y":1},
+                {"label":"k17", "x":9.75, "y":1},
+                {"label":"k18", "x":10.75, "y":1},
+                {"label":"k19", "x":11.75, "y":1},
+                {"label":"k1a", "x":12.75, "y":1},
+                {"label":"k1b", "x":13.75, "y":1},
+                {"label":"k1c", "x":14.75, "y":1},
+                {"label":"k1d", "x":15.75, "y":1},
+                {"label":"k1e", "x":16.75, "y":1, "w":1.5},
+                {"label":"k30", "x":0, "y":2},
+                {"label":"k21", "x":1.25, "y":2, "w":1.75},
+                {"label":"k22", "x":3, "y":2},
+                {"label":"k23", "x":4, "y":2},
+                {"label":"k24", "x":5, "y":2},
+                {"label":"k25", "x":6, "y":2},
+                {"label":"k26", "x":7, "y":2},
+                {"label":"k27", "x":10, "y":2},
+                {"label":"k28", "x":11, "y":2},
+                {"label":"k29", "x":12, "y":2},
+                {"label":"k2a", "x":13, "y":2},
+                {"label":"k2b", "x":14, "y":2},
+                {"label":"k2c", "x":15, "y":2},
+                {"label":"k2e", "x":16, "y":2, "w":2.25},
+                {"label":"k31", "x":1.25, "y":3, "w":2.25},
+                {"label":"k32", "x":3.5, "y":3},
+                {"label":"k33", "x":4.5, "y":3},
+                {"label":"k34", "x":5.5, "y":3},
+                {"label":"k35", "x":6.5, "y":3},
+                {"label":"k36", "x":7.5, "y":3},
+                {"label":"k37", "x":9.5, "y":3},
+                {"label":"k38", "x":10.5, "y":3},
+                {"label":"k39", "x":11.5, "y":3},
+                {"label":"k3a", "x":12.5, "y":3},
+                {"label":"k3b", "x":13.5, "y":3},
+                {"label":"k3c", "x":14.5, "y":3},
+                {"label":"k3d", "x":15.5, "y":3, "w":1.75},
+                {"label":"k3e", "x":17.25, "y":3},
+                {"label":"k41", "x":1.25, "y":4, "w":1.5},
+                {"label":"k43", "x":4.25, "y":4, "w":1.5},
+                {"label":"k45", "x":5.75, "y":4, "w":2},
+                {"label":"k46", "x":7.75, "y":4, "w":1.25},
+                {"label":"k48", "x":9.5, "y":4, "w":2.75},
+                {"label":"k4a", "x":12.25, "y":4, "w":1.5},
+                {"label":"k4e", "x":16.75, "y":4, "w":1.5}
+            ]
         }
     }
 }
diff --git a/keyboards/evyd13/wonderland/rules.mk b/keyboards/evyd13/wonderland/rules.mk
@@ -29,3 +29,4 @@ BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
 AUTO_SHIFT_ENABLE = no
 VELOCIKEY_ENABLE = yes
 
+LAYOUTS = alice alice_split_bs
diff --git a/keyboards/evyd13/wonderland/wonderland.h b/keyboards/evyd13/wonderland/wonderland.h
@@ -3,7 +3,7 @@
 
 // readability
 #define XXX KC_NO
-#define LAYOUT( \
+#define LAYOUT_alice_split_bs( \
     k10, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
     k20, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \
     k30, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c,      k2e, \
@@ -18,5 +18,22 @@
     {XXX, k41, XXX, k43, XXX, k45, k46, XXX, k48, XXX, k4a, XXX, XXX, XXX, k4e}  \
 }
 
+#define LAYOUT_alice( \
+    k10, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0e, \
+    k20, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \
+    k30, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c,      k2e, \
+         k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
+         k41,           k43, k45, k46,      k48, k4a,                     k4e  \
+) \
+{ \
+    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, XXX, k0e}, \
+    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e}, \
+    {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, XXX, k2e}, \
+    {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e}, \
+    {XXX, k41, XXX, k43, XXX, k45, k46, XXX, k48, XXX, k4a, XXX, XXX, XXX, k4e}  \
+}
+
+#define LAYOUT LAYOUT_alice_split_bs
+
 void matrix_init_user(void);
 void matrix_scan_user(void);
diff --git a/keyboards/fallacy/fallacy.h b/keyboards/fallacy/fallacy.h
@@ -21,7 +21,7 @@
  * - Split Backspace
  * - Split Right Shift
  */
-#define LAYOUT_all( \
+#define LAYOUT_alice_split_bs( \
     K100,   K000, K001, K002, K003, K004, K005, K006,       K007, K008, K009, K010, K011, K012, K013, K014, \
     K200,   K101, K102, K103, K104, K105, K106,       K107, K108, K109, K110, K111, K112, K113, K114, \
     K300,   K201, K202, K203, K204, K205, K206,       K207, K208, K209, K210, K211, K212,       K214, \
@@ -39,7 +39,7 @@
  * - Full size Backspace
  * - Full size Right Shift
  */
-#define LAYOUT_default( \
+#define LAYOUT_alice( \
     K100,   K000, K001, K002, K003, K004, K005, K006,       K007, K008, K009, K010, K011, K012,       K014, \
     K200,   K101, K102, K103, K104, K105, K106,       K107, K108, K109, K110, K111, K112, K113, K114, \
     K300,   K201, K202, K203, K204, K205, K206,       K207, K208, K209, K210, K211, K212,       K214, \
@@ -52,3 +52,6 @@
     { K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  K314 }, \
     { KC_NO, K401,  KC_NO, K403,  KC_NO, K405,  K406,  KC_NO, K408,  KC_NO, K410,  KC_NO, KC_NO, KC_NO, K414 }  \
 }
+
+#define LAYOUT_default LAYOUT_alice
+#define LAYOUT_all LAYOUT_alice_split_bs
diff --git a/keyboards/fallacy/info.json b/keyboards/fallacy/info.json
@@ -4,7 +4,7 @@
     "width": 18.75, 
     "height": 5, 
     "layouts": {
-        "LAYOUT_all": {
+        "LAYOUT_alice_split_bs": {
             "layout": [
                 {"label":"Esc", "x":0.5, "y":0},
                 {"label":"~", "x":1.75, "y":0},
@@ -74,7 +74,7 @@
                 {"label":"RCtl", "x":17, "y":4, "w":1.5}
             ]
         },
-        "LAYOUT_default": {
+        "LAYOUT_alice": {
             "layout": [
                 {"label":"Esc", "x":0.5, "y":0},
                 {"label":"~", "x":1.75, "y":0},

diff --git a/keyboards/fallacy/keymaps/default/keymap.c b/keyboards/fallacy/keymaps/default/keymap.c
@@ -17,14 +17,14 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-    [0] = LAYOUT_default(
+    [0] = LAYOUT_alice(
         KC_ESC,     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,             KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
         KC_PGUP,    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,             KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
         KC_PGDN,    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,             KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
                     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,             KC_RGUI, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
                     KC_LCTL,                   KC_LALT, KC_SPC,  KC_LGUI,                   KC_SPC,           KC_RALT,                            KC_RCTL),
 
-    [1] = LAYOUT_default(
+    [1] = LAYOUT_alice(
         KC_TRNS,    RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,            KC_F7,   KC_F8,   KC_F9,   KC_F11,  KC_F12,  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/fallacy/rules.mk b/keyboards/fallacy/rules.mk
@@ -27,3 +27,5 @@ FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches
 SRC += indicators.c \
        drivers/issi/is31fl3731-simple.c
 QUANTUM_LIB_SRC += i2c_master.c
+
+LAYOUTS = alice alice_split_bs
diff --git a/keyboards/handwired/colorlice/colorlice.h b/keyboards/handwired/colorlice/colorlice.h
@@ -26,7 +26,7 @@
  * The second converts the arguments into a two-dimensional array which
  * represents the switch matrix.
  */
-#define LAYOUT( \
+#define LAYOUT_alice_split_bs( \
     k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, \
     k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e,      \
     k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c,      K2e,      \
@@ -40,3 +40,4 @@
     { k40,  KC_NO, k42,   k43,  k44,  KC_NO, KC_NO, k47, KC_NO,  KC_NO, k4a,  KC_NO,KC_NO,  KC_NO,  k4e, KC_NO  }, \
 }
 
+#define LAYOUT LAYOUT_alice_split_bs
Original file line number	Diff line number	Diff line change
Expand Up		@@ -29,3 +29,4 @@ BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
		AUTO_SHIFT_ENABLE = no
		VELOCIKEY_ENABLE = yes

		LAYOUTS = alice alice_split_bs