From 79d54b47a41d6ce85b2a1ab0fe7e9154b8dfeffc Mon Sep 17 00:00:00 2001 From: Christine Dodrill Date: Sat, 19 Jun 2021 20:43:13 -0400 Subject: [PATCH] :crab: steno is back :crab: Signed-off-by: Christine Dodrill --- moonlander/keymap.c | 70 +++++++++++++++++---------------------------- moonlander/leader.c | 19 ++++++------ moonlander/rules.mk | 4 +-- 3 files changed, 38 insertions(+), 55 deletions(-) diff --git a/moonlander/keymap.c b/moonlander/keymap.c index 7a6bdc1..2287a34 100644 --- a/moonlander/keymap.c +++ b/moonlander/keymap.c @@ -1,7 +1,7 @@ #include QMK_KEYBOARD_H #include "config.h" #include "version.h" -//#include "keymap_steno.h" +#include "keymap_steno.h" #include "music.h" #include "g/keymap_combo.h" @@ -73,27 +73,22 @@ enum custom_keycodes { CAD_ACT, CAD_LIN, CAD_DEF, - CAD_SWT, TWI_ACT, TWI_LIN, TWI_DEF, - TWI_SWT, JES_ACT, JES_LIN, JES_DEF, - JES_SWT, ASH_ACT, ASH_LIN, ASH_DEF, - ASH_SWT, PHI_ACT, PHI_LIN, PHI_DEF, - PHI_SWT, MAI_ACT, MAI_LIN, MAI_DEF, - MAI_SWT, + GO_CHAN_RECV, }; #define COLEMAK 0 @@ -103,10 +98,11 @@ enum custom_keycodes { #define DWM 4 #define POGBAU 5 #define WTHN 6 +#define STENO 7 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [COLEMAK] = 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_EQUAL, KC_1, KC_2, KC_3, KC_4, KC_5, TG(STENO), TG(STENO), KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, KC_DELETE, KC_Q, KC_W, KC_F, KC_P, KC_B, TG(MEDIA), OSL(WTHN), 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), @@ -153,7 +149,7 @@ 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, 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_ATTRIBUTE, FAT_ARROW, THIN_ARROW, RUST_MAP_ERR, KC_UNDS, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, IF_ERR_NIL, GO_CHAN_RECV, 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, @@ -162,12 +158,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [WTHN] = LAYOUT_moonlander( KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, CAD_ACT, TWI_ACT, JES_ACT, ASH_ACT, PHI_ACT, MAI_ACT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - CAD_LIN, TWI_LIN, JES_LIN, ASH_LIN, PHI_LIN, MAI_LIN, KC_NO, KC_NO, CAD_SWT, TWI_SWT, JES_SWT, ASH_SWT, PHI_SWT, MAI_SWT, + CAD_LIN, TWI_LIN, JES_LIN, ASH_LIN, PHI_LIN, MAI_LIN, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, CAD_DEF, TWI_DEF, JES_DEF, ASH_DEF, PHI_DEF, MAI_DEF, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO ), + [STENO] = LAYOUT_moonlander( + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRANSPARENT, KC_TRANSPARENT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, STN_N1, STN_N2, STN_N3, STN_N4, STN_N5, KC_NO, KC_NO, STN_N6, STN_N7, STN_N8, STN_N9, STN_NA, STN_NB, + KC_NO, STN_S1, STN_TL, STN_PL, STN_HL, STN_ST1, KC_NO, KC_NO, STN_ST3, STN_FR, STN_PR, STN_LR, STN_TR, STN_DR, + KC_NO, STN_S2, STN_KL, STN_WL, STN_RL, STN_ST2, STN_ST4, STN_RR, STN_BR, STN_GR, STN_SR, STN_ZR, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, STN_NA, STN_NB, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + STN_A, STN_O, STN_ST2, + STN_ST3, STN_E, STN_U + ), }; extern bool g_suspend_state; @@ -178,7 +183,7 @@ void keyboard_post_init_user(void) { } const uint8_t PROGMEM ledmap[][DRIVER_LED_TOTAL][3] = { - [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} }, + [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}, {130,125,136}, {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}, {130,125,136}, {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}, {217,255,134}, {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}, {217,255,134} }, @@ -188,9 +193,11 @@ const uint8_t PROGMEM ledmap[][DRIVER_LED_TOTAL][3] = { [4] = { {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {112,52,165}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {112,52,165}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {112,52,165}, {30,207,250}, {43,203,187}, {30,207,250}, {19,229,254}, {112,52,165}, {0,0,0}, {4,202,251}, {0,0,0}, {19,229,254}, {112,52,165}, {4,202,251}, {134,255,213}, {134,255,213}, {0,0,0}, {14,222,242}, {255,220,201}, {4,202,251}, {0,0,0}, {0,0,0}, {43,203,187}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {112,52,165}, {30,207,250}, {43,203,187}, {0,0,0}, {0,0,0}, {112,52,165}, {4,202,251}, {43,203,187}, {0,0,0}, {0,0,0}, {112,52,165}, {43,203,187}, {43,203,187}, {0,0,0}, {19,229,254}, {112,52,165}, {4,202,251}, {43,203,187}, {4,202,251}, {19,229,254}, {112,52,165}, {134,255,213}, {0,0,0}, {0,0,0}, {0,0,0}, {31,255,255}, {205,255,255}, {30,207,250}, {112,52,165}, {0,0,0}, {0,0,0} }, - [5] = { {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} }, + [5] = { {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}, {134,142,216}, {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} }, - [6] = { {0,0,0}, {240,235,243}, {240,235,243}, {240,235,243}, {0,0,0}, {0,0,0}, {203,68,215}, {203,68,215}, {203,68,215}, {0,0,0}, {0,0,0}, {94,255,128}, {94,255,128}, {94,255,128}, {0,0,0}, {0,0,0}, {172,255,249}, {172,255,249}, {172,255,249}, {0,0,0}, {0,0,0}, {31,255,255}, {31,255,255}, {31,255,255}, {0,0,0}, {0,0,0}, {14,255,255}, {14,255,255}, {14,255,255}, {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}, {14,255,255}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {31,255,255}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {172,255,249}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {94,255,128}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {203,68,215}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {240,235,243}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0} }, + [6] = { {0,0,0}, {240,235,243}, {240,235,243}, {240,235,243}, {0,0,0}, {0,0,0}, {203,68,215}, {203,68,215}, {203,68,215}, {0,0,0}, {0,0,0}, {94,255,128}, {94,255,128}, {94,255,128}, {0,0,0}, {0,0,0}, {172,255,249}, {172,255,249}, {172,255,249}, {0,0,0}, {0,0,0}, {31,255,255}, {31,255,255}, {31,255,255}, {0,0,0}, {0,0,0}, {14,255,255}, {14,255,255}, {14,255,255}, {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}, {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} }, + + [7] = { {34,52,251}, {34,52,251}, {34,52,251}, {34,52,251}, {34,52,251}, {34,52,251}, {1,218,204}, {31,255,255}, {31,255,255}, {34,52,251}, {34,52,251}, {1,218,204}, {134,142,216}, {134,142,216}, {34,52,251}, {34,52,251}, {1,218,204}, {246,93,211}, {238,113,177}, {34,52,251}, {34,52,251}, {1,218,204}, {87,86,157}, {87,86,157}, {34,52,251}, {34,52,251}, {1,218,204}, {42,211,152}, {42,211,152}, {34,52,251}, {34,52,251}, {34,52,251}, {87,86,157}, {238,113,177}, {42,211,152}, {1,218,204}, {34,52,251}, {1,218,204}, {31,255,255}, {31,255,255}, {34,52,251}, {34,52,251}, {1,218,204}, {134,142,216}, {134,142,216}, {34,52,251}, {34,52,251}, {1,218,204}, {238,113,177}, {238,113,177}, {34,52,251}, {34,52,251}, {1,218,204}, {87,86,157}, {87,86,157}, {34,52,251}, {34,52,251}, {1,218,204}, {87,86,157}, {87,86,157}, {34,52,251}, {34,52,251}, {1,218,204}, {42,211,152}, {42,211,152}, {34,52,251}, {34,52,251}, {34,52,251}, {87,86,157}, {238,113,177}, {42,211,152}, {1,218,204} }, }; void set_layer_color(int layer) { @@ -532,6 +539,11 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { SEND_STRING("->"); } return false; + case GO_CHAN_RECV: + if (record->event.pressed) { + SEND_STRING("<-"); + } + return false; case NX_IH: if (record->event.pressed) { SEND_STRING("inherit"); @@ -562,11 +574,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { SEND_STRING("))"); } return false; - case CAD_SWT: - if (record->event.pressed) { - // do_switch(CAD); - } - return false; case TWI_ACT: if (record->event.pressed) { SEND_STRING("\\"); @@ -587,11 +594,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { SEND_STRING("))"); } return false; - case TWI_SWT: - if (record->event.pressed) { - // do_switch(TWI); - } - return false; case JES_ACT: if (record->event.pressed) { SEND_STRING("\\"); @@ -612,11 +614,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { SEND_STRING("))"); } return false; - case JES_SWT: - if (record->event.pressed) { - // do_switch(JES); - } - return false; case ASH_ACT: if (record->event.pressed) { SEND_STRING("\\"); @@ -637,11 +634,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { SEND_STRING("))"); } return false; - case ASH_SWT: - if (record->event.pressed) { - // do_switch(ASH); - } - return false; case PHI_ACT: if (record->event.pressed) { SEND_STRING("\\"); @@ -662,11 +654,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { SEND_STRING("))"); } return false; - case PHI_SWT: - if (record->event.pressed) { - // do_switch(PHI); - } - return false; case MAI_ACT: if (record->event.pressed) { SEND_STRING("\\"); @@ -687,17 +674,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { SEND_STRING("))"); } return false; - case MAI_SWT: - if (record->event.pressed) { - // do_switch(MAI); - } - return false; } return true; } void matrix_init_user() { - //steno_set_mode(STENO_MODE_GEMINI); // or STENO_MODE_BOLT + steno_set_mode(STENO_MODE_GEMINI); // or STENO_MODE_BOLT } layer_state_t layer_state_set_user(layer_state_t state) { diff --git a/moonlander/leader.c b/moonlander/leader.c index 233f738..dd41288 100644 --- a/moonlander/leader.c +++ b/moonlander/leader.c @@ -32,18 +32,19 @@ void matrix_scan_user(void) { SEQ_THREE_KEYS(KC_N, KC_O, KC_U) { SEND_STRING("sudo nixos-rebuild switch --upgrade"); } // Git - SEQ_TWO_KEYS(KC_G, KC_P) { SEND_STRING("git push"); } + SEQ_TWO_KEYS(KC_G, KC_P) { SEND_STRING("git push "); } SEQ_THREE_KEYS(KC_G, KC_F, KC_P) { SEND_STRING("git push --force-with-lease"); } - SEQ_TWO_KEYS(KC_G, KC_U) { SEND_STRING("git pull"); } + SEQ_TWO_KEYS(KC_G, KC_U) { SEND_STRING("git pull "); } SEQ_TWO_KEYS(KC_G, KC_A) { SEND_STRING("git add ."); } - SEQ_TWO_KEYS(KC_G, KC_D) { SEND_STRING("git diff"); } - SEQ_THREE_KEYS(KC_G, KC_D, KC_S) { SEND_STRING("git diff --staged"); } - SEQ_TWO_KEYS(KC_G, KC_L) { SEND_STRING("git log"); } - SEQ_THREE_KEYS(KC_G, KC_L, KC_O) { SEND_STRING("git log --oneline"); } - SEQ_TWO_KEYS(KC_G, KC_O) { SEND_STRING("git checkout"); } + SEQ_TWO_KEYS(KC_G, KC_D) { SEND_STRING("git diff "); } + SEQ_THREE_KEYS(KC_G, KC_D, KC_S) { SEND_STRING("git diff --staged "); } + SEQ_TWO_KEYS(KC_G, KC_L) { SEND_STRING("git log "); } + SEQ_THREE_KEYS(KC_G, KC_L, KC_O) { SEND_STRING("git log --oneline "); } + SEQ_TWO_KEYS(KC_G, KC_O) { SEND_STRING("git checkout "); } SEQ_THREE_KEYS(KC_G, KC_O, KC_B) { SEND_STRING("git checkout -b "); } - SEQ_TWO_KEYS(KC_G, KC_S) { SEND_STRING("git status"); } - SEQ_TWO_KEYS(KC_G, KC_C) { SEND_STRING("git commit -sm ''" SS_TAP(X_LEFT)); } + SEQ_TWO_KEYS(KC_G, KC_S) { SEND_STRING("git status "); } + SEQ_TWO_KEYS(KC_G, KC_C) { SEND_STRING("git commit "); } + SEQ_THREE_KEYS(KC_G, KC_C, KC_S) { SEND_STRING("git commit -sm ''" SS_TAP(X_LEFT)); } SEQ_THREE_KEYS(KC_G, KC_C, KC_A) { SEND_STRING("git commit --amend -m ''" SS_TAP(X_LEFT)); } // emacs diff --git a/moonlander/rules.mk b/moonlander/rules.mk index 12db0ee..6c59eb4 100644 --- a/moonlander/rules.mk +++ b/moonlander/rules.mk @@ -8,9 +8,9 @@ SRC = matrix.c RGBLIGHT_ENABLE = no RGB_MATRIX_ENABLE = yes WPM_ENABLE = yes -STENO_ENABLE = no +STENO_ENABLE = yes LEADER_ENABLE = yes USER_NAME := kadis COMBO_ENABLE = yes -RAW_ENABLE = yes +RAW_ENABLE = no VPATH += keyboards/gboards/