From 89569901ee74bbf5497802bb1f704b2a7de332ba Mon Sep 17 00:00:00 2001 From: Rutherther Date: Mon, 29 Jul 2024 12:54:08 +0200 Subject: [PATCH] feat: remove non-home row mod keys in normal layout --- .../splitkb/kyria/keymaps/rutherther/keymap.c | 66 +++++++++++-------- 1 file changed, 37 insertions(+), 29 deletions(-) diff --git a/keyboards/splitkb/kyria/keymaps/rutherther/keymap.c b/keyboards/splitkb/kyria/keymaps/rutherther/keymap.c index 7ba68d7d4a..2951bb824c 100644 --- a/keyboards/splitkb/kyria/keymaps/rutherther/keymap.c +++ b/keyboards/splitkb/kyria/keymaps/rutherther/keymap.c @@ -46,6 +46,7 @@ enum custom_keycodes { #define NAV_V LT(_NAV, KC_V) #define NUM_G LT(_NUM, KC_G) +#define NUM_SPC LT(_NUM, KC_SPC) #define WM_M LT(_WM, KC_M) #define GUI_Q MT(MOD_LGUI, KC_Q) @@ -72,66 +73,73 @@ enum custom_keycodes { // clang-format off const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_QWERTY] = LAYOUT( - SUP_TAB, GUI_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, GUI_P, SUP_BSLS, - CTL_ESC, SYM_A, LALT_S, LSFT_D, LCTL_F, NUM_G, KC_H, LCTL_J, RSFT_K, LALT_L, SYM_SCLN, CTL_QUOT, - OSM_LSFT, KC_Z, KC_X, KC_C, NAV_V, KC_B, NOHOMODS, CTRL, FKEYS, TTY, KC_N, WM_M, KC_COMM, KC_DOT, KC_SLSH, OSM_RSFT, - QK_LOCK, _______, QK_REP, ALT_SPC, CZ_ACUTED, CZ_CARETED,ALT_ENT, KC_BSPC, KC_DEL, KC_APP + KC_TAB, GUI_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, GUI_P, KC_BSLS, + KC_ESC, SYM_A, LALT_S, LSFT_D, LCTL_F, KC_G, KC_H, LCTL_J, RSFT_K, LALT_L, SYM_SCLN, KC_QUOT, + _______, KC_Z, KC_X, KC_C, NAV_V, KC_B, NOHOMODS, CTRL, FKEYS, TTY, KC_N, WM_M, KC_COMM, KC_DOT, KC_SLSH, _______, + QK_LOCK, _______, QK_REP, NUM_SPC, CZ_ACUTED, CZ_CARETED,KC_ENT, KC_BSPC, KC_DEL, KC_APP ), [_QWERTY_NOHOMEMODS] = LAYOUT( - SUP_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, SUP_BSLS, - CTL_ESC, SYM_A, KC_S, KC_D, KC_F, NUM_G, KC_H, KC_J, KC_K, KC_L, SYM_SCLN, CTL_QUOT, - OSM_LSFT, KC_Z, KC_X, KC_C, NAV_V, KC_B, GAMES, CTRL, FKEYS, TTY, KC_N, WM_M, KC_COMM, KC_DOT, KC_SLSH, OSM_RSFT, - QK_LOCK, QWERTY, QK_REP, ALT_SPC, CZ_ACUTED, CZ_CARETED,ALT_ENT, KC_BSPC, KC_DEL, KC_APP + SUP_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, SUP_BSLS, + CTL_ESC, SYM_A, KC_S, KC_D, KC_F, NUM_G, KC_H, KC_J, KC_K, KC_L, SYM_SCLN, CTL_QUOT, + OSM_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, GAMES, CTRL, FKEYS, TTY, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, OSM_RSFT, + QK_LOCK, QWERTY, QK_REP, ALT_SPC, CZ_ACUTED, CZ_CARETED,ALT_ENT, KC_BSPC, KC_DEL, KC_APP ), [_PLAIN] = LAYOUT( - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, - KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, - OSM_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, _______, CTRL, FKEYS, _______, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, OSM_RSFT, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, + 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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, _______, CTRL, FKEYS, _______, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), [_GAMES] = LAYOUT( - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, - KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, - OSM_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LALT, CTRL, FKEYS, QWERTY, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, OSM_RSFT, - _______, _______, NAV, KC_SPC, NUM, SYM, KC_ENT, _______, _______, KC_ESC + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, + 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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LALT, CTRL, FKEYS, QWERTY, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + _______, _______, NAV, KC_SPC, NUM, SYM, KC_ENT, _______, _______, KC_ESC ), [_SYM] = LAYOUT( - _______, _______, KC_LABK, KC_RABK, KC_BSLS, KC_GRAVE, KC_AMPR, KC_UNDS, KC_LBRC, KC_RBRC, _______, _______, - _______, KC_EXLM, KC_MINUS, KC_PLUS, KC_EQUAL, KC_HASH, KC_PIPE, KC_TILD, KC_LPRN, KC_RPRN, KC_PERC, _______, - _______, _______, KC_SLASH, KC_ASTR, KC_CIRC, _______, _______, _______, _______, _______, _______, KC_DLR, KC_LCBR, KC_RCBR, KC_AT, _______, + _______, _______, KC_LABK, KC_RABK, KC_BSLS, KC_GRAVE, KC_AMPR, KC_UNDS, KC_LBRC, KC_RBRC, KC_PERC, _______, + _______, KC_EXLM, KC_MINUS, KC_PLUS, KC_EQUAL, KC_HASH, KC_PIPE, KC_TILD, KC_LPRN, KC_RPRN, KC_COLON, S(KC_SCLN), + _______, _______, KC_SLASH, KC_ASTR, KC_CIRC, KC_SLSH, _______, _______, _______, _______, _______, KC_DLR, KC_LCBR, KC_RCBR, KC_AT, _______, _______, _______, _______, _______, _______, QK_LLCK, _______, _______, _______, _______ ), [_NAV] = LAYOUT( - _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_INS, KC_DEL, - _______, KC_LGUI, KC_LALT, KC_LSFT, KC_LCTL, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, + _______, KC_LGUI, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_INS, KC_DEL, + _______, KC_LCTL, KC_LALT, OSM_LSFT, KC_LCTL, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_SCRL, _______, _______, KC_PAUSE, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_PSCR, _______, _______, _______, _______, _______, QK_LLCK, _______, _______, _______, _______ ), [_FUNCTION] = LAYOUT( - _______, _______, KC_F4, KC_F9, KC_F8, KC_F10, _______, _______, _______, _______, _______, _______, - _______, _______, KC_F3, KC_F2, KC_F1, KC_F11, _______, KC_LCTL, KC_RSFT, KC_LALT, KC_RGUI, _______, + _______, _______, KC_F4, KC_F9, KC_F8, KC_F10, _______, _______, _______, _______, KC_RGUI, _______, + _______, _______, KC_F3, KC_F2, KC_F1, KC_F11, _______, KC_LCTL, OSM_RSFT, KC_LALT, KC_RGUI, _______, _______, _______, KC_F5, KC_F6, KC_F7, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_LLCK, _______, _______, _______, _______ ), [_NUM] = LAYOUT( - _______, _______, _______, _______, _______, _______, KC_EQUAL, KC_8, KC_9, KC_4, KC_PLUS, KC_SLASH, - _______, KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, _______, KC_COLN, KC_1, KC_2, KC_3, KC_MINUS, KC_ASTR, - _______, _______, _______, _______, _______, _______, _______, KC_SCRL, _______, _______, KC_COMMA, KC_7, KC_6, KC_5, KC_DOT, _______, + _______, _______, _______, _______, _______, _______, KC_PLUS, KC_8, KC_9, KC_4, _______, _______, + _______, KC_LGUI, KC_LALT, KC_LCTL, OSM_LSFT, _______, KC_EQUAL, KC_1, KC_2, KC_3, KC_SLASH, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MINUS, KC_7, KC_6, KC_5, KC_DOT, _______, _______, _______, _______, _______, _______, QK_LLCK, KC_0, _______, _______, _______ ), + /* [_NUML] = LAYOUT( */ + /* _______, _______, KC_4, KC_9, KC_8, KC_PLUS, _______, _______, _______, _______, KC_RGUI, _______, */ + /* _______, KC_SLASH, KC_3, KC_2, KC_1, KC_EQUAL, _______, KC_LCTL, KC_RSFT, KC_LALT, KC_RGUI, _______, */ + /* _______, KC_DOT, KC_5, KC_6, KC_7, KC_MINUS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, */ + /* _______, _______, _______, KC_0, QK_LLCK, _______, _______, _______, _______, _______ */ + /* ), */ + [_WM] = LAYOUT( - _______, WM_MON2, WM_WS(4), WM_WS(9), WM_WS(8), _______, _______, _______, WM_RUN, WM_RUN2, WM_TERM, _______, + _______, WM_MON2, WM_WS(4), WM_WS(9), WM_WS(8), _______, _______, _______, WM_RUN, WM_TERM, _______, _______, _______, WM_MON1, WM_WS(3), WM_WS(2), WM_WS(1), _______, _______, KC_RCTL, KC_RSFT, KC_LALT, KC_RGUI, WM_KILL, - _______, WM_MON3, WM_WS(5), WM_WS(6), WM_WS(7), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, QK_LLCK, _______, _______, _______, _______ + _______, WM_MON3, WM_WS(5), WM_WS(6), WM_WS(7), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, WM_RUN2, + _______, _______, _______, _______, QK_LLCK, _______, _______, _______, _______, _______ ), [_CTRL] = LAYOUT( -- 2.48.1