From 03574b7b8c6e9d53e838b25c90ec581b97e6d75a Mon Sep 17 00:00:00 2001 From: Christine Dodrill Date: Fri, 4 Dec 2020 14:15:23 -0500 Subject: [PATCH] updates Signed-off-by: Christine Dodrill --- moonlander/combos.def | 2 +- moonlander/keymap.c | 25 ++++++++++++++++++------- moonlander/leader.c | 1 + 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/moonlander/combos.def b/moonlander/combos.def index 3711ee8..ae8bc3f 100644 --- a/moonlander/combos.def +++ b/moonlander/combos.def @@ -1 +1 @@ -COMB(cvEnt, KC_ENT, KC_C, KC_V) \ No newline at end of file +COMB(cvEnt, KC_ENT, KC_C, KC_D) diff --git a/moonlander/keymap.c b/moonlander/keymap.c index bcc70b6..df0fce0 100644 --- a/moonlander/keymap.c +++ b/moonlander/keymap.c @@ -68,6 +68,8 @@ enum custom_keycodes { RUST_PUB_CRATE, FAT_ARROW, THIN_ARROW, + NX_IH, + EM_MX, }; #define COLEMAK 0 @@ -82,9 +84,9 @@ enum custom_keycodes { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_moonlander( KC_EQUAL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_LEFT, KC_RIGHT, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, - KC_DELETE, KC_Q, KC_W, KC_F, KC_P, KC_G, TG(MEDIA), TG(DVORAK), KC_J, KC_L, KC_U, KC_Y, KC_SCOLON, KC_BSLASH, - KC_ESCAPE, KC_A, KC_R, KC_S, KC_T, KC_D, TG(QWERTY), MO(DWM), KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOTE, - KC_LSHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMMA, KC_DOT, KC_SLASH, MO(POGBAU), + KC_DELETE, KC_Q, KC_W, KC_F, KC_P, KC_B, TG(MEDIA), TG(DVORAK), KC_J, KC_L, KC_U, KC_Y, KC_SCOLON, KC_BSLASH, + KC_ESCAPE, KC_A, KC_R, KC_S, KC_T, KC_G, TG(QWERTY), MO(DWM), KC_M, KC_N, KC_E, KC_I, KC_O, KC_QUOTE, + KC_LSHIFT, KC_Z, KC_X, KC_C, KC_D, KC_V, KC_K, KC_H, KC_COMMA, KC_DOT, KC_SLASH, MO(POGBAU), MO(SYMNUM), KC_LCTRL, KC_LALT, KC_LEFT, KC_RIGHT, KC_LEAD, RCTL_T(KC_ESCAPE), KC_UP, KC_DOWN, KC_RGUI, KC_PSCREEN, MO(SYMNUM), KC_SPACE, KC_BSPACE, KC_LGUI, KC_COLON, KC_TAB, KC_SFTENT @@ -145,12 +147,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [POGBAU] = LAYOUT_moonlander( KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, - KC_TRANSPARENT, RUST_TEST, RUST_PUB_CRATE, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, + KC_TRANSPARENT, RUST_TEST, RUST_PUB_CRATE, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, NX_IH, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, RUST_ATTRIBUTE, FAT_ARROW, THIN_ARROW, RUST_MAP_ERR, KC_UNDS, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, IF_ERR_NIL, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, RUST_DERIVE, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, - KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT + KC_TRANSPARENT, KC_TRANSPARENT, EM_MX ), }; @@ -162,7 +164,7 @@ void keyboard_post_init_user(void) { } const uint8_t PROGMEM ledmap[][DRIVER_LED_TOTAL][3] = { - [0] = { {230,232,228}, {230,232,228}, {230,232,228}, {240,108,244}, {240,108,244}, {206,237,232}, {230,232,228}, {225,127,232}, {230,232,228}, {240,108,244}, {206,237,232}, {230,232,228}, {225,127,232}, {230,232,228}, {240,108,244}, {206,237,232}, {230,232,228}, {225,127,232}, {230,232,228}, {250,159,255}, {206,237,232}, {230,232,228}, {225,127,232}, {230,232,228}, {250,159,255}, {206,237,232}, {230,232,228}, {230,232,228}, {230,232,228}, {230,232,228}, {14,222,242}, {255,220,201}, {230,232,228}, {237,252,249}, {250,159,255}, {224,255,255}, {230,232,228}, {230,232,228}, {230,232,228}, {240,108,244}, {240,108,244}, {206,237,232}, {230,232,228}, {225,127,232}, {230,232,228}, {230,232,228}, {206,237,232}, {230,232,228}, {225,127,232}, {230,232,228}, {230,232,228}, {206,237,232}, {230,232,228}, {225,127,232}, {230,232,228}, {250,159,255}, {206,237,232}, {230,232,228}, {225,127,232}, {230,232,228}, {250,159,255}, {206,237,232}, {230,232,228}, {230,232,228}, {230,232,228}, {230,232,228}, {85,203,158}, {205,255,255}, {230,232,228}, {237,252,249}, {250,159,255}, {224,255,255} }, + [0] = { {240,235,243}, {240,235,243}, {240,235,243}, {240,108,244}, {240,108,244}, {206,237,232}, {240,235,243}, {225,127,232}, {240,235,243}, {240,108,244}, {206,237,232}, {240,235,243}, {225,127,232}, {240,235,243}, {240,108,244}, {206,237,232}, {240,235,243}, {225,127,232}, {240,235,243}, {250,159,255}, {206,237,232}, {240,235,243}, {225,127,232}, {225,127,232}, {250,159,255}, {206,237,232}, {240,235,243}, {240,235,243}, {240,235,243}, {240,235,243}, {14,222,242}, {255,220,201}, {240,235,243}, {237,252,249}, {250,159,255}, {224,255,255}, {240,235,243}, {240,235,243}, {240,235,243}, {240,108,244}, {240,108,244}, {206,237,232}, {240,235,243}, {225,127,232}, {240,235,243}, {240,235,243}, {206,237,232}, {240,235,243}, {225,127,232}, {240,235,243}, {240,235,243}, {206,237,232}, {240,235,243}, {225,127,232}, {240,235,243}, {250,159,255}, {206,237,232}, {240,235,243}, {225,127,232}, {225,127,232}, {250,159,255}, {206,237,232}, {240,235,243}, {240,235,243}, {240,235,243}, {240,235,243}, {31,255,255}, {205,255,255}, {240,235,243}, {237,252,249}, {250,159,255}, {224,255,255} }, [1] = { {253,255,255}, {24,211,255}, {35,255,255}, {94,255,128}, {172,255,249}, {253,255,255}, {24,211,255}, {35,255,255}, {94,255,128}, {172,255,249}, {253,255,255}, {24,211,255}, {35,255,255}, {94,255,128}, {172,255,249}, {253,255,255}, {24,211,255}, {35,255,255}, {94,255,128}, {172,255,249}, {253,255,255}, {24,211,255}, {35,255,255}, {94,255,128}, {172,255,249}, {253,255,255}, {24,211,255}, {35,255,255}, {94,255,128}, {253,255,255}, {24,211,255}, {35,255,255}, {217,255,134}, {217,255,134}, {217,255,134}, {172,255,249}, {253,255,255}, {24,211,255}, {35,255,255}, {94,255,128}, {172,255,249}, {253,255,255}, {24,211,255}, {35,255,255}, {94,255,128}, {172,255,249}, {253,255,255}, {24,211,255}, {35,255,255}, {94,255,128}, {172,255,249}, {253,255,255}, {24,211,255}, {35,255,255}, {94,255,128}, {172,255,249}, {253,255,255}, {24,211,255}, {35,255,255}, {94,255,128}, {172,255,249}, {253,255,255}, {24,211,255}, {35,255,255}, {94,255,128}, {253,255,255}, {24,211,255}, {35,255,255}, {217,255,134}, {217,255,134}, {217,255,134}, {172,255,249} }, @@ -176,7 +178,7 @@ const uint8_t PROGMEM ledmap[][DRIVER_LED_TOTAL][3] = { [6] = { {0,205,155}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {250,159,255}, {14,222,242}, {14,222,242}, {0,0,0}, {0,0,0}, {250,159,255}, {255,220,201}, {255,220,201}, {0,0,0}, {0,0,0}, {250,159,255}, {233,218,217}, {233,218,217}, {0,0,0}, {0,0,0}, {250,159,255}, {205,255,255}, {205,255,255}, {0,0,0}, {0,0,0}, {250,159,255}, {31,255,255}, {31,255,255}, {0,0,0}, {0,0,0}, {0,0,0}, {255,220,201}, {233,218,217}, {31,255,255}, {0,0,0}, {0,0,0}, {250,159,255}, {14,222,242}, {14,222,242}, {0,0,0}, {0,0,0}, {250,159,255}, {14,222,242}, {14,222,242}, {0,0,0}, {0,0,0}, {250,159,255}, {255,220,201}, {255,220,201}, {0,0,0}, {0,0,0}, {250,159,255}, {233,218,217}, {233,218,217}, {0,0,0}, {0,0,0}, {250,159,255}, {205,255,255}, {205,255,255}, {0,0,0}, {0,0,0}, {250,159,255}, {31,255,255}, {31,255,255}, {0,0,0}, {0,0,0}, {0,0,0}, {255,220,201}, {233,218,217}, {31,255,255}, {0,0,0} }, - [POGBAU] = { {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,183,238}, {0,183,238}, {0,183,238}, {0,0,0}, {0,0,0}, {0,183,238}, {0,183,238}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,183,238}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,183,238}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,183,238}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {134,142,216}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0} } + [POGBAU] = { {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,183,238}, {0,183,238}, {0,183,238}, {0,0,0}, {0,0,0}, {0,183,238}, {0,183,238}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,183,238}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,183,238}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,183,238}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {207,149,232}, {134,142,216}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {187,131,225}, {0,0,0}, {0,0,0}, {0,0,0} }, }; void set_layer_color(int layer) { @@ -502,6 +504,15 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { SEND_STRING("->"); } return false; + case NX_IH: + if (record->event.pressed) { + SEND_STRING("inherit"); + } + return false; + case EM_MX: + if (record->event.pressed) { + SEND_STRING(SS_LALT("x")); + } } return true; } diff --git a/moonlander/leader.c b/moonlander/leader.c index 27037e9..0c49b16 100644 --- a/moonlander/leader.c +++ b/moonlander/leader.c @@ -119,5 +119,6 @@ void matrix_scan_user(void) { SEQ_TWO_KEYS(KC_M, KC_H) { SEND_STRING("https://cdn.christine.website/file/christine-static/stickers/mara/hacker.png\n"); } SEQ_TWO_KEYS(KC_M, KC_W) { SEND_STRING("https://cdn.christine.website/file/christine-static/stickers/mara/wat.png\n"); } SEQ_TWO_KEYS(KC_M, KC_T) { SEND_STRING("https://cdn.christine.website/file/christine-static/stickers/mara/hmm.png\n"); } + SEQ_TWO_KEYS(KC_M, KC_S) { SEND_STRING("https://cdn.christine.website/file/christine-static/stickers/mara/sh0rck.png\n"); } } }