[Keymap] Major Updates to Personal Kyria Keymap (#14485)

* added john ezra keymap with updates * changed tapping term
author: john-ezra <47311764+john-ezra@users.noreply.github.com> 2021-09-17 23:51:09 -0700
committer: GitHub <noreply@github.com> 2021-09-17 23:51:09 -0700
commit: 228c7b095b0f441652b2719713cb3bf1e5811828 (patch)
tree: 4e37232bd0b8c1e9f942dc6205e38220cf27fee5
parent: f93597d66b0698cbea87b24aad79f60e5a9db6ad (diff)
download: qmk_firmware-228c7b095b0f441652b2719713cb3bf1e5811828.tar.gz
qmk_firmware-228c7b095b0f441652b2719713cb3bf1e5811828.zip
4 files changed, 112 insertions, 124 deletions
diff --git a/keyboards/splitkb/kyria/keymaps/john-ezra/config.h b/keyboards/splitkb/kyria/keymaps/john-ezra/config.h
index 3602b560c..77f095767 100644
--- a/keyboards/splitkb/kyria/keymaps/john-ezra/config.h
+++ b/keyboards/splitkb/kyria/keymaps/john-ezra/config.h
@@ -21,16 +21,11 @@
 #endif
 #ifdef RGBLIGHT_ENABLE
-#define RGBLIGHT_EFFECT_BREATHING
+  #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+  #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+  #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_SNAKE
+  #define RGBLIGHT_EFFECT_TWINKLE
-#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
  #define RGBLIGHT_HUE_STEP 8
  #define RGBLIGHT_SAT_STEP 8
  #define RGBLIGHT_VAL_STEP 8
@@ -40,4 +35,6 @@
 #undef DEBOUNCE
 #define DEBOUNCE 1
+#define TAPPING_TERM 125
 #define SPLIT_WPM_ENABLE
diff --git a/keyboards/splitkb/kyria/keymaps/john-ezra/keymap.c b/keyboards/splitkb/kyria/keymaps/john-ezra/keymap.c
index 3664fdfac..f42cbf1d0 100644
--- a/keyboards/splitkb/kyria/keymaps/john-ezra/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/john-ezra/keymap.c
@@ -18,7 +18,6 @@
 enum kyria_layers {
  _HNTS,
-  _QWERTY,
  _LOWER,
  _RAISE,
  _ADJUST
@@ -26,17 +25,20 @@ enum kyria_layers {
 enum kyria_keycodes {
  HNTS = SAFE_RANGE,
-  QWERTY,
  LOWER,
  RAISE,
  CPY_PST,
-  UNDO
+  UNDO,
+  FIND
 };
+#define HNTS DF(_HNTS)
+#define QWERTY DF(_QWERTY)
 #define BSP_CMD MT(MOD_LGUI, KC_BSPC)
 #define SFT_ENT MT(MOD_LSFT, KC_ENT)
 #define UNDO G(KC_Z)
 #define FIND G(KC_F)
+#define MSS_CTL C(KC_UP)
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@@ -44,83 +46,62 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 * Default: HNTS
 *
 * ,-----------------------------------------------.                                  ,-----------------------------------------------.
- * |   `   |   Z   |   R   |   L   |   D   |   W   |                                  |   Y   |   P   |   U   |   X   |   Q   |  | \  |
+ * |  Find |   Z   |   R   |   L   |   D   |   W   |                                  |   Y   |   P   |   U   |   X   |   Q   |  | \  |
 * |-------+-------+-------+-------+-------+-------|                                  |-------+-------+-------+-------+-------+-------|
- * |  Esc  |   H   |   N   |   T   |   S   |   C   |                                  |   B   |   I   |   E   |   O   |   A   |  Esc  |
+ * |Cpy/Pst|   H   |   N   |   T   |   S   |   C   |                                  |   B   |   I   |   E   |   O   |   A   |  ` ~  |
 * |-------+-------+-------+-------+-------+-------+---------------.  ,---------------+-------+-------+-------+-------+-------+-------|
- * |Cpy/Pst|   K   |   V   |   M   |   F   |   G   | Ctrl  |  Alt  |  |  Caps |  Del  |   J   |  ; :  |  , <  |  . >  |  / ?  |  ' "  |
+ * |  Undo |   K   |   V   |   M   |   F   |   G   |  Esc  |MssnCtl|  |MssnCtl|  Esc  |   J   |  ; :  |  , <  |  . >  |  / ?  |  ' "  |
 * `-------+-------+-------+-------+-------+-------+-------+-------|  |-------+-------+-------+-------+-------+-----------------------'
- *                         |  Up   | Down  | Lower | Space | BSPC  |  |  Tab  | Shift | Raise |  Left | Right |
+ *                         | Ctrl  |  Alt  | Lower | Space | BSPC  |  |  Tab  | Shift | Raise |  Del  | Caps  |
 *                         `---------------------------------------'  `---------------------------------------'
 */
 [_HNTS] = LAYOUT(
       FIND,    KC_Z,    KC_R,    KC_L,    KC_D,    KC_W,                                         KC_Y,    KC_P,    KC_U,    KC_X,    KC_Q, KC_BSLS,
-    CPY_PST,    KC_H,    KC_N,    KC_T,    KC_S,    KC_C,                                         KC_B,    KC_I,    KC_E,    KC_O,    KC_A,  KC_ESC,
+    CPY_PST,    KC_H,    KC_N,    KC_T,    KC_S,    KC_C,                                         KC_B,    KC_I,    KC_E,    KC_O,    KC_A,  KC_GRV,
-       UNDO,    KC_K,    KC_V,    KC_M,    KC_F,    KC_G, KC_LCTL, KC_LALT,  KC_CAPS,  KC_DEL,    KC_J, KC_SCLN, KC_COMM,  KC_DOT, KC_SLSH, KC_QUOT,
+       UNDO,    KC_K,    KC_V,    KC_M,    KC_F,    KC_G,  KC_ESC, MSS_CTL,   MSS_CTL, KC_ESC,    KC_J, KC_SCLN, KC_COMM,  KC_DOT, KC_SLSH, KC_QUOT,
-                                 KC_UP, KC_DOWN,   LOWER,  KC_SPC, BSP_CMD,   KC_TAB, SFT_ENT,   RAISE, KC_LEFT, KC_RGHT
+                               KC_LCTL, KC_LALT,   LOWER,  KC_SPC, BSP_CMD,   KC_TAB, SFT_ENT,   RAISE,  KC_DEL, KC_CAPS
 ),
 /*
- * Default: QWERTY
+ * Lower: Symbols & Media
 *
 * ,-----------------------------------------------.                                  ,-----------------------------------------------.
- * |   `   |   Q   |   W   |   E   |   R   |   T   |                                  |   Y   |   U   |   I   |   O   |   P   |  | \  |
+ * |  Tab  |   *   |   /   |   +   |   -   |   =   |                                  |   |   |   {   |   }   |   @   |   !   |   `   |
 * |-------+-------+-------+-------+-------+-------|                                  |-------+-------+-------+-------+-------+-------|
- * |  Esc  |   A   |   S   |   D   |   F   |   G   |                                  |   H   |   J   |   K   |   L   |   ;   |  ' "  |
+ * | Enter | Left  |  Up   | Down  | Right |       |                                  |   \   |   (   |   )   |   $   |   #   |   ~   |
 * |-------+-------+-------+-------+-------+-------+---------------.  ,---------------+-------+-------+-------+-------+-------+-------|
- * |Cpy/Pst|   Z   |   X   |   C   |   V   |   B   | Ctrl  |  Alt  |  |  Caps |  Del  |   N   |   M   |  , <  |  . >  |  / ?  |Cpy/Pst|
+ * |  Esc  | Vol-  | Vol+  | Prev  | Play  |  Next |       |       |  |       |       |   _   |   [   |   ]   |   ^   |   %   |   &   |
- * `-------+-------+-------+-------+-------+-------+-------+-------|  |-------+-------+-------+-------+-------+-----------------------'
- *                         |  Up   | Down  | Lower | Space | BSPC  |  |  Tab  | Shift | Raise |  Left | Right |
- *                         `---------------------------------------'  `---------------------------------------'
- */
-[_QWERTY] = LAYOUT(
-     KC_GRV,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                                         KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_BSLS,
-     KC_ESC,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                                         KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT,
-    CPY_PST,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B, KC_LCTL, KC_LALT,  KC_CAPS,  KC_DEL,    KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH, CPY_PST,
-                                 KC_UP, KC_DOWN,   LOWER,  KC_SPC, BSP_CMD,   KC_TAB, SFT_ENT,   RAISE, KC_LEFT, KC_RGHT
-),
-/*
- * Lower: Symbols
- *
- * ,-----------------------------------------------.                                  ,-----------------------------------------------.
- * |       |   !   |   @   |   {   |   }   |   |   |                                  |       |       |       |       |       |  | \  |
- * |-------+-------+-------+-------+-------+-------|                                  |-------+-------+-------+-------+-------+-------|
- * |       |   #   |   $   |   (   |   )   |  ` ~  |                                  |   +   |   -   |   *   |   /   |   =   |       |
- * |-------+-------+-------+-------+-------+-------+---------------.  ,---------------+-------+-------+-------+-------+-------+-------|
- * |       |   %   |   ^   |   [   |   ]   |   &   |       |       |  |       |       |      |       |       |       |       |        |
 * `-------+-------+-------+-------+-------+-------+-------+-------|  |-------+-------+-------+-------+-------+-----------------------'
 *                         |       |       |       |       |       |  |       |       |       |       |       |
 *                         `---------------------------------------'  `---------------------------------------'
 */
 [_LOWER] = LAYOUT(
-     KC_GRV, KC_EXLM,   KC_AT, KC_LCBR, KC_RCBR, KC_PIPE,                                      _______, _______, _______, _______, _______, _______,
+    KC_TAB,  KC_ASTR, KC_SLSH, KC_PLUS, KC_MINS,  KC_EQL,                                      KC_PIPE, KC_LCBR, KC_RCBR,   KC_AT, KC_EXLM,  KC_GRV,
-    KC_TILD, KC_HASH,  KC_DLR, KC_LPRN, KC_RPRN, KC_BSLS,                                      KC_PLUS, KC_MINS, KC_ASTR, KC_SLSH,  KC_EQL, _______,
+    KC_ENT,  KC_LEFT,   KC_UP, KC_DOWN, KC_RGHT, _______,                                      KC_BSLS, KC_LPRN, KC_RPRN,  KC_DLR, KC_HASH, KC_TILD,
-    KC_AMPR, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_UNDS, _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______,
+    KC_ESC,  KC_VOLD, KC_VOLU, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______,  _______, _______, KC_UNDS, KC_LBRC, KC_RBRC, KC_CIRC, KC_PERC, KC_AMPR,
                               _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______
 ),
 /*
- * Raise: Numbers & Media
+ * Raise: Numbers
 *
 * ,-----------------------------------------------.                                  ,-----------------------------------------------.
- * |       |   1   |   2   |   3   |   4   |   5   |                                  |   6   |   7   |   8   |   9   |   0   |       |
+ * |       |  F1   |  F2   |  F3   |  F4   |  F5   |                                  |   F6  |   F7  |   F8  |   F9  |  F10  |  F11  |
 * |-------+-------+-------+-------+-------+-------|                                  |-------+-------+-------+-------+-------+-------|
- * |       | Prev  | Play  | Next  | VolUp | Mute  |                                  |Bright+|  Left |  Down |  Up   | Right |       |
+ * |       |   1   |   2   |   3   |   4   |   5   |                                  |   6   |   7   |   8   |   9   |   0   |  F12  |
 * |-------+-------+-------+-------+-------+-------+---------------.  ,---------------+-------+-------+-------+-------+-------+-------|
- * |       |       |       |       | VolDn |       |       |       |  |       |       |Bright-|       |       |       |       |       |
+ * |       |       |       |       |       |       |       |       |  |       |       |       |  Left |   Up  |  Down | Right |  Esc  |
 * `-------+-------+-------+-------+-------+-------+-------+-------|  |-------+-------+-------+-------+-------+-----------------------'
 *                         |       |       |       |       |       |  |       |       |       |       |       |
 *                         `---------------------------------------'  `---------------------------------------'
 */
 [_RAISE] = LAYOUT(
-    _______, _______, _______, _______, _______, _______,                                      _______, KC_LEFT, KC_DOWN,   KC_UP, KC_RGHT, _______,
+    _______,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                                        KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,
-    _______,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                                         KC_6,    KC_7,    KC_8,    KC_9,    KC_0, _______,
+    _______,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                                         KC_6,    KC_7,    KC_8,    KC_9,    KC_0,  KC_F12,
-    KC_VOLD, KC_VOLU, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______, KC_LEFT,   KC_UP, KC_DOWN, KC_RGHT,  KC_ESC,
                               _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______
 ),
@@ -128,86 +109,95 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * Adjust: Function Keys & RGB
  *
  * ,-----------------------------------------------.                                  ,-----------------------------------------------.
-  * |       |  F1   |  F2   |  F3   |  F4   |  F5   |                                  |   F6  |   F7  |   F8  |   F9  |  F10  |       |
+  * | Reset |       |       |       |       |       |                                  |       |  NKRO |CG SWAP|       |       | HNTS  |
  * |-------+-------+-------+-------+-------+-------|                                  |-------+-------+-------+-------+-------+-------|
-  * |       |  TOG  |  SAI  |  HUI  |  VAI  |  MOD  |                                  |       |       |       |  F11  |  F12  |  NKRO |
+  * |       |  TOG  |  SAI  |  HUI  |  VAI  |  MOD  |                                  |       |       |       |       |       |       |
  * |-------+-------+-------+-------+-------+-------+---------------.  ,---------------+-------+-------+-------+-------+-------+-------|
-  * |       |       |  SAD  |  HUD  |  VAD  | RMOD  |       |       |  |       |       |       |       |       |       |       |       |
+  * |       |       |  SAD  |  HUD  |  VAD  | RMOD  |       |       |  |       |       |       |       |Bright+|Bright-|       |       |
  * `-------+-------+-------+-------+-------+-------+-------+-------|  |-------+-------+-------+-------+-------+-----------------------'
  *                         |       |       |       |       |       |  |       |       |       |       |       |
  *                         `---------------------------------------'  `---------------------------------------'
  */
 [_ADJUST] = LAYOUT(
-    _______,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                                       KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10, NK_TOGG,
+    RESET,   _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______,    HNTS,
-    _______, RGB_TOG, RGB_SAI, RGB_HUI, RGB_VAI, RGB_MOD,                                     KC_BRIU, _______, _______,  KC_F11,  KC_F12, CG_TOGG,
+    _______, RGB_TOG, RGB_SAI, RGB_HUI, RGB_VAI, RGB_MOD,                                     CG_TOGG, NK_TOGG, KC_BRID, KC_BRIU, _______, _______,
-    _______, _______, RGB_SAD, RGB_HUD, RGB_VAD,RGB_RMOD,_______, _______,  _______, _______, KC_BRID, _______, _______, _______,  QWERTY,    HNTS,
+    _______, _______, RGB_SAD, RGB_HUD, RGB_VAD,RGB_RMOD,_______, _______,  _______, _______, _______, _______, _______, _______, _______, _______,
                              _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______
 ),
 };
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  switch (keycode) {
-        case HNTS:  //Layer Control
+    case LOWER:
-          if (record->event.pressed) {
+      if (record->event.pressed) {
-            set_single_persistent_default_layer(_HNTS);
+        layer_on(_LOWER);
-          }
+        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          return false;
+      } else {
-          break;
+        layer_off(_LOWER);
-        case QWERTY:
+        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-          if (record->event.pressed) {
+      }
-            set_single_persistent_default_layer(_QWERTY);
+      return false;
-          }
+      break;
-          return false;
+    case RAISE:
-          break;
+      if (record->event.pressed) {
-        case LOWER:
+        layer_on(_RAISE);
-          if (record->event.pressed) {
+        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-            layer_on(_LOWER);
+      } else {
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
+        layer_off(_RAISE);
-          } else {
+        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-            layer_off(_LOWER);
+      }
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
+      return false;
-          }
+      break;
-          return false;
+    case CPY_PST:  // Hold to Copy, Hold with GUI to Cut, Tap to Paste
-          break;
+      {
-        case RAISE:
+      static uint16_t copy_paste_timer;
-          if (record->event.pressed) {
+        if (record->event.pressed) {
-            layer_on(_RAISE);
+          copy_paste_timer = timer_read();
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
+        } else {
-          } else {
+           if (timer_elapsed(copy_paste_timer) > TAPPING_TERM) {
-            layer_off(_RAISE);
+             if (get_mods() & MOD_MASK_GUI) {
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
+               tap_code16(LGUI(KC_X));
-          }
+             } else {
-          return false;
+               tap_code16(LGUI(KC_C));
-          break;
+             }
-        case CPY_PST:  // One key copy/paste
+           } else {
-          {
+             tap_code16(LGUI(KC_V));
-            static uint16_t copy_paste_timer;
+           }
-              if (record->event.pressed) {
+        }
-                copy_paste_timer = timer_read();
+      }
-              } else {
+      break;
-                if (timer_elapsed(copy_paste_timer) > TAPPING_TERM) {  // Hold, copy
+    case UNDO:  // Tap to Undo, Tap with GUI to Redo
-                  register_mods(mod_config(MOD_LGUI));
+      if (get_mods() & MOD_MASK_GUI) {
-                  tap_code(KC_C);
+        if (record->event.pressed) {
-                  unregister_mods(mod_config(MOD_LGUI));
+          tap_code(KC_Y);
-                } else {  // Tap, paste
+        }
-                  register_mods(mod_config(MOD_LGUI));
+        return false;
-                  tap_code(KC_V);
+      }
-                  unregister_mods(mod_config(MOD_LGUI));
+      break;
-                }
+    case FIND:  // Tap to Find, Tap with GUI to Select All
-              }
+      if (get_mods() & MOD_MASK_GUI) {
-          }
+        if (record->event.pressed) {
-          break;
+          tap_code(KC_A);
-        case UNDO:  // Undo Redo
+        }
-          if ((get_mods() & MOD_BIT(KC_LGUI)) == MOD_BIT(KC_LGUI)) {
+        return false;
-            if (record->event.pressed) {
+      }
-              register_code(KC_Y);
+      break;
-            } else {
-              unregister_code(KC_Y);
-            }
-          return false;
-          }
-          return true;
    }
  return true;
 };
+const key_override_t ctrl_h = ko_make_basic(MOD_MASK_CTRL, KC_H, C(KC_LEFT)); //MocOS Desktop Navigation
+const key_override_t ctrl_n = ko_make_basic(MOD_MASK_CTRL, KC_N, C(KC_UP));  //MocOS Desktop Navigation
+const key_override_t ctrl_t = ko_make_basic(MOD_MASK_CTRL, KC_T, C(KC_DOWN));  //MocOS Desktop Navigation
+const key_override_t ctrl_s = ko_make_basic(MOD_MASK_CTRL, KC_S, C(KC_RGHT));  //MocOS Desktop Navigation
+const key_override_t bsp_del = ko_make_basic(MOD_MASK_SHIFT, BSP_CMD, KC_DEL);  //  Shift+Bksp sends Delete
+const key_override_t **key_overrides = (const key_override_t *[]){
+    &ctrl_h,
+    &ctrl_n,
+    &ctrl_t,
+    &ctrl_s,
+    &bsp_del,
+    NULL
+};
diff --git a/keyboards/splitkb/kyria/keymaps/john-ezra/oled.c b/keyboards/splitkb/kyria/keymaps/john-ezra/oled.c
index d98cd598b..e02783912 100644
--- a/keyboards/splitkb/kyria/keymaps/john-ezra/oled.c
+++ b/keyboards/splitkb/kyria/keymaps/john-ezra/oled.c
@@ -113,13 +113,13 @@ static void render_status(void) {
        case 0:
            oled_write_P(PSTR("Default\n"), false);
            break;
-        case 2:
+        case 1:
            oled_write_P(PSTR("Lower\n"), false);
            break;
-        case 3:
+        case 2:
            oled_write_P(PSTR("Raise\n"), false);
            break;
-        case 4:
+        case 3:
            oled_write_P(PSTR("Adjust\n"), false);
            break;
        default:
diff --git a/keyboards/splitkb/kyria/keymaps/john-ezra/rules.mk b/keyboards/splitkb/kyria/keymaps/john-ezra/rules.mk
index 7fca028d2..b86789c09 100644
--- a/keyboards/splitkb/kyria/keymaps/john-ezra/rules.mk
+++ b/keyboards/splitkb/kyria/keymaps/john-ezra/rules.mk
@@ -7,5 +7,6 @@ SPACE_CADET_ENABLE = no    # Disable Space Cadet Shift
 GRAVE_ESC_ENABLE = no      # Disable Grave Escape
 MOUSEKEY_ENABLE =  no      # Disable Mousekeys
 WPM_ENABLE = yes           # Enable WPM Counter (Works with default wpm files, but works better with vectorstorm updated wpm.c and wpm.h -> https://github.com/vectorstorm/qmk_firmware/tree/wpm_exact)
+KEY_OVERRIDE_ENABLE = yes  # Enable Key Overrides
 SRC += oled.c
author	john-ezra <47311764+john-ezra@users.noreply.github.com>	2021-09-17 23:51:09 -0700
committer	GitHub <noreply@github.com>	2021-09-17 23:51:09 -0700
commit	228c7b095b0f441652b2719713cb3bf1e5811828 (patch)
tree	4e37232bd0b8c1e9f942dc6205e38220cf27fee5
parent	f93597d66b0698cbea87b24aad79f60e5a9db6ad (diff)
download	qmk_firmware-228c7b095b0f441652b2719713cb3bf1e5811828.tar.gz qmk_firmware-228c7b095b0f441652b2719713cb3bf1e5811828.zip

diff --git a/keyboards/splitkb/kyria/keymaps/john-ezra/config.h b/keyboards/splitkb/kyria/keymaps/john-ezra/config.h index 3602b560c..77f095767 100644 --- a/keyboards/splitkb/kyria/keymaps/john-ezra/config.h +++ b/keyboards/splitkb/kyria/keymaps/john-ezra/config.h
@@ -21,16 +21,11 @@
21	#endif	21	#endif
22		22
23	#ifdef RGBLIGHT_ENABLE	23	#ifdef RGBLIGHT_ENABLE
24	#define RGBLIGHT_EFFECT_BREATHING	24	#define RGBLIGHT_EFFECT_RAINBOW_MOOD
25	#define RGBLIGHT_EFFECT_RAINBOW_MOOD	25	#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
26	#define RGBLIGHT_EFFECT_RAINBOW_SWIRL	26	#define RGBLIGHT_EFFECT_STATIC_GRADIENT
27	#define RGBLIGHT_EFFECT_SNAKE	27	#define RGBLIGHT_EFFECT_TWINKLE
28	#define RGBLIGHT_EFFECT_KNIGHT	28
29	#define RGBLIGHT_EFFECT_CHRISTMAS
30	#define RGBLIGHT_EFFECT_STATIC_GRADIENT
31	#define RGBLIGHT_EFFECT_RGB_TEST
32	#define RGBLIGHT_EFFECT_ALTERNATING
33	#define RGBLIGHT_EFFECT_TWINKLE
34	#define RGBLIGHT_HUE_STEP 8	29	#define RGBLIGHT_HUE_STEP 8
35	#define RGBLIGHT_SAT_STEP 8	30	#define RGBLIGHT_SAT_STEP 8
36	#define RGBLIGHT_VAL_STEP 8	31	#define RGBLIGHT_VAL_STEP 8
@@ -40,4 +35,6 @@
40	#undef DEBOUNCE	35	#undef DEBOUNCE
41	#define DEBOUNCE 1	36	#define DEBOUNCE 1
42		37
		38	#define TAPPING_TERM 125
		39
43	#define SPLIT_WPM_ENABLE	40	#define SPLIT_WPM_ENABLE


diff --git a/keyboards/splitkb/kyria/keymaps/john-ezra/keymap.c b/keyboards/splitkb/kyria/keymaps/john-ezra/keymap.c index 3664fdfac..f42cbf1d0 100644 --- a/keyboards/splitkb/kyria/keymaps/john-ezra/keymap.c +++ b/keyboards/splitkb/kyria/keymaps/john-ezra/keymap.c
@@ -18,7 +18,6 @@
18		18
19	enum kyria_layers {	19	enum kyria_layers {
20	_HNTS,	20	_HNTS,
21	_QWERTY,
22	_LOWER,	21	_LOWER,
23	_RAISE,	22	_RAISE,
24	_ADJUST	23	_ADJUST
@@ -26,17 +25,20 @@ enum kyria_layers {
26		25
27	enum kyria_keycodes {	26	enum kyria_keycodes {
28	HNTS = SAFE_RANGE,	27	HNTS = SAFE_RANGE,
29	QWERTY,
30	LOWER,	28	LOWER,
31	RAISE,	29	RAISE,
32	CPY_PST,	30	CPY_PST,
33	UNDO	31	UNDO,
		32	FIND
34	};	33	};
35		34
		35	#define HNTS DF(_HNTS)
		36	#define QWERTY DF(_QWERTY)
36	#define BSP_CMD MT(MOD_LGUI, KC_BSPC)	37	#define BSP_CMD MT(MOD_LGUI, KC_BSPC)
37	#define SFT_ENT MT(MOD_LSFT, KC_ENT)	38	#define SFT_ENT MT(MOD_LSFT, KC_ENT)
38	#define UNDO G(KC_Z)	39	#define UNDO G(KC_Z)
39	#define FIND G(KC_F)	40	#define FIND G(KC_F)
		41	#define MSS_CTL C(KC_UP)
40		42
41	const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {	43	const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
42		44
@@ -44,83 +46,62 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
44	* Default: HNTS	46	* Default: HNTS
45	*	47	*
46	* ,-----------------------------------------------. ,-----------------------------------------------.	48	* ,-----------------------------------------------. ,-----------------------------------------------.
47	* \| ` \| Z \| R \| L \| D \| W \| \| Y \| P \| U \| X \| Q \| \| \ \|	49	* \| Find \| Z \| R \| L \| D \| W \| \| Y \| P \| U \| X \| Q \| \| \ \|
48	* \|-------+-------+-------+-------+-------+-------\| \|-------+-------+-------+-------+-------+-------\|	50	* \|-------+-------+-------+-------+-------+-------\| \|-------+-------+-------+-------+-------+-------\|
49	* \| Esc \| H \| N \| T \| S \| C \| \| B \| I \| E \| O \| A \| Esc \|	51	* \|Cpy/Pst\| H \| N \| T \| S \| C \| \| B \| I \| E \| O \| A \| ` ~ \|
50	* \|-------+-------+-------+-------+-------+-------+---------------. ,---------------+-------+-------+-------+-------+-------+-------\|	52	* \|-------+-------+-------+-------+-------+-------+---------------. ,---------------+-------+-------+-------+-------+-------+-------\|
51	* \|Cpy/Pst\| K \| V \| M \| F \| G \| Ctrl \| Alt \| \| Caps \| Del \| J \| ; : \| , < \| . > \| / ? \| ' " \|	53	* \| Undo \| K \| V \| M \| F \| G \| Esc \|MssnCtl\| \|MssnCtl\| Esc \| J \| ; : \| , < \| . > \| / ? \| ' " \|
52	* `-------+-------+-------+-------+-------+-------+-------+-------\| \|-------+-------+-------+-------+-------+-----------------------'	54	* `-------+-------+-------+-------+-------+-------+-------+-------\| \|-------+-------+-------+-------+-------+-----------------------'
53	* \| Up \| Down \| Lower \| Space \| BSPC \| \| Tab \| Shift \| Raise \| Left \| Right \|	55	* \| Ctrl \| Alt \| Lower \| Space \| BSPC \| \| Tab \| Shift \| Raise \| Del \| Caps \|
54	* `---------------------------------------' `---------------------------------------'	56	* `---------------------------------------' `---------------------------------------'
55	*/	57	*/
56		58
57	[_HNTS] = LAYOUT(	59	[_HNTS] = LAYOUT(
58	FIND, KC_Z, KC_R, KC_L, KC_D, KC_W, KC_Y, KC_P, KC_U, KC_X, KC_Q, KC_BSLS,	60	FIND, KC_Z, KC_R, KC_L, KC_D, KC_W, KC_Y, KC_P, KC_U, KC_X, KC_Q, KC_BSLS,
59	CPY_PST, KC_H, KC_N, KC_T, KC_S, KC_C, KC_B, KC_I, KC_E, KC_O, KC_A, KC_ESC,	61	CPY_PST, KC_H, KC_N, KC_T, KC_S, KC_C, KC_B, KC_I, KC_E, KC_O, KC_A, KC_GRV,
60	UNDO, KC_K, KC_V, KC_M, KC_F, KC_G, KC_LCTL, KC_LALT, KC_CAPS, KC_DEL, KC_J, KC_SCLN, KC_COMM, KC_DOT, KC_SLSH, KC_QUOT,	62	UNDO, KC_K, KC_V, KC_M, KC_F, KC_G, KC_ESC, MSS_CTL, MSS_CTL, KC_ESC, KC_J, KC_SCLN, KC_COMM, KC_DOT, KC_SLSH, KC_QUOT,
61	KC_UP, KC_DOWN, LOWER, KC_SPC, BSP_CMD, KC_TAB, SFT_ENT, RAISE, KC_LEFT, KC_RGHT	63	KC_LCTL, KC_LALT, LOWER, KC_SPC, BSP_CMD, KC_TAB, SFT_ENT, RAISE, KC_DEL, KC_CAPS
62	),	64	),
63		65
64	/*	66	/*
65	* Default: QWERTY	67	* Lower: Symbols & Media
66	*	68	*
67	* ,-----------------------------------------------. ,-----------------------------------------------.	69	* ,-----------------------------------------------. ,-----------------------------------------------.
68	* \| ` \| Q \| W \| E \| R \| T \| \| Y \| U \| I \| O \| P \| \| \ \|	70	* \| Tab \| * \| / \| + \| - \| = \| \| \| \| { \| } \| @ \| ! \| ` \|
69	* \|-------+-------+-------+-------+-------+-------\| \|-------+-------+-------+-------+-------+-------\|	71	* \|-------+-------+-------+-------+-------+-------\| \|-------+-------+-------+-------+-------+-------\|
70	* \| Esc \| A \| S \| D \| F \| G \| \| H \| J \| K \| L \| ; \| ' " \|	72	* \| Enter \| Left \| Up \| Down \| Right \| \| \| \ \| ( \| ) \| $ \| # \| ~ \|
71	* \|-------+-------+-------+-------+-------+-------+---------------. ,---------------+-------+-------+-------+-------+-------+-------\|	73	* \|-------+-------+-------+-------+-------+-------+---------------. ,---------------+-------+-------+-------+-------+-------+-------\|
72	* \|Cpy/Pst\| Z \| X \| C \| V \| B \| Ctrl \| Alt \| \| Caps \| Del \| N \| M \| , < \| . > \| / ? \|Cpy/Pst\|	74	* \| Esc \| Vol- \| Vol+ \| Prev \| Play \| Next \| \| \| \| \| \| _ \| [ \| ] \| ^ \| % \| & \|
73	* `-------+-------+-------+-------+-------+-------+-------+-------\| \|-------+-------+-------+-------+-------+-----------------------'
74	* \| Up \| Down \| Lower \| Space \| BSPC \| \| Tab \| Shift \| Raise \| Left \| Right \|
75	* `---------------------------------------' `---------------------------------------'
76	*/
77
78	[_QWERTY] = LAYOUT(
79	KC_GRV, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
80	KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
81	CPY_PST, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LCTL, KC_LALT, KC_CAPS, KC_DEL, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, CPY_PST,
82	KC_UP, KC_DOWN, LOWER, KC_SPC, BSP_CMD, KC_TAB, SFT_ENT, RAISE, KC_LEFT, KC_RGHT
83	),
84
85	/*
86	* Lower: Symbols
87	*
88	* ,-----------------------------------------------. ,-----------------------------------------------.
89	* \| \| ! \| @ \| { \| } \| \| \| \| \| \| \| \| \| \| \ \|
90	* \|-------+-------+-------+-------+-------+-------\| \|-------+-------+-------+-------+-------+-------\|
91	* \| \| # \| $ \| ( \| ) \| ` ~ \| \| + \| - \| * \| / \| = \| \|
92	* \|-------+-------+-------+-------+-------+-------+---------------. ,---------------+-------+-------+-------+-------+-------+-------\|
93	* \| \| % \| ^ \| [ \| ] \| & \| \| \| \| \| \| \| \| \| \| \| \|
94	* `-------+-------+-------+-------+-------+-------+-------+-------\| \|-------+-------+-------+-------+-------+-----------------------'	75	* `-------+-------+-------+-------+-------+-------+-------+-------\| \|-------+-------+-------+-------+-------+-----------------------'
95	* \| \| \| \| \| \| \| \| \| \| \| \|	76	* \| \| \| \| \| \| \| \| \| \| \| \|
96	* `---------------------------------------' `---------------------------------------'	77	* `---------------------------------------' `---------------------------------------'
97	*/	78	*/
98		79
99	[_LOWER] = LAYOUT(	80	[_LOWER] = LAYOUT(
100	KC_GRV, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_PIPE, _______, _______, _______, _______, _______, _______,	81	KC_TAB, KC_ASTR, KC_SLSH, KC_PLUS, KC_MINS, KC_EQL, KC_PIPE, KC_LCBR, KC_RCBR, KC_AT, KC_EXLM, KC_GRV,
101	KC_TILD, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_BSLS, KC_PLUS, KC_MINS, KC_ASTR, KC_SLSH, KC_EQL, _______,	82	KC_ENT, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT, _______, KC_BSLS, KC_LPRN, KC_RPRN, KC_DLR, KC_HASH, KC_TILD,
102	KC_AMPR, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_UNDS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,	83	KC_ESC, KC_VOLD, KC_VOLU, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, _______, KC_UNDS, KC_LBRC, KC_RBRC, KC_CIRC, KC_PERC, KC_AMPR,
103	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______	84	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______
104	),	85	),
105		86
106	/*	87	/*
107	* Raise: Numbers & Media	88	* Raise: Numbers
108	*	89	*
109	* ,-----------------------------------------------. ,-----------------------------------------------.	90	* ,-----------------------------------------------. ,-----------------------------------------------.
110	* \| \| 1 \| 2 \| 3 \| 4 \| 5 \| \| 6 \| 7 \| 8 \| 9 \| 0 \| \|	91	* \| \| F1 \| F2 \| F3 \| F4 \| F5 \| \| F6 \| F7 \| F8 \| F9 \| F10 \| F11 \|
111	* \|-------+-------+-------+-------+-------+-------\| \|-------+-------+-------+-------+-------+-------\|	92	* \|-------+-------+-------+-------+-------+-------\| \|-------+-------+-------+-------+-------+-------\|
112	* \| \| Prev \| Play \| Next \| VolUp \| Mute \| \|Bright+\| Left \| Down \| Up \| Right \| \|	93	* \| \| 1 \| 2 \| 3 \| 4 \| 5 \| \| 6 \| 7 \| 8 \| 9 \| 0 \| F12 \|
113	* \|-------+-------+-------+-------+-------+-------+---------------. ,---------------+-------+-------+-------+-------+-------+-------\|	94	* \|-------+-------+-------+-------+-------+-------+---------------. ,---------------+-------+-------+-------+-------+-------+-------\|
114	* \| \| \| \| \| VolDn \| \| \| \| \| \| \|Bright-\| \| \| \| \| \|	95	* \| \| \| \| \| \| \| \| \| \| \| \| \| Left \| Up \| Down \| Right \| Esc \|
115	* `-------+-------+-------+-------+-------+-------+-------+-------\| \|-------+-------+-------+-------+-------+-----------------------'	96	* `-------+-------+-------+-------+-------+-------+-------+-------\| \|-------+-------+-------+-------+-------+-----------------------'
116	* \| \| \| \| \| \| \| \| \| \| \| \|	97	* \| \| \| \| \| \| \| \| \| \| \| \|
117	* `---------------------------------------' `---------------------------------------'	98	* `---------------------------------------' `---------------------------------------'
118	*/	99	*/
119		100
120	[_RAISE] = LAYOUT(	101	[_RAISE] = LAYOUT(
121	_______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______,	102	_______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
122	_______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______,	103	_______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_F12,
123	KC_VOLD, KC_VOLU, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,	104	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT, KC_ESC,
124	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______	105	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______
125	),	106	),
126		107
@@ -128,86 +109,95 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
128	* Adjust: Function Keys & RGB	109	* Adjust: Function Keys & RGB
129	*	110	*
130	* ,-----------------------------------------------. ,-----------------------------------------------.	111	* ,-----------------------------------------------. ,-----------------------------------------------.
131	* \| \| F1 \| F2 \| F3 \| F4 \| F5 \| \| F6 \| F7 \| F8 \| F9 \| F10 \| \|	112	* \| Reset \| \| \| \| \| \| \| \| NKRO \|CG SWAP\| \| \| HNTS \|
132	* \|-------+-------+-------+-------+-------+-------\| \|-------+-------+-------+-------+-------+-------\|	113	* \|-------+-------+-------+-------+-------+-------\| \|-------+-------+-------+-------+-------+-------\|
133	* \| \| TOG \| SAI \| HUI \| VAI \| MOD \| \| \| \| \| F11 \| F12 \| NKRO \|	114	* \| \| TOG \| SAI \| HUI \| VAI \| MOD \| \| \| \| \| \| \| \|
134	* \|-------+-------+-------+-------+-------+-------+---------------. ,---------------+-------+-------+-------+-------+-------+-------\|	115	* \|-------+-------+-------+-------+-------+-------+---------------. ,---------------+-------+-------+-------+-------+-------+-------\|
135	* \| \| \| SAD \| HUD \| VAD \| RMOD \| \| \| \| \| \| \| \| \| \| \| \|	116	* \| \| \| SAD \| HUD \| VAD \| RMOD \| \| \| \| \| \| \| \|Bright+\|Bright-\| \| \|
136	* `-------+-------+-------+-------+-------+-------+-------+-------\| \|-------+-------+-------+-------+-------+-----------------------'	117	* `-------+-------+-------+-------+-------+-------+-------+-------\| \|-------+-------+-------+-------+-------+-----------------------'
137	* \| \| \| \| \| \| \| \| \| \| \| \|	118	* \| \| \| \| \| \| \| \| \| \| \| \|
138	* `---------------------------------------' `---------------------------------------'	119	* `---------------------------------------' `---------------------------------------'
139	*/	120	*/
140		121
141	[_ADJUST] = LAYOUT(	122	[_ADJUST] = LAYOUT(
142	_______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, NK_TOGG,	123	RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, HNTS,
143	_______, RGB_TOG, RGB_SAI, RGB_HUI, RGB_VAI, RGB_MOD, KC_BRIU, _______, _______, KC_F11, KC_F12, CG_TOGG,	124	_______, RGB_TOG, RGB_SAI, RGB_HUI, RGB_VAI, RGB_MOD, CG_TOGG, NK_TOGG, KC_BRID, KC_BRIU, _______, _______,
144	_______, _______, RGB_SAD, RGB_HUD, RGB_VAD,RGB_RMOD,_______, _______, _______, _______, KC_BRID, _______, _______, _______, QWERTY, HNTS,	125	_______, _______, RGB_SAD, RGB_HUD, RGB_VAD,RGB_RMOD,_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
145	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______	126	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______
146	),	127	),
147	};	128	};
148		129
149	bool process_record_user(uint16_t keycode, keyrecord_t *record) {	130	bool process_record_user(uint16_t keycode, keyrecord_t *record) {
150	switch (keycode) {	131	switch (keycode) {
151	case HNTS: //Layer Control	132	case LOWER:
152	if (record->event.pressed) {	133	if (record->event.pressed) {
153	set_single_persistent_default_layer(_HNTS);	134	layer_on(_LOWER);
154	}	135	update_tri_layer(_LOWER, _RAISE, _ADJUST);
155	return false;	136	} else {
156	break;	137	layer_off(_LOWER);
157	case QWERTY:	138	update_tri_layer(_LOWER, _RAISE, _ADJUST);
158	if (record->event.pressed) {	139	}
159	set_single_persistent_default_layer(_QWERTY);	140	return false;
160	}	141	break;
161	return false;	142	case RAISE:
162	break;	143	if (record->event.pressed) {
163	case LOWER:	144	layer_on(_RAISE);
164	if (record->event.pressed) {	145	update_tri_layer(_LOWER, _RAISE, _ADJUST);
165	layer_on(_LOWER);	146	} else {
166	update_tri_layer(_LOWER, _RAISE, _ADJUST);	147	layer_off(_RAISE);
167	} else {	148	update_tri_layer(_LOWER, _RAISE, _ADJUST);
168	layer_off(_LOWER);	149	}
169	update_tri_layer(_LOWER, _RAISE, _ADJUST);	150	return false;
170	}	151	break;
171	return false;	152	case CPY_PST: // Hold to Copy, Hold with GUI to Cut, Tap to Paste
172	break;	153	{
173	case RAISE:	154	static uint16_t copy_paste_timer;
174	if (record->event.pressed) {	155	if (record->event.pressed) {
175	layer_on(_RAISE);	156	copy_paste_timer = timer_read();
176	update_tri_layer(_LOWER, _RAISE, _ADJUST);	157	} else {
177	} else {	158	if (timer_elapsed(copy_paste_timer) > TAPPING_TERM) {
178	layer_off(_RAISE);	159	if (get_mods() & MOD_MASK_GUI) {
179	update_tri_layer(_LOWER, _RAISE, _ADJUST);	160	tap_code16(LGUI(KC_X));
180	}	161	} else {
181	return false;	162	tap_code16(LGUI(KC_C));
182	break;	163	}
183	case CPY_PST: // One key copy/paste	164	} else {
184	{	165	tap_code16(LGUI(KC_V));
185	static uint16_t copy_paste_timer;	166	}
186	if (record->event.pressed) {	167	}
187	copy_paste_timer = timer_read();	168	}
188	} else {	169	break;
189	if (timer_elapsed(copy_paste_timer) > TAPPING_TERM) { // Hold, copy	170	case UNDO: // Tap to Undo, Tap with GUI to Redo
190	register_mods(mod_config(MOD_LGUI));	171	if (get_mods() & MOD_MASK_GUI) {
191	tap_code(KC_C);	172	if (record->event.pressed) {
192	unregister_mods(mod_config(MOD_LGUI));	173	tap_code(KC_Y);
193	} else { // Tap, paste	174	}
194	register_mods(mod_config(MOD_LGUI));	175	return false;
195	tap_code(KC_V);	176	}
196	unregister_mods(mod_config(MOD_LGUI));	177	break;
197	}	178	case FIND: // Tap to Find, Tap with GUI to Select All
198	}	179	if (get_mods() & MOD_MASK_GUI) {
199	}	180	if (record->event.pressed) {
200	break;	181	tap_code(KC_A);
201	case UNDO: // Undo Redo	182	}
202	if ((get_mods() & MOD_BIT(KC_LGUI)) == MOD_BIT(KC_LGUI)) {	183	return false;
203	if (record->event.pressed) {	184	}
204	register_code(KC_Y);	185	break;
205	} else {
206	unregister_code(KC_Y);
207	}
208	return false;
209	}
210	return true;
211	}	186	}
212	return true;	187	return true;
213	};	188	};
		189
		190	const key_override_t ctrl_h = ko_make_basic(MOD_MASK_CTRL, KC_H, C(KC_LEFT)); //MocOS Desktop Navigation
		191	const key_override_t ctrl_n = ko_make_basic(MOD_MASK_CTRL, KC_N, C(KC_UP)); //MocOS Desktop Navigation
		192	const key_override_t ctrl_t = ko_make_basic(MOD_MASK_CTRL, KC_T, C(KC_DOWN)); //MocOS Desktop Navigation
		193	const key_override_t ctrl_s = ko_make_basic(MOD_MASK_CTRL, KC_S, C(KC_RGHT)); //MocOS Desktop Navigation
		194	const key_override_t bsp_del = ko_make_basic(MOD_MASK_SHIFT, BSP_CMD, KC_DEL); // Shift+Bksp sends Delete
		195
		196	const key_override_t *key_overrides = (const key_override_t []){
		197	&ctrl_h,
		198	&ctrl_n,
		199	&ctrl_t,
		200	&ctrl_s,
		201	&bsp_del,
		202	NULL
		203	};


diff --git a/keyboards/splitkb/kyria/keymaps/john-ezra/oled.c b/keyboards/splitkb/kyria/keymaps/john-ezra/oled.c index d98cd598b..e02783912 100644 --- a/keyboards/splitkb/kyria/keymaps/john-ezra/oled.c +++ b/keyboards/splitkb/kyria/keymaps/john-ezra/oled.c
@@ -113,13 +113,13 @@ static void render_status(void) {
113	case 0:	113	case 0:
114	oled_write_P(PSTR("Default\n"), false);	114	oled_write_P(PSTR("Default\n"), false);
115	break;	115	break;
116	case 2:	116	case 1:
117	oled_write_P(PSTR("Lower\n"), false);	117	oled_write_P(PSTR("Lower\n"), false);
118	break;	118	break;
119	case 3:	119	case 2:
120	oled_write_P(PSTR("Raise\n"), false);	120	oled_write_P(PSTR("Raise\n"), false);
121	break;	121	break;
122	case 4:	122	case 3:
123	oled_write_P(PSTR("Adjust\n"), false);	123	oled_write_P(PSTR("Adjust\n"), false);
124	break;	124	break;
125	default:	125	default:


diff --git a/keyboards/splitkb/kyria/keymaps/john-ezra/rules.mk b/keyboards/splitkb/kyria/keymaps/john-ezra/rules.mk index 7fca028d2..b86789c09 100644 --- a/keyboards/splitkb/kyria/keymaps/john-ezra/rules.mk +++ b/keyboards/splitkb/kyria/keymaps/john-ezra/rules.mk
@@ -7,5 +7,6 @@ SPACE_CADET_ENABLE = no # Disable Space Cadet Shift
7	GRAVE_ESC_ENABLE = no # Disable Grave Escape	7	GRAVE_ESC_ENABLE = no # Disable Grave Escape
8	MOUSEKEY_ENABLE = no # Disable Mousekeys	8	MOUSEKEY_ENABLE = no # Disable Mousekeys
9	WPM_ENABLE = yes # Enable WPM Counter (Works with default wpm files, but works better with vectorstorm updated wpm.c and wpm.h -> https://github.com/vectorstorm/qmk_firmware/tree/wpm_exact)	9	WPM_ENABLE = yes # Enable WPM Counter (Works with default wpm files, but works better with vectorstorm updated wpm.c and wpm.h -> https://github.com/vectorstorm/qmk_firmware/tree/wpm_exact)
		10	KEY_OVERRIDE_ENABLE = yes # Enable Key Overrides
10		11
11	SRC += oled.c	12	SRC += oled.c