diff --git a/keyboards/splitkb/kyria/keymaps/paullemmens/keymap.c b/keyboards/splitkb/kyria/keymaps/paullemmens/keymap.c index ec46cb8ec7ef..eb883cc0c70e 100644 --- a/keyboards/splitkb/kyria/keymaps/paullemmens/keymap.c +++ b/keyboards/splitkb/kyria/keymaps/paullemmens/keymap.c @@ -75,7 +75,7 @@ qk_tap_dance_action_t tap_dance_actions[] = { KC_TAB, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, KC_BSPC, \ KC_ESC, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, KC_QUOT, \ KC_LSFT, K21, K22, K23, K24, K25, ESC_RAI, SGUI_LWR, DEL_RAI, BS_LALT, K26, K27, K28, K29, K2A, KC_RSFT, \ - KC_LGUI, KC_LALT, SPC_LWR, KC_LCTRL, GUI_LWR, KC_RCTRL, ENT_RSF, KC_SPC, KC_RALT, KC_APP \ + KC_LGUI, KC_LALT, SPC_LWR, OS_LCMD, GUI_LWR, KC_RCTRL, ENT_RSF, KC_SPC, KC_RALT, KC_APP \ ) /* Re-pass though to allow templates to be used */ @@ -121,10 +121,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | | | | | | | | | | * `----------------------------------' `----------------------------------' */ - [_OS_MODS] = LAYOUT( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, OS__CMD, OS_SHFT, OS_CTRL, OS__ALT, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + [_OS_MODS] = LAYOUT_wrapper( + _______, _________________OS_MODS_L1________________, _________________OS_MODS_R1________________, _______, + _______, _________________OS_MODS_L2________________, _________________OS_MODS_R2________________, _______, + _______, _________________OS_MODS_L3________________, _______, _______, _______, _______, _________________OS_MODS_R3________________, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), #endif //CALLUM_ONESHOT @@ -291,6 +291,9 @@ static void render_status(void) { case _ADJUST: oled_write_P(PSTR("Adjust\n"), false); break; + case _OS_MODS: + oled_write_P(PSTR("Mods\n"), false); + break; default: oled_write_P(PSTR("Undefined\n"), false); } diff --git a/users/paullemmens/paullemmens.h b/users/paullemmens/paullemmens.h index e4511c822be6..821f32735bd8 100644 --- a/users/paullemmens/paullemmens.h +++ b/users/paullemmens/paullemmens.h @@ -33,61 +33,45 @@ #define _GRAVE_ ALGR(KC_GRAVE) #define _UMLAU_ ALGR(S(KC_QUOTE)) #define _CIRCFL ALGR(KC_CIRC) -// old home row mods +// Home row mods #define LGUI__Z LGUI_T(KC_Z) #define Z_LCTRL LCTL_T(KC_Z) #define G_LSHFT LSFT_T(KC_G) #define V_LSHFT LSFT_T(KC_V) +#define V_LCTRL LCTL_T(KC_V) +#define B_LCTRL LCTL_T(KC_B) +#define V__LCMD LCMD_T(KC_V) #define N_RSHFT RSFT_T(KC_N) +#define N_RCTRL RCTL_T(KC_N) #define M_RSHFT RSFT_T(KC_M) +#define M_RCTRL RCTL_T(KC_M) +#define M__RCMD RCMD_T(KC_M) #define D_LCTRL LCTL_T(KC_D) +#define D_LSHFT LSFT_T(KC_D) +#define K_RCTRL RCTL_T(KC_K) +#define K_RSHFT RSFT_T(KC_K) +#define S__LALT LALT_T(KC_S) +#define L__LALT LALT_T(KC_L) #define BS_LALT LALT_T(KC_BSPC) #define ENT_RSF RSFT_T(KC_ENT) // Layer toggles +#define R_ADJST LT(_ADJUST, KC_R) +#define F_RAISE LT(_RAISE, KC_F) #define SPC_LWR LT(_LOWER, KC_SPC) #ifdef CALLUM_ONESHOT // TODO: change to something fancy some how to keep keep layer switch in there for key movement. - // FIXME: figure out smart way for adjusting to macos vs windows so I don't need the extra layer no more - #define OS_LCMD MO(_OS_MODS) - #define B_LCTRL KC_B - #define D_LSHFT KC_D - #define G_LOWER KC_G - #define F_RAISE KC_F - #define H_LOWER KC_H - #define J_RAISE KC_J - #define K_RSHFT KC_K - #define K_RCTRL KC_K - #define L__LALT KC_L - #define M_RCTRL KC_M - #define M__RCMD KC_M - #define N_RCTRL KC_N - #define R_ADJST KC_R - #define S__LALT KC_S - #define U_ADJST KC_U - #define V_LCTRL KC_V - #define V__LCMD KC_V + // Callum defines as MO(_OS_MODS) but I want to tap instead of hold the key. + #define OS_LCMD OSL(_OS_MODS) #else + // FIXME: figure out smart way for adjusting to macos vs windows so I don't need the extra layer no more #define OS_LCMD KC_LCMD - #define B_LCTRL LCTL_T(KC_B) - #define D_LSHFT LSFT_T(KC_D) - #define F_RAISE LT(_RAISE, KC_F) - #define H_LOWER LT(_LOWER, KC_H) - #define G_LOWER LT(_LOWER, KC_G) - #define J_RAISE LT(_RAISE, KC_J) - #define K_RSHFT RSFT_T(KC_K) - #define K_RCTRL RCTL_T(KC_K) - #define L__LALT LALT_T(KC_L) - #define M_RCTRL RCTL_T(KC_M) - #define M__RCMD RCMD_T(KC_M) - #define N_RCTRL RCTL_T(KC_N) - #define R_ADJST LT(_ADJUST, KC_R) - #define S__LALT LALT_T(KC_S) - #define U_ADJST LT(_ADJUST, KC_U) - #define V_LCTRL LCTL_T(KC_V) - #define V__LCMD LCMD_T(KC_V) #endif #define DEL_RAI LT(_RAISE, KC_DEL) #define ESC_RAI LT(_RAISE, KC_ESC) +#define H_LOWER LT(_LOWER, KC_H) +#define G_LOWER LT(_LOWER, KC_G) +#define J_RAISE LT(_RAISE, KC_J) +#define U_ADJST LT(_ADJUST, KC_U) #define MACOS_L DF(_MACOS) #define DEFAU_L DF(_QWERTY) @@ -113,10 +97,10 @@ enum custom_keycodes { /* My layers are: */ enum userspace_layers { _QWERTY = 0, + _MACOS, #ifdef CALLUM_ONESHOT _OS_MODS, #endif - _MACOS, /* _COLEMAK, */ // Not activated because trouble with defaulting to macos layer these days. /* _MACOS2, */ // This will probably work because I can now use the same scheme for colemak on macOS. _LOWER, @@ -132,14 +116,31 @@ enum userspace_layers { underscores to keep the lengths consistent. */ // clang-format off -#define _________________QWERTY_L1_________________ KC_Q, KC_W, KC_E, R_ADJST, KC_T -#define _________________QWERTY_L2_________________ KC_A, KC_S, D_LSHFT, F_RAISE, G_LOWER -#define _________________QWERTY_L3_________________ LGUI__Z, KC_X, KC_C, V_LCTRL, KC_B +#ifdef CALLUM_ONESHOT + #define _________________QWERTY_L1_________________ KC_Q, KC_W, KC_E, KC_R, KC_T + #define _________________QWERTY_L2_________________ KC_A, KC_S, KC_D, KC_F, KC_G + #define _________________QWERTY_L3_________________ KC_Z, KC_X, KC_C, KC_V, KC_B + + #define _________________QWERTY_R1_________________ KC_Y, KC_U, KC_I, KC_O, KC_P + #define _________________QWERTY_R2_________________ KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT + #define _________________QWERTY_R3_________________ KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH +#else + #define _________________QWERTY_L1_________________ KC_Q, KC_W, KC_E, R_ADJST, KC_T + #define _________________QWERTY_L2_________________ KC_A, KC_S, D_LSHFT, F_RAISE, G_LOWER + #define _________________QWERTY_L3_________________ LGUI__Z, KC_X, KC_C, V_LCTRL, KC_B + + #define _________________QWERTY_R1_________________ KC_Y, U_ADJST, KC_I, KC_O, KC_P + #define _________________QWERTY_R2_________________ H_LOWER, J_RAISE, K_RSHFT, KC_L, KC_SCLN, KC_QUOT + #define _________________QWERTY_R3_________________ KC_N, M_RCTRL, KC_COMM, KC_DOT, KC_SLSH +#endif -#define _________________QWERTY_R1_________________ KC_Y, U_ADJST, KC_I, KC_O, KC_P -#define _________________QWERTY_R2_________________ H_LOWER, J_RAISE, K_RSHFT, KC_L, KC_SCLN, KC_QUOT -#define _________________QWERTY_R3_________________ KC_N, M_RCTRL, KC_COMM, KC_DOT, KC_SLSH +#define _________________OS_MODS_L1________________ _______, _______, _______, MO(_ADJUST), _______ +#define _________________OS_MODS_L2________________ _______, OS__ALT, OS_SHFT, MO(_RAISE), MO(_LOWER) +#define _________________OS_MODS_L3________________ _______, _______, _______, OS__CMD, OS_CTRL +#define _________________OS_MODS_R1________________ _______, MO(_ADJUST), _______, _______, _______ +#define _________________OS_MODS_R2________________ MO(_LOWER), MO(_RAISE), OS_SHFT, OS__ALT, _______ +#define _________________OS_MODS_R3________________ OS_CTRL, OS__CMD, _______, _______, _______ #define _________________COLEMAK_L1________________ KC_Q, KC_W, KC_F, KC_P, KC_G #define _________________COLEMAK_L2________________ KC_A, KC_R, KC_S, KC_T, KC_D