@@ -110,11 +110,11 @@ enum combos {
110
110
// necessary to tell it how many combos there are
111
111
uint16_t COMBO_LEN = C_LENGTH ;
112
112
const uint16_t PROGMEM c_nested_tmux_layer [] = { OSL (L_TMUX ), OSL (L_NAV ), COMBO_END };
113
- const uint16_t PROGMEM c_right_alt [] = { OSL (L_SYMB ), KC_LGUI , COMBO_END };
113
+ const uint16_t PROGMEM c_right_alt [] = { OSL (L_SYMB ), KC_LEFT_GUI , COMBO_END };
114
114
115
115
combo_t key_combos [] = {
116
116
[C_L_N_TMUX ] = COMBO (c_nested_tmux_layer , OSL (L_N_TMUX )),
117
- [C_RALT ] = COMBO (c_right_alt , KC_RALT ),
117
+ [C_RALT ] = COMBO (c_right_alt , KC_RIGHT_ALT ),
118
118
};
119
119
120
120
// clang-format off
@@ -125,19 +125,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
125
125
KC_DELETE , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_HOME , KC_END , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_MINUS ,
126
126
//|______________|______________|______________|________|________|______________|___________| |_____________|_________|________|__________|_____________|_____________|_____________|
127
127
//| | | | | | | | | | | | | | | |
128
- KC_AMPR , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_PIPE , TO (L_SYMB ), KC_Y , KC_U , KC_I , KC_O , KC_P , KC_BSLASH ,
128
+ KC_AMPR , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_PIPE , TO (L_SYMB ), KC_Y , KC_U , KC_I , KC_O , KC_P , KC_BACKSLASH ,
129
129
//|______________|______________|______________|________|________|______________|___________| |_____________|_________|________|__________|_____________|_____________|_____________|
130
130
//| | | | | | | | | | | | | | | |
131
- LT (L_SYMB ,KC_ESC ), KC_A , KC_S , KC_D , KC_F , KC_G , MT_HYP_EQ , TG (L_NAV ), KC_H , KC_J , KC_K , KC_L , KC_SCOLON , KC_QUOTE ,
131
+ LT (L_SYMB ,KC_ESC ), KC_A , KC_S , KC_D , KC_F , KC_G , MT_HYP_EQ , TG (L_NAV ), KC_H , KC_J , KC_K , KC_L , KC_SEMICOLON , KC_QUOTE ,
132
132
//|______________|______________|______________|________|________|______________|___________| |_____________|_________|________|__________|_____________|_____________|_____________|
133
133
//| | | | | | | | | | | | | |
134
- KC_LSHIFT , LCTL_T (KC_Z ), LSFT_T (KC_X ), KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMMA , KC_DOT , KC_SLASH , KC_LEAD ,
134
+ KC_LEFT_SHIFT , LCTL_T (KC_Z ), LSFT_T (KC_X ), KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMMA , KC_DOT , KC_SLASH , KC_LEAD ,
135
135
//|______________|______________|______________|________|________|______________| |_________|________|__________|_____________|_____________|_____________|
136
136
//| | | | | | | | | | | | | |
137
- TD (D_SYS ), TD (D_CAPS ), KC_LGUI ,OSL (L_TMUX ),OSL (L_NAV ),LALT (KC_TAB ), TG (L_NUMPAD ),OSL (L_SYMB ),KC_LGUI , TD (D_WKSP_L ), TD (D_WKSP_R ), MO (L_MEDIA ),
137
+ TD (D_SYS ), TD (D_CAPS ), KC_LEFT_GUI ,OSL (L_TMUX ),OSL (L_NAV ),LALT (KC_TAB ), TG (L_NUMPAD ),OSL (L_SYMB ),KC_LEFT_GUI , TD (D_WKSP_L ),TD (D_WKSP_R ), MO (L_MEDIA ),
138
138
//|______________|______________|______________|________|________|______________|_________ ___________|_________|________|__________|_____________|_____________|_____________|
139
139
// | | | | | | | |
140
- LCTL_T (KC_ENTER ), LSFT_T (KC_TAB ), KC_LALT , KC_LALT , LSFT_T (KC_BSPACE ), LCTL_T (KC_SPACE )
140
+ LCTL_T (KC_ENTER ), LSFT_T (KC_TAB ), KC_LEFT_ALT , KC_LEFT_ALT , LSFT_T (KC_BACKSPACE ), LCTL_T (KC_SPACE )
141
141
// |__________________|________________|___________________| |___________|__________________|________________|
142
142
),
143
143
@@ -147,13 +147,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
147
147
_______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ ,
148
148
//|______________|______________|______________|________|________|______________|___________| |_____________|_________|________|__________|_____________|_____________|_____________|
149
149
//| | | | | | | | | | | | | | | |
150
- _______ , _______ , KC_HOME , KC_PGDN , KC_PGUP , KC_END , _______ , _______ , KC_HOME , KC_PGDN , KC_PGUP , KC_END , _______ , _______ ,
150
+ _______ , _______ , KC_HOME , KC_PGDN ,KC_PAGE_UP , KC_END , _______ , _______ , KC_HOME , KC_PGDN , KC_PAGE_UP , KC_END , _______ , _______ ,
151
151
//|______________|______________|______________|________|________|______________|___________| |_____________|_________|________|__________|_____________|_____________|_____________|
152
152
//| | | | | | | | | | | | | | | |
153
153
_______ , _______ , KC_LEFT , KC_DOWN , KC_UP , KC_RIGHT , _______ , _______ , KC_LEFT , KC_DOWN , KC_UP , KC_RIGHT , _______ , _______ ,
154
154
//|______________|______________|______________|________|________|______________|___________| |_____________|_________|________|__________|_____________|_____________|_____________|
155
155
//| | | | | | | | | | | | | |
156
- _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ ,
156
+ _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ ,
157
157
//|______________|______________|______________|________|________|______________| |_________|________|__________|_____________|_____________|_____________|
158
158
//| | | | | | | | | | | | | |
159
159
_______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ ,
@@ -264,7 +264,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
264
264
_______ , _______ , _______ , _______ , _______ , _______ , _______ , KC_0 , KC_0 , KC_DOT , KC_ENTER , _______ ,
265
265
//|______________|______________|______________|________|________|______________|_________ ___________|_________|________|__________|_____________|_____________|_____________|
266
266
// | | | | | | | |
267
- _______ , _______ , _______ , _______ , KC_BSPACE , KC_ENTER
267
+ _______ , _______ , _______ , _______ , KC_BACKSPACE , KC_ENTER
268
268
// |__________________|________________|___________________| |___________|__________________|________________|
269
269
),
270
270
[L_SYS ] = LAYOUT_moonlander (
@@ -298,7 +298,7 @@ bool active_sticky_mod_pressed = false;
298
298
uint16_t get_hold_on_other_key_press (uint16_t keycode , keyrecord_t * record ) {
299
299
switch (keycode ) {
300
300
case LSFT_T (KC_TAB ):
301
- case LSFT_T (KC_BSPACE ):
301
+ case LSFT_T (KC_BACKSPACE ):
302
302
return true;
303
303
default :
304
304
return false;
@@ -369,15 +369,15 @@ void sticky_mod(uint16_t mod_key, uint16_t keycode, keyrecord_t *record) {
369
369
bool process_record_user (uint16_t keycode , keyrecord_t * record ) {
370
370
switch (keycode ) {
371
371
case M_ALT_TAB :
372
- sticky_mod (KC_LALT , KC_TAB , record );
372
+ sticky_mod (KC_LEFT_ALT , KC_TAB , record );
373
373
return false;
374
374
375
375
case M_CTRL_TAB :
376
- sticky_mod (KC_LCTRL , KC_TAB , record );
376
+ sticky_mod (KC_LEFT_CTRL , KC_TAB , record );
377
377
return false;
378
378
379
379
case M_ALT_GRAVE :
380
- sticky_mod (KC_LALT , KC_GRAVE , record );
380
+ sticky_mod (KC_LEFT_ALT , KC_GRAVE , record );
381
381
return false;
382
382
383
383
// Macros
@@ -688,32 +688,32 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
688
688
break ;
689
689
case M_MGC_R :
690
690
if (record -> event .pressed ) {
691
- SEND_STRING (SS_LALT (SS_TAP (X_PSCREEN )) SS_DELAY (100 ) SS_TAP (X_R ));
691
+ SEND_STRING (SS_LALT (SS_TAP (X_SYSREQ ) SS_DELAY (100 ) SS_TAP (X_R ) ));
692
692
}
693
693
break ;
694
694
case M_MGC_E :
695
695
if (record -> event .pressed ) {
696
- SEND_STRING (SS_LALT (SS_TAP (X_PSCREEN )) SS_DELAY (100 ) SS_TAP (X_E ));
696
+ SEND_STRING (SS_LALT (SS_TAP (X_SYSREQ ) SS_DELAY (100 ) SS_TAP (X_E ) ));
697
697
}
698
698
break ;
699
699
case M_MGC_I :
700
700
if (record -> event .pressed ) {
701
- SEND_STRING (SS_LALT (SS_TAP (X_PSCREEN )) SS_DELAY (100 ) SS_TAP (X_I ));
701
+ SEND_STRING (SS_LALT (SS_TAP (X_SYSREQ ) SS_DELAY (100 ) SS_TAP (X_I ) ));
702
702
}
703
703
break ;
704
704
case M_MGC_S :
705
705
if (record -> event .pressed ) {
706
- SEND_STRING (SS_LALT (SS_TAP (X_PSCREEN )) SS_DELAY (100 ) SS_TAP (X_S ));
706
+ SEND_STRING (SS_LALT (SS_TAP (X_SYSREQ ) SS_DELAY (100 ) SS_TAP (X_S ) ));
707
707
}
708
708
break ;
709
709
case M_MGC_U :
710
710
if (record -> event .pressed ) {
711
- SEND_STRING (SS_LALT (SS_TAP (X_PSCREEN )) SS_DELAY (100 ) SS_TAP (X_U ));
711
+ SEND_STRING (SS_LALT (SS_TAP (X_SYSREQ ) SS_DELAY (100 ) SS_TAP (X_U ) ));
712
712
}
713
713
break ;
714
714
case M_MGC_B :
715
715
if (record -> event .pressed ) {
716
- SEND_STRING (SS_LALT (SS_TAP (X_PSCREEN )) SS_DELAY (100 ) SS_TAP (X_B ));
716
+ SEND_STRING (SS_LALT (SS_TAP (X_SYSREQ ) SS_DELAY (100 ) SS_TAP (X_B ) ));
717
717
}
718
718
break ;
719
719
case RGB_SLD :
@@ -821,7 +821,7 @@ void dance_1_finished(qk_tap_dance_state_t *state, void *user_data) {
821
821
dance_state [1 ].step = dance_step (state );
822
822
switch (dance_state [1 ].step ) {
823
823
case DOUBLE_TAP :
824
- register_code16 (KC_CAPSLOCK );
824
+ register_code16 (KC_CAPS_LOCK );
825
825
break ;
826
826
}
827
827
}
@@ -830,7 +830,7 @@ void dance_1_reset(qk_tap_dance_state_t *state, void *user_data) {
830
830
wait_ms (10 );
831
831
switch (dance_state [1 ].step ) {
832
832
case DOUBLE_TAP :
833
- unregister_code16 (KC_CAPSLOCK );
833
+ unregister_code16 (KC_CAPS_LOCK );
834
834
break ;
835
835
}
836
836
dance_state [1 ].step = 0 ;
@@ -842,41 +842,41 @@ void dance_3_reset(qk_tap_dance_state_t *state, void *user_data);
842
842
843
843
void on_dance_3 (qk_tap_dance_state_t * state , void * user_data ) {
844
844
if (state -> count == 3 ) {
845
- tap_code16 (LGUI (KC_PGUP ));
846
- tap_code16 (LGUI (KC_PGUP ));
847
- tap_code16 (LGUI (KC_PGUP ));
845
+ tap_code16 (LGUI (KC_PAGE_UP ));
846
+ tap_code16 (LGUI (KC_PAGE_UP ));
847
+ tap_code16 (LGUI (KC_PAGE_UP ));
848
848
}
849
849
if (state -> count > 3 ) {
850
- tap_code16 (LGUI (KC_PGUP ));
850
+ tap_code16 (LGUI (KC_PAGE_UP ));
851
851
}
852
852
}
853
853
854
854
void dance_3_finished (qk_tap_dance_state_t * state , void * user_data ) {
855
855
dance_state [3 ].step = dance_step (state );
856
856
switch (dance_state [3 ].step ) {
857
857
case SINGLE_TAP :
858
- register_code16 (LGUI (KC_PGUP ));
858
+ register_code16 (LGUI (KC_PAGE_UP ));
859
859
break ;
860
860
case DOUBLE_TAP :
861
- register_code16 (LGUI (LSFT (KC_PGUP )));
861
+ register_code16 (LGUI (LSFT (KC_PAGE_UP )));
862
862
break ;
863
863
case DOUBLE_SINGLE_TAP :
864
- tap_code16 (LGUI (KC_PGUP ));
865
- register_code16 (LGUI (KC_PGUP ));
864
+ tap_code16 (LGUI (KC_PAGE_UP ));
865
+ register_code16 (LGUI (KC_PAGE_UP ));
866
866
}
867
867
}
868
868
869
869
void dance_3_reset (qk_tap_dance_state_t * state , void * user_data ) {
870
870
wait_ms (10 );
871
871
switch (dance_state [3 ].step ) {
872
872
case SINGLE_TAP :
873
- unregister_code16 (LGUI (KC_PGUP ));
873
+ unregister_code16 (LGUI (KC_PAGE_UP ));
874
874
break ;
875
875
case DOUBLE_TAP :
876
- unregister_code16 (LGUI (LSFT (KC_PGUP )));
876
+ unregister_code16 (LGUI (LSFT (KC_PAGE_UP )));
877
877
break ;
878
878
case DOUBLE_SINGLE_TAP :
879
- unregister_code16 (LGUI (KC_PGUP ));
879
+ unregister_code16 (LGUI (KC_PAGE_UP ));
880
880
break ;
881
881
}
882
882
dance_state [3 ].step = 0 ;
@@ -887,41 +887,41 @@ void dance_4_reset(qk_tap_dance_state_t *state, void *user_data);
887
887
888
888
void on_dance_4 (qk_tap_dance_state_t * state , void * user_data ) {
889
889
if (state -> count == 3 ) {
890
- tap_code16 (LGUI (KC_PGDOWN ));
891
- tap_code16 (LGUI (KC_PGDOWN ));
892
- tap_code16 (LGUI (KC_PGDOWN ));
890
+ tap_code16 (LGUI (KC_PAGE_DOWN ));
891
+ tap_code16 (LGUI (KC_PAGE_DOWN ));
892
+ tap_code16 (LGUI (KC_PAGE_DOWN ));
893
893
}
894
894
if (state -> count > 3 ) {
895
- tap_code16 (LGUI (KC_PGDOWN ));
895
+ tap_code16 (LGUI (KC_PAGE_DOWN ));
896
896
}
897
897
}
898
898
899
899
void dance_4_finished (qk_tap_dance_state_t * state , void * user_data ) {
900
900
dance_state [4 ].step = dance_step (state );
901
901
switch (dance_state [4 ].step ) {
902
902
case SINGLE_TAP :
903
- register_code16 (LGUI (KC_PGDOWN ));
903
+ register_code16 (LGUI (KC_PAGE_DOWN ));
904
904
break ;
905
905
case DOUBLE_TAP :
906
- register_code16 (LGUI (LSFT (KC_PGDOWN )));
906
+ register_code16 (LGUI (LSFT (KC_PAGE_DOWN )));
907
907
break ;
908
908
case DOUBLE_SINGLE_TAP :
909
- tap_code16 (LGUI (KC_PGDOWN ));
910
- register_code16 (LGUI (KC_PGDOWN ));
909
+ tap_code16 (LGUI (KC_PAGE_DOWN ));
910
+ register_code16 (LGUI (KC_PAGE_DOWN ));
911
911
}
912
912
}
913
913
914
914
void dance_4_reset (qk_tap_dance_state_t * state , void * user_data ) {
915
915
wait_ms (10 );
916
916
switch (dance_state [4 ].step ) {
917
917
case SINGLE_TAP :
918
- unregister_code16 (LGUI (KC_PGDOWN ));
918
+ unregister_code16 (LGUI (KC_PAGE_DOWN ));
919
919
break ;
920
920
case DOUBLE_TAP :
921
- unregister_code16 (LGUI (LSFT (KC_PGDOWN )));
921
+ unregister_code16 (LGUI (LSFT (KC_PAGE_DOWN )));
922
922
break ;
923
923
case DOUBLE_SINGLE_TAP :
924
- unregister_code16 (LGUI (KC_PGDOWN ));
924
+ unregister_code16 (LGUI (KC_PAGE_DOWN ));
925
925
break ;
926
926
}
927
927
dance_state [4 ].step = 0 ;
0 commit comments