From 92be2439ec280c46c4babb60087a93b96b6e94ab Mon Sep 17 00:00:00 2001
From: Jonathan Rascher <jon@bcat.name>
Date: Sun, 27 Oct 2019 21:53:49 -0500
Subject: [PATCH] Couple more minor Lily58 keymap tweaks (#7175)

* Move grave/tilde and backslash/pipe to left hand

* Shift media keys to be aligned with home row

* Update KLE images

* Mention new media key location in readme

* Turn off a couple more features for explicitness
---
 keyboards/lily58/keymaps/bcat/keymap.c  | 10 +++++-----
 keyboards/lily58/keymaps/bcat/readme.md |  6 +++---
 users/bcat/rules.mk                     | 15 ++++++++++-----
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/keyboards/lily58/keymaps/bcat/keymap.c b/keyboards/lily58/keymaps/bcat/keymap.c
index 67aa3a414..905e4ed76 100644
--- a/keyboards/lily58/keymaps/bcat/keymap.c
+++ b/keyboards/lily58/keymaps/bcat/keymap.c
@@ -26,8 +26,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [LAYER_LOWER] = LAYOUT(
         _______,  _______,  _______,  _______,  _______,  _______,                      _______,  _______,  _______,  _______,  _______,  _______,
         _______,  KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,   KC_PERC,                      KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_LPRN,  KC_RPRN,  _______,
-        _______,  _______,  _______,  _______,  KC_DEL,   _______,                      KC_TILD,  KC_UNDS,  KC_PLUS,  KC_LCBR,  KC_RCBR,  KC_PIPE,
-        _______,  _______,  _______,  _______,  KC_INS,   _______,  _______,  _______,  KC_GRV,   KC_MINS,  KC_EQL,   KC_LBRC,  KC_RBRC,  KC_BSLS,
+        _______,  _______,  _______,  KC_PIPE,  KC_TILD,  KC_DEL,                       _______,  KC_UNDS,  KC_PLUS,  KC_LCBR,  KC_RCBR,  _______,
+        _______,  _______,  _______,  KC_BSLS,  KC_GRV,   KC_INS,   _______,  _______,  _______,  KC_MINS,  KC_EQL,   KC_LBRC,  KC_RBRC,  _______,
                                       _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______
     ),
 
@@ -43,9 +43,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Adjust layer: http://www.keyboard-layout-editor.com/#/gists/8f6a3f08350a9bbe1d414b22bca4e6c7 */
     [LAYER_ADJUST] = LAYOUT(
         _______,  _______,  _______,  _______,  _______,  _______,                      _______,  _______,  _______,  _______,  _______,  _______,
-        KC_CAPS,  KC_MPLY,  KC_VOLU,  KC_MSTP,  _______,  _______,                      EEP_RST,  RESET,    KC_PSCR,  KC_SLCK,  KC_PAUS,  _______,
-        _______,  KC_MPRV,  KC_VOLD,  KC_MNXT,  _______,  _______,                      _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  KC_MUTE,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        KC_CAPS,  _______,  KC_MPLY,  KC_VOLU,  KC_MSTP,  _______,                      EEP_RST,  RESET,    KC_PSCR,  KC_SLCK,  KC_PAUS,  _______,
+        _______,  _______,  KC_MPRV,  KC_VOLD,  KC_MNXT,  _______,                      _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  KC_MUTE,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
                                       _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______
     ),
 };
diff --git a/keyboards/lily58/keymaps/bcat/readme.md b/keyboards/lily58/keymaps/bcat/readme.md
index ac475c676..5e0d6153a 100644
--- a/keyboards/lily58/keymaps/bcat/readme.md
+++ b/keyboards/lily58/keymaps/bcat/readme.md
@@ -2,7 +2,7 @@
 
 This split ergo layout is standard QWERTY on the default layer, with symbols on
 the lower layer, numbers/navigation on the raise layer, and media keys centered
-around the WASD cluster in the adjust (raise + lower) layer. A few general
+around the ESDF cluster in the adjust (raise + lower) layer. A few general
 principles went into this layout:
 
 * The number row is optional, as are the outermost bottom row keys and the
@@ -51,7 +51,7 @@ releasing the layer key.
 
 ## Lower layer
 
-![Lower layer layout](https://i.imgur.com/zjYwqtv.png)
+![Lower layer layout](https://i.imgur.com/ytNFySG.png)
 
 ([KLE](http://www.keyboard-layout-editor.com/#/gists/19ad0d3b5d745fbb2818db09740f5a11))
 
@@ -63,6 +63,6 @@ releasing the layer key.
 
 ## Adjust layer
 
-![Adjust layer layout](https://i.imgur.com/tU72bSZ.png)
+![Adjust layer layout](https://i.imgur.com/fCIySG2.png)
 
 ([KLE](http://www.keyboard-layout-editor.com/#/gists/8f6a3f08350a9bbe1d414b22bca4e6c7))
diff --git a/users/bcat/rules.mk b/users/bcat/rules.mk
index 407729c82..107b470ed 100644
--- a/users/bcat/rules.mk
+++ b/users/bcat/rules.mk
@@ -2,12 +2,17 @@
 BOOTMAGIC_ENABLE = lite
 
 # Enable mouse and media keys on all keyboards.
-MOUSEKEY_ENABLE = yes
 EXTRAKEY_ENABLE = yes
+MOUSEKEY_ENABLE = yes
 
 # Disable some unwanted features on all keyboards.
-CONSOLE_ENABLE = no
-COMMAND_ENABLE = no
-NKRO_ENABLE = no
-UNICODE_ENABLE = no
 API_SYSEX_ENABLE = no
+COMMAND_ENABLE = no
+CONSOLE_ENABLE = no
+FAUXCLICKY_ENABLE = no
+MIDI_ENABLE = no
+NKRO_ENABLE = no
+SLEEP_LED_ENABLE = no
+UCIS_ENABLE = no
+UNICODE_ENABLE = no
+UNICODEMAP_ENABLE = no