[Keymap] finally committing my updates (#6904)
This commit is contained in:
parent
3e20697a33
commit
03c132b331
2 changed files with 32 additions and 17 deletions
|
@ -6,18 +6,18 @@
|
||||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||||
|
|
||||||
[_QWERTY] = LAYOUT(
|
[_QWERTY] = LAYOUT(
|
||||||
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
|
KC_DEL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, 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_SCLN,
|
KC_BSPC, KC_Q, W_CTRL, E_ALT, R_GUI, KC_T, KC_Y, U_GUI, I_ALT, O_CTRL, KC_P, KC_SCLN,
|
||||||
KC_CAPS, A_CTRL, S_ALT, D_GUI, F_SHFT, KC_G, KC_H, J_SHFT, K_GUI, L_ALT, MINSCTL, KC_QUOT,
|
KC_CAPS, A_CTRL, S_ALT, D_GUI, F_SHFT, KC_G, KC_H, J_SHFT, K_GUI, L_ALT, MINSCTL, KC_QUOT,
|
||||||
XXXXXXX, KC_Z, KC_X, KC_C, KC_V, KC_B, SPC_SFT, BSP_NUM, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT,
|
NAVLOCK, KC_Z, KC_X, KC_C, KC_V, KC_B, ENT_SYM, TAB_NUM, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT,
|
||||||
ESC_HYP, BSP_NUM, ENT_SFT, SPC_SFT, TAB_SYM, DEL_WRP
|
ESC_HYP, TAB_NUM, SPC_SFT, SPC_SFT, BSP_SYM, DEL_WRP
|
||||||
),
|
),
|
||||||
|
|
||||||
[_SYMBOL] = LAYOUT(
|
[_SYMBOL] = LAYOUT(
|
||||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||||
_______, KC_AMPR, KC_GRV, KC_TILD, KC_LBRC, KC_RBRC, KC_LABK, KC_RABK, KC_PLUS, KC_ASTR, XXXXXXX, _______,
|
_______, KC_AMPR, KC_GRV, KC_TILD, KC_LBRC, KC_RBRC, KC_LABK, KC_RABK, KC_PLUS, KC_ASTR, XXXXXXX, _______,
|
||||||
_______, KC_DLR, KC_PERC, KC_EQL, KC_LPRN, KC_RPRN, KC_SCLN, KC_COLN, KC_EXLM, KC_AT, KC_UNDS, _______,
|
_______, KC_DLR, KC_PERC, KC_EQL, KC_LPRN, KC_RPRN, KC_SCLN, KC_COLN, KC_EXLM, KC_AT, KC_UNDS, _______,
|
||||||
RESET, XXXXXXX, KC_CIRC, KC_HASH, KC_LCBR, KC_RCBR, _______, _______, KC_QUOT, KC_DQUO, KC_PIPE, KC_BSLS, KC_QUES, _______,
|
_______, XXXXXXX, KC_CIRC, KC_HASH, KC_LCBR, KC_RCBR, _______, _______, KC_QUOT, KC_DQUO, KC_PIPE, KC_BSLS, KC_QUES, _______,
|
||||||
_______, _______, _______, _______, _______, _______
|
_______, _______, _______, _______, _______, _______
|
||||||
),
|
),
|
||||||
|
|
||||||
|
@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||||
XNOTIFY, XXXXXXX, XPRVSPC, NWIN, XNXTSPC, XXXXXXX, XXXXXXX, KC_SLSH, KC_ASTR, KC_MINS, KC_PLUS, XXXXXXX,
|
XNOTIFY, XXXXXXX, XPRVSPC, NWIN, XNXTSPC, XXXXXXX, XXXXXXX, KC_SLSH, KC_ASTR, KC_MINS, KC_PLUS, XXXXXXX,
|
||||||
XALLWIN, NAVFWD, BWORD, KC_UP, FWORD, KC_PGUP, KC_DLR, KC_P7, KC_P8, KC_P9, KC_DOT, XXXXXXX,
|
XALLWIN, NAVFWD, BWORD, KC_UP, FWORD, KC_PGUP, KC_DLR, KC_P7, KC_P8, KC_P9, KC_DOT, XXXXXXX,
|
||||||
XDESKTP, NAVBACK, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_PERC, KC_P4, KC_P5, KC_P6, KC_EQL, XXXXXXX,
|
XDESKTP, NAVBACK, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_PERC, KC_P4, KC_P5, KC_P6, KC_EQL, XXXXXXX,
|
||||||
RESET, PTAB, KC_HOME, PWIN, KC_END, NTAB, _______, _______, XXXXXXX, KC_P1, KC_P2, KC_P3, KC_ENT, XXXXXXX,
|
_______, PTAB, KC_HOME, PWIN, KC_END, NTAB, _______, _______, KC_P0, KC_P1, KC_P2, KC_P3, KC_COMM, _______,
|
||||||
_______, _______, _______, _______, _______, KC_P0
|
_______, _______, _______, _______, _______, KC_P0
|
||||||
),
|
),
|
||||||
|
|
||||||
|
|
|
@ -26,36 +26,50 @@ enum {
|
||||||
_FUNCT,
|
_FUNCT,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// == Thumbs
|
||||||
// left hand
|
// left hand
|
||||||
#define ESC_HYP MT(MOD_HYPR, KC_ESC)
|
#define ESC_HYP MT(MOD_HYPR, KC_ESC)
|
||||||
#define BSP_NUM LT(_NAVNUM, KC_BSPC)
|
#define TAB_NUM LT(_NAVNUM, KC_TAB)
|
||||||
#define ENT_SFT MT(MOD_LSFT, KC_ENT)
|
|
||||||
#define SPC_SFT MT(MOD_LSFT, KC_SPC)
|
#define SPC_SFT MT(MOD_LSFT, KC_SPC)
|
||||||
|
#define ENT_SYM LT(_SYMBOL, KC_ENT)
|
||||||
|
|
||||||
|
|
||||||
// right hand
|
// right hand
|
||||||
#define SPC_SFT MT(MOD_LSFT, KC_SPC)
|
#define SPC_SFT MT(MOD_LSFT, KC_SPC)
|
||||||
#define TAB_SYM LT(_SYMBOL, KC_TAB)
|
#define BSP_SYM LT(_SYMBOL, KC_BSPC)
|
||||||
#define DEL_WRP MT(MOD_LCTL | MOD_LALT | MOD_LGUI, KC_DEL)
|
#define DEL_WRP MT(MOD_LCTL | MOD_LALT | MOD_LGUI, KC_DEL)
|
||||||
|
|
||||||
#define NAVLOCK TG(_NAVNUM)
|
#define NAVLOCK TG(_NAVNUM)
|
||||||
#define SYMLOCK TG(_SYMBOL)
|
#define SYMLOCK TG(_SYMBOL)
|
||||||
|
|
||||||
|
|
||||||
// QWERTY
|
// == QWERTY
|
||||||
|
// left hand home row
|
||||||
#define A_CTRL MT(MOD_LCTL, KC_A)
|
#define A_CTRL MT(MOD_LCTL, KC_A)
|
||||||
#define S_ALT MT(MOD_LALT, KC_S)
|
#define S_ALT MT(MOD_LALT, KC_S)
|
||||||
#define D_GUI MT(MOD_LGUI, KC_D)
|
#define D_GUI MT(MOD_LGUI, KC_D)
|
||||||
#define F_SHFT MT(MOD_LSFT, KC_F)
|
#define F_SHFT MT(MOD_LSFT, KC_F)
|
||||||
|
// left hand aux
|
||||||
|
#define W_CTRL MT(MOD_LCTL, KC_W)
|
||||||
|
#define E_ALT MT(MOD_LALT, KC_E)
|
||||||
|
#define R_GUI MT(MOD_LGUI, KC_R)
|
||||||
|
|
||||||
|
// right hand home row
|
||||||
#define J_SHFT MT(MOD_RSFT, KC_J)
|
#define J_SHFT MT(MOD_RSFT, KC_J)
|
||||||
#define K_GUI MT(MOD_RGUI, KC_K)
|
#define K_GUI MT(MOD_RGUI, KC_K)
|
||||||
#define L_ALT MT(MOD_RALT, KC_L)
|
#define L_ALT MT(MOD_RALT, KC_L)
|
||||||
#define MINSCTL MT(MOD_RCTL, KC_MINS)
|
#define MINSCTL MT(MOD_RCTL, KC_MINS)
|
||||||
|
// right hand aux
|
||||||
|
#define U_GUI MT(MOD_RGUI, KC_U)
|
||||||
|
#define I_ALT MT(MOD_RALT, KC_I)
|
||||||
|
#define O_CTRL MT(MOD_RCTL, KC_O)
|
||||||
|
|
||||||
|
// == OS X default keys
|
||||||
|
// movement by word
|
||||||
#define BWORD LALT(KC_LEFT)
|
#define BWORD LALT(KC_LEFT)
|
||||||
#define FWORD LALT(KC_RIGHT)
|
#define FWORD LALT(KC_RIGHT)
|
||||||
|
|
||||||
// OS X default keys
|
// gui navigation
|
||||||
#define NWIN LGUI(KC_GRV) // Next Window
|
#define NWIN LGUI(KC_GRV) // Next Window
|
||||||
#define PWIN LGUI(LSFT(KC_GRV)) // Prev Window
|
#define PWIN LGUI(LSFT(KC_GRV)) // Prev Window
|
||||||
#define NTAB LGUI(LSFT(KC_RBRC)) // Next Tab
|
#define NTAB LGUI(LSFT(KC_RBRC)) // Next Tab
|
||||||
|
@ -70,12 +84,13 @@ enum {
|
||||||
#define XPRVSPC HYPR(KC_F17)
|
#define XPRVSPC HYPR(KC_F17)
|
||||||
#define XNOTIFY HYPR(KC_F18)
|
#define XNOTIFY HYPR(KC_F18)
|
||||||
|
|
||||||
|
// == UNDERGLOW
|
||||||
#ifdef RGBLIGHT_ENABLE
|
#ifdef RGBLIGHT_ENABLE
|
||||||
#define HSV_CAPS 42, 255, 255
|
#define HSV_CAPS 60, 255, 255
|
||||||
#define HSV_DEFAULT 30, 218, 255
|
#define HSV_DEFAULT 30, 255, 255
|
||||||
#define HSV_SYMBOL 22, 255, 255
|
#define HSV_SYMBOL 18, 255, 255
|
||||||
#define HSV_NAVNUM 245, 200, 255
|
#define HSV_NAVNUM 250, 255, 255
|
||||||
#define HSV_FUNCT 233, 255, 255
|
#define HSV_FUNCT 238, 255, 255
|
||||||
#define HSV_RESET 180, 255, 255
|
#define HSV_RESET 180, 255, 255
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue