From 672cd69039e029da8ef384c23e85b54f2d9cc564 Mon Sep 17 00:00:00 2001
From: Christine Dodrill <me@christine.website>
Date: Mon, 26 Oct 2020 21:15:39 -0400
Subject: [PATCH] what's on my keeb

---
 moonlander/config.h | 2 +-
 moonlander/keymap.c | 4 +---
 moonlander/leader.c | 8 ++++----
 moonlander/rules.mk | 1 -
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/moonlander/config.h b/moonlander/config.h
index 23327e2..9e11655 100644
--- a/moonlander/config.h
+++ b/moonlander/config.h
@@ -5,7 +5,7 @@
 #define ORYX_CONFIGURATOR
 #define FIRMWARE_VERSION u8"xbJXx/Gw3K3"
 #define RGB_MATRIX_STARTUP_SPD 60
-#define LEADER_TIMEOUT 100
+#define LEADER_TIMEOUT 250
 #define LEADER_PER_KEY_TIMING
 #define COMBO_COUNT 1
 #define COMBO_TERM 50
diff --git a/moonlander/keymap.c b/moonlander/keymap.c
index 158c7db..4118acb 100644
--- a/moonlander/keymap.c
+++ b/moonlander/keymap.c
@@ -76,7 +76,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_DELETE,      KC_Q,           KC_W,           KC_F,           KC_P,           KC_G,           TG(4),                                          TG(2),          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(1),                                          TG(5),          KC_H,           KC_N,           KC_E,           KC_I,           KC_O,           KC_QUOTE,
     KC_LSPO,        KC_Z,           KC_X,           KC_C,           KC_V,           KC_B,                                                                           KC_K,           KC_M,           KC_COMMA,       KC_DOT,         KC_SLASH,       KC_RSPC,
-    LT(3,KC_GRAVE), KC_LCTRL,       LALT(KC_LSHIFT),KC_LEFT,        KC_RIGHT,       LALT_T(KC_LEAD),                                                            RCTL_T(KC_ESCAPE),  KC_UP,          KC_DOWN,        KC_LBRACKET,    KC_RBRACKET,    MO(3),
+    LT(3,KC_GRAVE), KC_LCTRL,       KC_LALT,        KC_LEFT,        KC_RIGHT,       KC_LEAD,                                                                   RCTL_T(KC_ESCAPE),  KC_UP,          KC_DOWN,        KC_LBRACKET,    KC_RBRACKET,    MO(3),
     KC_SPACE,       KC_BSPACE,      KC_LGUI,
     KC_COLON,       KC_TAB,         KC_ENTER
   ),
@@ -442,7 +442,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
 void matrix_init_user() {
     steno_set_mode(STENO_MODE_GEMINI); // or STENO_MODE_BOLT
-    autoshift_enable();
 }
 
 layer_state_t layer_state_set_user(layer_state_t state) {
@@ -450,7 +449,6 @@ layer_state_t layer_state_set_user(layer_state_t state) {
         case COLEMAK:
             break;
         case QWERTY:
-          PLAY_SONG(number_one);
             break;
         case DVORAK:
             break;
diff --git a/moonlander/leader.c b/moonlander/leader.c
index bd77a55..e5070fd 100644
--- a/moonlander/leader.c
+++ b/moonlander/leader.c
@@ -24,10 +24,10 @@ void matrix_scan_user(void) {
         SEQ_TWO_KEYS(KC_C, KC_D) { combo_disable(); }
         SEQ_TWO_KEYS(KC_C, KC_E) { combo_enable(); }
 
-        // Autoshift
-        SEQ_THREE_KEYS(KC_A, KC_S, KC_T) { autoshift_toggle(); }
-        SEQ_THREE_KEYS(KC_A, KC_S, KC_E) { autoshift_enable(); }
-        SEQ_THREE_KEYS(KC_A, KC_S, KC_D) { autoshift_disable(); }
+        /* // Autoshift */
+        /* SEQ_THREE_KEYS(KC_A, KC_S, KC_T) { autoshift_toggle(); } */
+        /* SEQ_THREE_KEYS(KC_A, KC_S, KC_E) { autoshift_enable(); } */
+        /* SEQ_THREE_KEYS(KC_A, KC_S, KC_D) { autoshift_disable(); } */
 
         // Go
         SEQ_THREE_KEYS(KC_G, KC_I, KC_E) { SEND_STRING("if err != nil {\n\t\n}" SS_TAP(X_UP)); }
diff --git a/moonlander/rules.mk b/moonlander/rules.mk
index c5f4b32..dae2a70 100644
--- a/moonlander/rules.mk
+++ b/moonlander/rules.mk
@@ -11,6 +11,5 @@ COMBO_ENABLE = yes
 VPATH += keyboards/gboards/
 WPM_ENABLE = yes
 STENO_ENABLE = yes
-AUTO_SHIFT_ENABLE = yes
 LEADER_ENABLE = yes
 USER_NAME := kadis