summaryrefslogtreecommitdiff
path: root/users/miles2go
diff options
context:
space:
mode:
Diffstat (limited to 'users/miles2go')
-rw-r--r--users/miles2go/babblePaste.h8
-rw-r--r--users/miles2go/babl_chromeos.c40
-rw-r--r--users/miles2go/babl_emacs.c60
-rw-r--r--users/miles2go/babl_kitty.c4
-rw-r--r--users/miles2go/babl_linux.c8
-rw-r--r--users/miles2go/babl_mac.c20
-rw-r--r--users/miles2go/babl_nano.c34
-rw-r--r--users/miles2go/babl_readmux.c4
-rw-r--r--users/miles2go/babl_vi.c20
-rw-r--r--users/miles2go/babl_windows.c40
-rw-r--r--users/miles2go/config.h17
-rw-r--r--users/miles2go/keymaps/handwired/ms_sculpt_mobile/config.h15
-rw-r--r--users/miles2go/milestogo.h6
13 files changed, 147 insertions, 129 deletions
diff --git a/users/miles2go/babblePaste.h b/users/miles2go/babblePaste.h
index 8fc233e8d4..c3073423c2 100644
--- a/users/miles2go/babblePaste.h
+++ b/users/miles2go/babblePaste.h
@@ -55,15 +55,15 @@ enum babble_modes {
/// Hacks to make it easier to create sendstring macros
//"outer" versions wrap text
-# define OMCTL(arg) SS_DOWN(X_LCTRL) arg SS_UP(X_LCTRL)
+# define OMCTL(arg) SS_DOWN(X_LCTL) arg SS_UP(X_LCTL)
# define OMGUI(arg) SS_DOWN(X_LGUI) arg SS_UP(X_LGUI)
# define OMALT(arg) SS_DOWN(X_LALT) arg SS_UP(X_LALT)
-# define OMSFT(...) SS_DOWN(X_LSHIFT) __VA_ARGS__ SS_UP(X_LSHIFT)
+# define OMSFT(...) SS_DOWN(X_LSFT) __VA_ARGS__ SS_UP(X_LSFT)
//"inner" versions wrap a key tap
-# define IMCTL(arg) SS_DOWN(X_LCTRL) SS_TAP(arg) SS_UP(X_LCTRL)
+# define IMCTL(arg) SS_DOWN(X_LCTL) SS_TAP(arg) SS_UP(X_LCTL)
# define IMGUI(arg) SS_DOWN(X_LGUI) SS_TAP(arg) SS_UP(X_LGUI)
# define IMALT(arg) SS_DOWN(X_LALT) SS_TAP(arg) SS_UP(X_LALT)
-# define IMSFT(arg) SS_DOWN(X_LSHIFT) SS_TAP(arg) SS_UP(X_LSHIFT)
+# define IMSFT(arg) SS_DOWN(X_LSFT) SS_TAP(arg) SS_UP(X_LSFT)
# define BABLM(ent, ...) \
if (ent == keycode) { \
diff --git a/users/miles2go/babl_chromeos.c b/users/miles2go/babl_chromeos.c
index fd644fc5c5..5e95e1424a 100644
--- a/users/miles2go/babl_chromeos.c
+++ b/users/miles2go/babl_chromeos.c
@@ -30,22 +30,22 @@ bool babblePaste_chromeos(uint16_t keycode) {
BABLM(BABL_GO_PARA_END, IMCTL(X_DOWN)); // untested
BABLM(BABL_PGDN, IMGUI(X_DOWN));
BABLM(BABL_PGUP, IMGUI(X_UP));
- BABLM(BABL_DEL_RIGHT_1C, IMALT(X_BSPACE));
- BABLM(BABL_DEL_LEFT_WORD, IMCTL(X_BSPACE));
- BABLM(BABL_DEL_RIGHT_WORD, OMSFT(IMCTL(X_RIGHT)) SS_TAP(X_BSPACE));
- BABLM(BABL_DEL_TO_LINE_END, OMSFT(IMGUI(X_LEFT)) SS_TAP(X_BSPACE));
- BABLM(BABL_DEL_TO_LINE_START, OMSFT(IMGUI(X_RIGHT)) SS_TAP(X_BSPACE));
+ BABLM(BABL_DEL_RIGHT_1C, IMALT(X_BACKSPACE));
+ BABLM(BABL_DEL_LEFT_WORD, IMCTL(X_BACKSPACE));
+ BABLM(BABL_DEL_RIGHT_WORD, OMSFT(IMCTL(X_RIGHT)) SS_TAP(X_BACKSPACE));
+ BABLM(BABL_DEL_TO_LINE_END, OMSFT(IMGUI(X_LEFT)) SS_TAP(X_BACKSPACE));
+ BABLM(BABL_DEL_TO_LINE_START, OMSFT(IMGUI(X_RIGHT)) SS_TAP(X_BACKSPACE));
BABLM(BABL_MODE, ("ChromeOS "));
# endif
# ifdef BABL_OSKEYS
- BABLM(BABL_UNDO, SS_LCTRL("z"));
+ BABLM(BABL_UNDO, SS_LCTL("z"));
BABLM(BABL_REDO, OMSFT(IMCTL(X_Z)));
- BABLM(BABL_CUT, SS_LCTRL("x"));
- BABLM(BABL_COPY, SS_LCTRL("c"));
- BABLM(BABL_PASTE, SS_LCTRL("v"));
- BABLM(BABL_SELECT_ALL, SS_LCTRL("a"));
- BABLM(BABL_FIND, SS_LCTRL("f"));
- BABLM(BABL_FIND_NEXT, SS_LCTRL("g"));
+ BABLM(BABL_CUT, SS_LCTL("x"));
+ BABLM(BABL_COPY, SS_LCTL("c"));
+ BABLM(BABL_PASTE, SS_LCTL("v"));
+ BABLM(BABL_SELECT_ALL, SS_LCTL("a"));
+ BABLM(BABL_FIND, SS_LCTL("f"));
+ BABLM(BABL_FIND_NEXT, SS_LCTL("g"));
BABLM(BABL_FIND_PREV, OMSFT(IMCTL(X_G)));
BABLM(BABL_WINDOW_NEW, IMCTL(X_N));
// BABLM( BABL_FIND_REPLACE, () ); // not part of Chrome
@@ -60,33 +60,33 @@ bool babblePaste_chromeos(uint16_t keycode) {
BABLM(BABL_SWITCH_KEYBOARD_LAYOUT, IMCTL(X_SPACE));
# endif
# ifdef BABL_BROWSER
- BABLM(BABL_BROWSER_NEW_TAB, SS_LCTRL("t"));
- BABLM(BABL_BROWSER_CLOSE_TAB, SS_LCTRL("w"));
+ BABLM(BABL_BROWSER_NEW_TAB, SS_LCTL("t"));
+ BABLM(BABL_BROWSER_CLOSE_TAB, SS_LCTL("w"));
BABLM(BABL_BROWSER_REOPEN_LAST_TAB, OMSFT(IMCTL(X_T)));
BABLM(BABL_BROWSER_NEXT_TAB, IMCTL(X_TAB));
BABLM(BABL_BROWSER_PREV_TAB, OMSFT(IMCTL(X_TAB)));
- BABLM(BABL_BROWSER_URL_BAR, SS_LCTRL("l"));
+ BABLM(BABL_BROWSER_URL_BAR, SS_LCTL("l"));
BABLM(BABL_BROWSER_FORWARD, IMALT(X_RIGHT));
BABLM(BABL_BROWSER_BACK, IMALT(X_LEFT));
;
- BABLM(BABL_BROWSER_FIND, SS_LCTRL("f"));
- BABLM(BABL_BROWSER_BOOKMARK, SS_LCTRL("d"));
+ BABLM(BABL_BROWSER_FIND, SS_LCTL("f"));
+ BABLM(BABL_BROWSER_BOOKMARK, SS_LCTL("d"));
BABLM(BABL_BROWSER_DEV_TOOLS, OMSFT(IMCTL(X_I)));
BABLM(BABL_BROWSER_RELOAD, OMSFT(IMCTL(X_R))); // hard reload w/o cache
BABLM(BABL_BROWSER_FULLSCREEN, SS_TAP(X_F4)); // untested
BABLM(BABL_BROWSER_ZOOM_IN, OMSFT(IMCTL(X_EQUAL))); // ctr+ +
BABLM(BABL_BROWSER_ZOOM_OUT, IMCTL(X_MINUS));
- BABLM(BABL_BROWSER_VIEWSRC, SS_LCTRL("u")); // Chrome or firefox
+ BABLM(BABL_BROWSER_VIEWSRC, SS_LCTL("u")); // Chrome or firefox
# endif
# ifdef BABL_APP
BABLM(BABL_APP_SAVE, SS_LCTL("s"));
//#ifdef BABL_APP_GOOGLE -- we're going to make an assumption.
BABLM(BABL_APP_CENTER_ALIGN, OMSFT(IMCTL(X_E)));
- BABLM(BABL_APP_SCROLL_ACTIVE_CELL, IMCTL(X_BSPACE));
+ BABLM(BABL_APP_SCROLL_ACTIVE_CELL, IMCTL(X_BACKSPACE));
BABLM(BABL_NEWLINE_IN_CELL, IMALT(X_ENTER));
BABLM(BABL_INSERT_COMMENT, OMALT(IMCTL(X_M)));
- BABLM(BABL_APP_CLEAR_FORMATTING, IMCTL(X_BSLASH));
+ BABLM(BABL_APP_CLEAR_FORMATTING, IMCTL(X_BACKSLASH));
BABLM(BABL_DELETE_ROW, IMALT(X_E) "d");
BABLM(BABL_INSERT_COL_LEFT, IMALT(X_I) "c"); // o for to the right.
BABLM(BABL_INSERT_ROW, IMALT(X_I) "w"); // r for above.
diff --git a/users/miles2go/babl_emacs.c b/users/miles2go/babl_emacs.c
index 87560b6eb8..aa6e03a5ad 100644
--- a/users/miles2go/babl_emacs.c
+++ b/users/miles2go/babl_emacs.c
@@ -24,41 +24,41 @@ bool babblePaste_emacs(uint16_t keycode) {
BABLM(BABL_GO_RIGHT_1C, SS_TAP(X_RIGHT));
BABLM(BABL_GO_LEFT_WORD, IMALT(X_B));
BABLM(BABL_GO_RIGHT_WORD, IMALT(X_F));
- BABLM(BABL_GO_START_LINE, SS_LCTRL("a"));
- BABLM(BABL_GO_END_LINE, SS_LCTRL("e"));
+ BABLM(BABL_GO_START_LINE, SS_LCTL("a"));
+ BABLM(BABL_GO_END_LINE, SS_LCTL("e"));
BABLM(BABL_GO_START_DOC, OMALT(IMSFT(X_COMMA)));
BABLM(BABL_GO_END_DOC, OMALT(IMSFT(X_DOT)));
- BABLM(BABL_GO_NEXT_LINE, SS_LCTRL("n"));
- BABLM(BABL_GO_PREV_LINE, SS_LCTRL("p"));
- BABLM(BABL_GO_PARA_START, OMALT(IMSFT(X_LBRACKET)));
- BABLM(BABL_GO_PARA_END, OMALT(IMSFT(X_RBRACKET)));
- BABLM(BABL_PGDN, SS_LCTRL("v"));
+ BABLM(BABL_GO_NEXT_LINE, SS_LCTL("n"));
+ BABLM(BABL_GO_PREV_LINE, SS_LCTL("p"));
+ BABLM(BABL_GO_PARA_START, OMALT(IMSFT(X_LEFT_BRACKET)));
+ BABLM(BABL_GO_PARA_END, OMALT(IMSFT(X_RIGHT_BRACKET)));
+ BABLM(BABL_PGDN, SS_LCTL("v"));
BABLM(BABL_PGUP, IMALT(X_V));
- BABLM(BABL_DEL_RIGHT_1C, SS_LCTRL("d"));
- BABLM(BABL_DEL_LEFT_WORD, IMCTL(X_BSPACE));
+ BABLM(BABL_DEL_RIGHT_1C, SS_LCTL("d"));
+ BABLM(BABL_DEL_LEFT_WORD, IMCTL(X_BACKSPACE));
BABLM(BABL_DEL_RIGHT_WORD, IMALT(X_D));
- BABLM(BABL_DEL_TO_LINE_END, SS_LCTRL("k"));
- BABLM(BABL_DEL_TO_LINE_START, SS_TAP(X_ESCAPE) "0" SS_LCTRL("k"));
+ BABLM(BABL_DEL_TO_LINE_END, SS_LCTL("k"));
+ BABLM(BABL_DEL_TO_LINE_START, SS_TAP(X_ESCAPE) "0" SS_LCTL("k"));
BABLM(BABL_MODE, "Emacs ");
# endif
# ifdef BABL_OSKEYS
- BABLM(BABL_UNDO, SS_LCTRL("x") "c");
- BABLM(BABL_REDO, SS_LCTRL("x") "c"); // arguably
- BABLM(BABL_CUT, SS_LCTRL("w"));
+ BABLM(BABL_UNDO, SS_LCTL("x") "c");
+ BABLM(BABL_REDO, SS_LCTL("x") "c"); // arguably
+ BABLM(BABL_CUT, SS_LCTL("w"));
BABLM(BABL_COPY, SS_LALT("w")); // really?
- BABLM(BABL_PASTE, SS_LCTRL("y"));
- BABLM(BABL_SELECT_ALL, SS_LCTRL("x") "h");
- BABLM(BABL_FIND, SS_LCTRL("s"));
- BABLM(BABL_FIND_NEXT, SS_LCTRL("s"));
- BABLM(BABL_FIND_PREV, SS_LCTRL("r"));
+ BABLM(BABL_PASTE, SS_LCTL("y"));
+ BABLM(BABL_SELECT_ALL, SS_LCTL("x") "h");
+ BABLM(BABL_FIND, SS_LCTL("s"));
+ BABLM(BABL_FIND_NEXT, SS_LCTL("s"));
+ BABLM(BABL_FIND_PREV, SS_LCTL("r"));
BABLM(BABL_FIND_REPLACE, OMALT(IMSFT(X_5)));
// BABLM( BABL_RUNAPP , //(SS_LALT("x") "shell") );// arguably
BABLM(BABL_RUNAPP, IMALT(X_X) "split-window" SS_TAP(X_ENTER)); // arguably
- BABLM(BABL_WINDOW_NEXT, SS_LCTRL("x") "o");
- BABLM(BABL_WINDOW_PREV, SS_LCTRL("x") "o"); // arguably
+ BABLM(BABL_WINDOW_NEXT, SS_LCTL("x") "o");
+ BABLM(BABL_WINDOW_PREV, SS_LCTL("x") "o"); // arguably
// BABLM( BABL_WINDOW_NEW, IMCTL(X_X)"n" ); //
- BABLM(BABL_CLOSE_APP, SS_LCTRL("x") "c");
- BABLM(BABL_HELP, SS_LCTRL("h") "a"); // start search in help
+ BABLM(BABL_CLOSE_APP, SS_LCTL("x") "c");
+ BABLM(BABL_HELP, SS_LCTL("h") "a"); // start search in help
// BABLM( BABL_LOCK, () ); // lock buffer? Too many options.
// BABLM( BABL_SCREENCAPTURE, () ); // requires plugin?
@@ -70,13 +70,13 @@ bool babblePaste_emacs(uint16_t keycode) {
# ifdef BABL_APP
BABLM(BABL_APP_SAVE, SS_LCTL("x") SS_LCTL("s"));
BABLM(BABL_APP_SET_MARK, IMCTL(X_SPACE));
- /// BABLM( BABL_APP_MULTI_SELECT, SS_LCTRL("x") "rt" ); // arguably
- BABLM(BABL_SPLIT_FRAME_VERT, SS_LCTRL("x") "3");
- BABLM(BABL_UNSPLIT_FRAME_VERT, SS_LCTRL("u") SS_LCTRL("x") "0");
- BABLM(BABL_SPLIT_FRAME_HORIZONTAL, SS_LCTRL("x") "2");
- BABLM(BABL_UNSPLIT_FRAME_HORIZONTAL, SS_LCTRL("u") SS_LCTRL("x") "0");
- BABLM(BABL_NEXT_FRAME, SS_LCTRL("x") "o");
- BABLM(BABL_PREV_FRAME, SS_LCTRL("u") "-1" SS_LCTRL("x") "o");
+ /// BABLM( BABL_APP_MULTI_SELECT, SS_LCTL("x") "rt" ); // arguably
+ BABLM(BABL_SPLIT_FRAME_VERT, SS_LCTL("x") "3");
+ BABLM(BABL_UNSPLIT_FRAME_VERT, SS_LCTL("u") SS_LCTL("x") "0");
+ BABLM(BABL_SPLIT_FRAME_HORIZONTAL, SS_LCTL("x") "2");
+ BABLM(BABL_UNSPLIT_FRAME_HORIZONTAL, SS_LCTL("u") SS_LCTL("x") "0");
+ BABLM(BABL_NEXT_FRAME, SS_LCTL("x") "o");
+ BABLM(BABL_PREV_FRAME, SS_LCTL("u") "-1" SS_LCTL("x") "o");
# endif
// Todo, ring bell, flash light, show user this isn't supported
diff --git a/users/miles2go/babl_kitty.c b/users/miles2go/babl_kitty.c
index 44fd87e5ed..2a4e0d2df4 100644
--- a/users/miles2go/babl_kitty.c
+++ b/users/miles2go/babl_kitty.c
@@ -42,7 +42,7 @@ bool babblePaste_kitty(uint16_t keycode) {
// BABLM(BABL_GO_NEXT_LINE, OMSFT(IMCTL(X_DOWN)));
// BABLM(BABL_GO_PREV_LINE, OMSFT(IMCTL(X_UP)));
// passthrough
- BABLM(BABL_PGDN, OMSFT(IMCTL(X_PGDOWN))); // kitty pagedown
+ BABLM(BABL_PGDN, OMSFT(IMCTL(X_PGDN))); // kitty pagedown
BABLM(BABL_PGUP, OMSFT(IMCTL(X_PGUP))); // kitty pageup
// passthrough to commanrd line/shell.
BABLM(BABL_DEL_RIGHT_1C, SS_LCTL("d"));
@@ -84,7 +84,7 @@ bool babblePaste_kitty(uint16_t keycode) {
// KITTY - missing close window.
// BABLM( BABL_HELP, (SS_TAP(X_F1)) ); // NA?
// BABLM(BABL_LOCK, OMCTL(IMALT(X_L))); // NA passthrough
- // BABLM(BABL_SCREENCAPTURE, IMSFT(X_PSCREEN)); // NA passthrough
+ // BABLM(BABL_SCREENCAPTURE, IMSFT(X_PRINT_SCREEN)); // NA passthrough
# endif
# ifdef BABL_BROWSER
diff --git a/users/miles2go/babl_linux.c b/users/miles2go/babl_linux.c
index aa822d9ba1..4d8e340b01 100644
--- a/users/miles2go/babl_linux.c
+++ b/users/miles2go/babl_linux.c
@@ -29,10 +29,10 @@ bool babblePaste_linux(uint16_t keycode) {
BABLM(BABL_GO_PREV_LINE, SS_TAP(X_UP));
BABLM(BABL_GO_PARA_START, IMCTL(X_UP));
BABLM(BABL_GO_PARA_END, IMCTL(X_DOWN));
- BABLM(BABL_PGDN, SS_TAP(X_PGDOWN));
+ BABLM(BABL_PGDN, SS_TAP(X_PGDN));
BABLM(BABL_PGUP, SS_TAP(X_PGUP));
BABLM(BABL_DEL_RIGHT_1C, SS_TAP(X_DELETE));
- BABLM(BABL_DEL_LEFT_WORD, IMCTL(X_BSPACE));
+ BABLM(BABL_DEL_LEFT_WORD, IMCTL(X_BACKSPACE));
BABLM(BABL_DEL_RIGHT_WORD, IMCTL(X_DELETE));
BABLM(BABL_DEL_TO_LINE_END, IMSFT(X_HOME) SS_TAP(X_DELETE));
BABLM(BABL_DEL_TO_LINE_START, IMSFT(X_END) SS_TAP(X_DELETE));
@@ -57,11 +57,11 @@ bool babblePaste_linux(uint16_t keycode) {
BABLM(BABL_SWITCH_APP_NEXT, IMALT(X_TAB));
BABLM(BABL_SWITCH_APP_LAST, OMSFT(IMALT(X_TAB)));
BABLM(BABL_WINDOW_NEXT, OMCTL(IMALT(X_PGUP))); // Gnome, sometimes
- BABLM(BABL_WINDOW_PREV, OMCTL(IMALT(X_PGDOWN)));
+ BABLM(BABL_WINDOW_PREV, OMCTL(IMALT(X_PGDN)));
BABLM(BABL_WINDOW_NEW, IMCTL(X_N));
// BABLM( BABL_HELP, (SS_TAP(X_F1)) ); // NA?
BABLM(BABL_LOCK, OMCTL(IMALT(X_L)));
- BABLM(BABL_SCREENCAPTURE, IMSFT(X_PSCREEN));
+ BABLM(BABL_SCREENCAPTURE, IMSFT(X_PRINT_SCREEN));
# endif
# ifdef BABL_BROWSER
BABLM(BABL_BROWSER_NEW_TAB, SS_LCTL("t"));
diff --git a/users/miles2go/babl_mac.c b/users/miles2go/babl_mac.c
index 9f769c582d..fd67172cc8 100644
--- a/users/miles2go/babl_mac.c
+++ b/users/miles2go/babl_mac.c
@@ -29,12 +29,12 @@ bool babblePaste_mac(uint16_t keycode) {
BABLM(BABL_GO_PARA_START, IMALT(X_UP));
BABLM(BABL_DEL_RIGHT_1C, SS_TAP(X_DELETE));
BABLM(BABL_GO_PARA_END, IMALT(X_DOWN));
- BABLM(BABL_PGDN, SS_TAP(X_PGDOWN));
+ BABLM(BABL_PGDN, SS_TAP(X_PGDN));
BABLM(BABL_PGUP, SS_TAP(X_PGUP));
- BABLM(BABL_DEL_LEFT_WORD, IMALT(X_BSPACE));
+ BABLM(BABL_DEL_LEFT_WORD, IMALT(X_BACKSPACE));
BABLM(BABL_DEL_RIGHT_WORD, IMALT(X_DELETE));
- BABLM(BABL_DEL_TO_LINE_END, OMSFT(IMGUI(X_RIGHT)) SS_TAP(X_BSPACE)); // this is more app agnostic than ctrl-k
- BABLM(BABL_DEL_TO_LINE_START, OMSFT(IMGUI(X_LEFT)) SS_TAP(X_BSPACE));
+ BABLM(BABL_DEL_TO_LINE_END, OMSFT(IMGUI(X_RIGHT)) SS_TAP(X_BACKSPACE)); // this is more app agnostic than ctrl-k
+ BABLM(BABL_DEL_TO_LINE_START, OMSFT(IMGUI(X_LEFT)) SS_TAP(X_BACKSPACE));
BABLM(BABL_MODE, "Mac ");
# endif
# ifdef BABL_OSKEYS
@@ -55,8 +55,8 @@ bool babblePaste_mac(uint16_t keycode) {
BABLM(BABL_SWITCH_APP_LAST, OMSFT(IMGUI(X_TAB)));
// Apps vary, but this is usually tab movement, same as B_NXTB
/*
- BABLM( BABL_WINDOW_NEXT, OMSFT(IMGUI(X_RBRACKET)) ); // GUI Grav isn't everywhere
- BABLM( BABL_WINDOW_PREV, OMSFT(IMGUI(X_LBRACKET)) );
+ BABLM( BABL_WINDOW_NEXT, OMSFT(IMGUI(X_RIGHT_BRACKET)) ); // GUI Grav isn't everywhere
+ BABLM( BABL_WINDOW_PREV, OMSFT(IMGUI(X_LEFT_BRACKET)) );
*/
BABLM(BABL_WINDOW_NEXT, IMGUI(X_GRAVE));
BABLM(BABL_WINDOW_PREV, OMSFT(IMGUI(X_GRAVE)));
@@ -80,7 +80,7 @@ bool babblePaste_mac(uint16_t keycode) {
BABLM(BABL_BROWSER_FIND, SS_LGUI("f"));
BABLM(BABL_BROWSER_BOOKMARK, SS_LGUI("d"));
BABLM(BABL_BROWSER_RELOAD, OMGUI(SS_LSFT("r"))); // hard reload w/o cache
- BABLM(BABL_BROWSER_FULLSCREEN, OMGUI(SS_LCTRL("p")));
+ BABLM(BABL_BROWSER_FULLSCREEN, OMGUI(SS_LCTL("p")));
BABLM(BABL_BROWSER_ZOOM_IN, IMGUI(X_KP_PLUS)); // ctr+ +
BABLM(BABL_BROWSER_ZOOM_OUT, IMGUI(X_KP_MINUS));
# ifdef BABL_BROWSER_CHROME
@@ -106,7 +106,7 @@ bool babblePaste_mac(uint16_t keycode) {
# ifdef BABL_APP_MSOFFICE
BABLM(BABL_APP_CENTER_ALIGN, IMGUI(X_E));
// BABLM( BABL_APP_CLEAR_FORMATTING, OMCTL(IMGUI(X_G)) ); // this isn't native. https://support.office.com/en-us/article/Clear-all-text-formatting-C094C4DA-7F09-4CEA-9A8D-C166949C9C80#OfficeVersion=macOS
- BABLM(BABL_APP_SCROLL_ACTIVE_CELL, IMCTL(X_BSPACE));
+ BABLM(BABL_APP_SCROLL_ACTIVE_CELL, IMCTL(X_BACKSPACE));
BABLM(BABL_NEWLINE_IN_CELL, IMALT(X_ENTER));
BABLM(BABL_INSERT_COMMENT, IMSFT(X_F2));
BABLM(BABL_INSERT_COL_LEFT, IMCTL(X_I));
@@ -118,10 +118,10 @@ bool babblePaste_mac(uint16_t keycode) {
# ifdef BABL_APP_GOOGLE
BABLM(BABL_APP_CENTER_ALIGN, OMSFT(IMGUI(X_E)));
- BABLM(BABL_APP_SCROLL_ACTIVE_CELL, IMCTL(X_BSPACE));
+ BABLM(BABL_APP_SCROLL_ACTIVE_CELL, IMCTL(X_BACKSPACE));
BABLM(BABL_NEWLINE_IN_CELL, IMALT(X_ENTER));
BABLM(BABL_INSERT_COMMENT, IMSFT(X_F2));
- BABLM(BABL_APP_CLEAR_FORMATTING, IMGUI(X_BSLASH));
+ BABLM(BABL_APP_CLEAR_FORMATTING, IMGUI(X_BACKSLASH));
BABLM(BABL_DELETE_ROW, OMCTL(IMGUI(X_G)));
BABLM(BABL_INSERT_COL_LEFT, OMALT(IMCTL(X_I)) "c"); // o for to the right.
BABLM(BABL_INSERT_ROW, OMALT(IMCTL(X_I)) "b"); // r for above.
diff --git a/users/miles2go/babl_nano.c b/users/miles2go/babl_nano.c
index ebbe9b2bc5..7b10f0d3cb 100644
--- a/users/miles2go/babl_nano.c
+++ b/users/miles2go/babl_nano.c
@@ -21,35 +21,35 @@ https://www.nano-editor.org/dist/latest/cheatsheet.html
bool babblePaste_nano(uint16_t keycode) {
# ifdef BABL_MOVE
- BABLM(BABL_GO_LEFT_1C, SS_LCTRL("b"));
+ BABLM(BABL_GO_LEFT_1C, SS_LCTL("b"));
BABLM(BABL_GO_RIGHT_1C, SS_LCTL("f"));
BABLM(BABL_GO_LEFT_WORD, IMCTL(X_LEFT));
BABLM(BABL_GO_RIGHT_WORD, IMCTL(X_RIGHT));
- BABLM(BABL_GO_START_LINE, SS_LCTRL("a"));
- BABLM(BABL_GO_END_LINE, SS_LCTRL("e"));
+ BABLM(BABL_GO_START_LINE, SS_LCTL("a"));
+ BABLM(BABL_GO_END_LINE, SS_LCTL("e"));
BABLM(BABL_GO_START_DOC, IMALT(X_BSLS));
BABLM(BABL_GO_END_DOC, IMALT(X_SLASH));
- BABLM(BABL_GO_NEXT_LINE, SS_LCTRL("n"));
- BABLM(BABL_GO_PREV_LINE, SS_LCTRL("p"));
+ BABLM(BABL_GO_NEXT_LINE, SS_LCTL("n"));
+ BABLM(BABL_GO_PREV_LINE, SS_LCTL("p"));
BABLM(BABL_GO_PARA_START, IMCTL(X_UP));
BABLM(BABL_GO_PARA_END, IMCTL(X_DOWN));
- BABLM(BABL_PGDN, SS_LCTRL("v"));
- BABLM(BABL_PGUP, SS_LCTRL("y"));
- BABLM(BABL_DEL_RIGHT_1C, SS_LCTRL("d"));
+ BABLM(BABL_PGDN, SS_LCTL("v"));
+ BABLM(BABL_PGUP, SS_LCTL("y"));
+ BABLM(BABL_DEL_RIGHT_1C, SS_LCTL("d"));
BABLM(BABL_DEL_LEFT_WORD, IMCTL(X_BSPC));
BABLM(BABL_DEL_RIGHT_WORD, IMCTL(X_DEL));
- // BABLM(BABL_DEL_TO_LINE_END, SS_LCTRL("k"));
- // BABLM(BABL_DEL_TO_LINE_START, SS_TAP(X_ESCAPE) "0" SS_LCTRL("k"));
+ // BABLM(BABL_DEL_TO_LINE_END, SS_LCTL("k"));
+ // BABLM(BABL_DEL_TO_LINE_START, SS_TAP(X_ESCAPE) "0" SS_LCTL("k"));
BABLM(BABL_MODE, "Nano ");
# endif
# ifdef BABL_OSKEYS
BABLM(BABL_UNDO, SS_LALT("u"));
BABLM(BABL_REDO, SS_LALT("e"));
- BABLM(BABL_CUT, SS_LCTRL("k")); // arguably b/c line based, not selection
+ BABLM(BABL_CUT, SS_LCTL("k")); // arguably b/c line based, not selection
BABLM(BABL_COPY, SS_LALT("6")); // arguably
- BABLM(BABL_PASTE, SS_LCTRL("u"));
- // BABLM(BABL_SELECT_ALL, SS_LCTRL("x") "h");
- BABLM(BABL_FIND, SS_LCTRL("w"));
+ BABLM(BABL_PASTE, SS_LCTL("u"));
+ // BABLM(BABL_SELECT_ALL, SS_LCTL("x") "h");
+ BABLM(BABL_FIND, SS_LCTL("w"));
BABLM(BABL_FIND_NEXT, SS_LALT("w"));
BABLM(BABL_FIND_PREV, SS_LALT("q"));
BABLM(BABL_FIND_REPLACE, SS_LALT("r"));
@@ -57,8 +57,8 @@ bool babblePaste_nano(uint16_t keycode) {
BABLM(BABL_WINDOW_NEXT, OMALT(IMSFT(X_DOT)));
BABLM(BABL_WINDOW_PREV, OMALT(IMSFT(X_COMMA)));
BABLM(BABL_WINDOW_NEW, IMCTL(X_R) IMALT(X_F)); //
- BABLM(BABL_CLOSE_APP, SS_LCTRL("x"));
- BABLM(BABL_HELP, SS_LCTRL("g"));
+ BABLM(BABL_CLOSE_APP, SS_LCTL("x"));
+ BABLM(BABL_HELP, SS_LCTL("g"));
// BABLM( BABL_LOCK, () ); // lock buffer? Too many options.
// BABLM( BABL_SCREENCAPTURE, () ); // requires plugin?
@@ -66,7 +66,7 @@ bool babblePaste_nano(uint16_t keycode) {
# endif
# ifdef BABL_APP
- BABLM(BABL_APP_SAVE, SS_LCTRL("s")); // save file blurs app & os. Move?
+ BABLM(BABL_APP_SAVE, SS_LCTL("s")); // save file blurs app & os. Move?
BABLM(BABL_APP_SET_MARK, SS_LALT("a"));
# endif
diff --git a/users/miles2go/babl_readmux.c b/users/miles2go/babl_readmux.c
index 8887d523bb..c303912c91 100644
--- a/users/miles2go/babl_readmux.c
+++ b/users/miles2go/babl_readmux.c
@@ -29,7 +29,7 @@ bool babblePaste_readmux(uint16_t keycode) {
// BABLM( BABL_GO_PARA_END, // undefinedBABLM( BABL_PGDN ,
BABLM(BABL_PGUP, SS_TAP(X_PGUP));
- BABLM(BABL_PGDN, SS_TAP(X_PGDOWN));
+ BABLM(BABL_PGDN, SS_TAP(X_PGDN));
BABLM(BABL_DEL_RIGHT_1C, SS_LCTL("d"));
BABLM(BABL_DEL_LEFT_WORD, SS_LCTL("w")); // meta-DEL instead?
BABLM(BABL_DEL_RIGHT_WORD, SS_LALT("d"));
@@ -76,7 +76,7 @@ bool babblePaste_readmux(uint16_t keycode) {
// This one closes the current pane.
BABLM(BABL_UNSPLIT_FRAME_HORIZONTAL, SS_LCTL("b") "x");
BABLM(BABL_NEXT_FRAME, SS_LCTL("b") "o");
- BABLM(BABL_PREV_FRAME, SS_LCTL("w") SS_TAP(X_SCOLON));
+ BABLM(BABL_PREV_FRAME, SS_LCTL("w") SS_TAP(X_SEMICOLON));
# endif
// Todo, ring bell, flash light, show user this isn't supported
diff --git a/users/miles2go/babl_vi.c b/users/miles2go/babl_vi.c
index f4b1d39d99..3209525af0 100644
--- a/users/miles2go/babl_vi.c
+++ b/users/miles2go/babl_vi.c
@@ -22,10 +22,10 @@ bool babblePaste_vi(uint16_t keycode) {
BABLM(BABL_GO_END_DOC, IMSFT(X_G));
BABLM(BABL_GO_NEXT_LINE, "j");
BABLM(BABL_GO_PREV_LINE, "k");
- BABLM(BABL_GO_PARA_START, IMSFT(X_LBRACKET));
- BABLM(BABL_GO_PARA_END, IMSFT(X_RBRACKET));
- BABLM(BABL_PGDN, SS_LCTRL("f"));
- BABLM(BABL_PGUP, SS_LCTRL("b"));
+ BABLM(BABL_GO_PARA_START, IMSFT(X_LEFT_BRACKET));
+ BABLM(BABL_GO_PARA_END, IMSFT(X_RIGHT_BRACKET));
+ BABLM(BABL_PGDN, SS_LCTL("f"));
+ BABLM(BABL_PGUP, SS_LCTL("b"));
BABLM(BABL_DEL_RIGHT_1C, "x");
BABLM(BABL_DEL_LEFT_WORD, "dge");
BABLM(BABL_DEL_RIGHT_WORD, "dw");
@@ -35,11 +35,11 @@ bool babblePaste_vi(uint16_t keycode) {
# endif
# ifdef BABL_OSKEYS
BABLM(BABL_UNDO, "h");
- BABLM(BABL_REDO, SS_LCTRL("r"));
+ BABLM(BABL_REDO, SS_LCTL("r"));
BABLM(BABL_CUT, "x");
BABLM(BABL_COPY, "y");
BABLM(BABL_PASTE, "p");
- BABLM(BABL_SELECT_ALL, IMSFT(X_SCOLON) SS_TAP(X_5) "y"); // wrong but helpful?
+ BABLM(BABL_SELECT_ALL, IMSFT(X_SEMICOLON) SS_TAP(X_5) "y"); // wrong but helpful?
BABLM(BABL_FIND, SS_TAP(X_SLASH));
BABLM(BABL_FIND_NEXT, "n");
BABLM(BABL_FIND_PREV, IMSFT(X_N));
@@ -47,8 +47,8 @@ bool babblePaste_vi(uint16_t keycode) {
BABLM(BABL_RUNAPP, ":split"); // requires VIM, is vsplit better?
BABLM(BABL_SWITCH_APP_NEXT, IMCTL(X_DOWN)); // Or Right?
BABLM(BABL_SWITCH_APP_NEXT, IMCTL(X_UP)); // or Left?
- BABLM(BABL_CLOSE_APP, IMCTL(X_SCOLON) "q");
- BABLM(BABL_HELP, SS_LSFT(SS_TAP(X_SCOLON)) "h"); // start search in help
+ BABLM(BABL_CLOSE_APP, IMCTL(X_SEMICOLON) "q");
+ BABLM(BABL_HELP, SS_LSFT(SS_TAP(X_SEMICOLON)) "h"); // start search in help
// BABLM( BABL_LOCK, () ); Perhaps VI is not an OS?
// BABLM( BABL_SCREENCAPTURE, () ); // capture a buffer?
# endif
@@ -65,8 +65,8 @@ bool babblePaste_vi(uint16_t keycode) {
BABLM(BABL_UNSPLIT_FRAME_VERT, SS_TAP(X_ESCAPE) ":hide"); // debatable.
BABLM(BABL_SPLIT_FRAME_HORIZONTAL, SS_TAP(X_ESCAPE) ":vsplit");
BABLM(BABL_UNSPLIT_FRAME_HORIZONTAL, SS_TAP(X_ESCAPE) ":hide");
- BABLM(BABL_NEXT_FRAME, SS_LCTRL("w") "w");
- BABLM(BABL_PREV_FRAME, SS_LCTRL("w") SS_LSFT("w"));
+ BABLM(BABL_NEXT_FRAME, SS_LCTL("w") "w");
+ BABLM(BABL_PREV_FRAME, SS_LCTL("w") SS_LSFT("w"));
# endif
# endif // app
// Todo, ring bell, flash light, show user this isn't supported
diff --git a/users/miles2go/babl_windows.c b/users/miles2go/babl_windows.c
index e9d8c23dac..e435d1a3af 100644
--- a/users/miles2go/babl_windows.c
+++ b/users/miles2go/babl_windows.c
@@ -31,10 +31,10 @@ bool babblePaste_win(uint16_t keycode) {
BABLM(BABL_GO_PREV_LINE, SS_TAP(X_UP));
BABLM(BABL_GO_PARA_START, IMCTL(X_UP));
BABLM(BABL_GO_PARA_END, IMCTL(X_DOWN));
- BABLM(BABL_PGDN, SS_TAP(X_PGDOWN));
+ BABLM(BABL_PGDN, SS_TAP(X_PGDN));
BABLM(BABL_PGUP, SS_TAP(X_PGUP));
BABLM(BABL_DEL_RIGHT_1C, SS_TAP(X_DELETE));
- BABLM(BABL_DEL_LEFT_WORD, IMCTL(X_BSPACE));
+ BABLM(BABL_DEL_LEFT_WORD, IMCTL(X_BACKSPACE));
BABLM(BABL_DEL_RIGHT_WORD, IMCTL(X_DELETE));
BABLM(BABL_DEL_TO_LINE_END, IMSFT(X_HOME) SS_TAP(X_DELETE));
BABLM(BABL_DEL_TO_LINE_START, IMSFT(X_END) SS_TAP(X_DELETE));
@@ -42,16 +42,16 @@ bool babblePaste_win(uint16_t keycode) {
# endif
# ifdef BABL_OSKEYS
- BABLM(BABL_UNDO, SS_LCTRL("z"));
- BABLM(BABL_REDO, SS_LCTRL("y"));
- BABLM(BABL_CUT, SS_LCTRL("x"));
- BABLM(BABL_COPY, SS_LCTRL("c"));
- BABLM(BABL_PASTE, SS_LCTRL("v"));
- BABLM(BABL_SELECT_ALL, SS_LCTRL("a"));
- BABLM(BABL_FIND, SS_LCTRL("f"));
+ BABLM(BABL_UNDO, SS_LCTL("z"));
+ BABLM(BABL_REDO, SS_LCTL("y"));
+ BABLM(BABL_CUT, SS_LCTL("x"));
+ BABLM(BABL_COPY, SS_LCTL("c"));
+ BABLM(BABL_PASTE, SS_LCTL("v"));
+ BABLM(BABL_SELECT_ALL, SS_LCTL("a"));
+ BABLM(BABL_FIND, SS_LCTL("f"));
BABLM(BABL_FIND_NEXT, SS_TAP(X_F3));
// BABLM( BABL_FIND_PREV, SS_TAP(X_F3) ); // doesn't have a standard one?
- BABLM(BABL_FIND_REPLACE, SS_LCTRL("h"));
+ BABLM(BABL_FIND_REPLACE, SS_LCTL("h"));
BABLM(BABL_RUNAPP, SS_LGUI("r"));
BABLM(BABL_SWITCH_APP_NEXT, IMALT(X_TAB));
BABLM(BABL_SWITCH_APP_LAST, OMSFT(IMALT(X_TAB)));
@@ -67,22 +67,22 @@ bool babblePaste_win(uint16_t keycode) {
# endif
# ifdef BABL_BROWSER
- BABLM(BABL_BROWSER_NEW_TAB, SS_LCTRL("t"));
- BABLM(BABL_BROWSER_CLOSE_TAB, SS_LCTRL("w"));
+ BABLM(BABL_BROWSER_NEW_TAB, SS_LCTL("t"));
+ BABLM(BABL_BROWSER_CLOSE_TAB, SS_LCTL("w"));
BABLM(BABL_BROWSER_REOPEN_LAST_TAB, OMSFT(IMCTL(X_T)));
BABLM(BABL_BROWSER_NEXT_TAB, IMCTL(X_TAB));
BABLM(BABL_BROWSER_PREV_TAB, OMSFT(IMCTL(X_TAB)));
- BABLM(BABL_BROWSER_URL_BAR, SS_LCTRL("l"));
+ BABLM(BABL_BROWSER_URL_BAR, SS_LCTL("l"));
BABLM(BABL_BROWSER_FORWARD, IMALT(X_RIGHT));
BABLM(BABL_BROWSER_BACK, OMSFT(IMALT(X_LEFT)));
;
- BABLM(BABL_BROWSER_FIND, SS_LCTRL("f"));
- BABLM(BABL_BROWSER_BOOKMARK, SS_LCTRL("d"));
+ BABLM(BABL_BROWSER_FIND, SS_LCTL("f"));
+ BABLM(BABL_BROWSER_BOOKMARK, SS_LCTL("d"));
# ifdef BABL_BROWSER_MS
BABLM(BABL_BROWSER_DEV_TOOLS, IMCTL(X_F12)); // EDGE
# else
- BABLM(BABL_BROWSER_DEV_TOOLS, SS_LCTRL("t")); // Chrome
- BABLM(BABL_BROWSER_VIEWSRC, SS_LCTRL("u")); // Chrome or firefox
+ BABLM(BABL_BROWSER_DEV_TOOLS, SS_LCTL("t")); // Chrome
+ BABLM(BABL_BROWSER_VIEWSRC, SS_LCTL("u")); // Chrome or firefox
# endif
// chrome
BABLM(BABL_BROWSER_RELOAD, IMCTL(X_F5)); // hard reload w/o cache
@@ -109,7 +109,7 @@ bool babblePaste_win(uint16_t keycode) {
# endif
BABLM(BABL_APP_CENTER_ALIGN, IMALT(X_H) "ac");
// BABLM( BABL_APP_CLEAR_FORMATTING, OMCTL(IMGUI(X_G)) ); // this isn't native. https://support.office.com/en-us/article/Clear-all-text-formatting-C094C4DA-7F09-4CEA-9A8D-C166949C9C80#OfficeVersion=macOS
- BABLM(BABL_APP_SCROLL_ACTIVE_CELL, IMCTL(X_BSPACE));
+ BABLM(BABL_APP_SCROLL_ACTIVE_CELL, IMCTL(X_BACKSPACE));
BABLM(BABL_NEWLINE_IN_CELL, IMALT(X_ENTER));
BABLM(BABL_INSERT_COMMENT, IMSFT(X_F2));
BABLM(BABL_INSERT_COL_LEFT, OMCTL(IMSFT(X_KP_PLUS)));
@@ -121,10 +121,10 @@ bool babblePaste_win(uint16_t keycode) {
# ifdef BABL_APP_GOOGLE
BABLM(BABL_APP_CENTER_ALIGN, OMSFT(IMCTL(X_E)));
- BABLM(BABL_APP_SCROLL_ACTIVE_CELL, IMCTL(X_BSPACE));
+ BABLM(BABL_APP_SCROLL_ACTIVE_CELL, IMCTL(X_BACKSPACE));
BABLM(BABL_NEWLINE_IN_CELL, IMALT(X_ENTER));
BABLM(BABL_INSERT_COMMENT, IMSFT(X_F2));
- BABLM(BABL_APP_CLEAR_FORMATTING, IMCTL(X_BSLASH));
+ BABLM(BABL_APP_CLEAR_FORMATTING, IMCTL(X_BACKSLASH));
BABLM(BABL_DELETE_ROW, IMALT(X_E) "d");
BABLM(BABL_INSERT_COL_LEFT, OMALT(IMCTL(X_I)) "c"); // o for to the right.
BABLM(BABL_INSERT_ROW, IMALT(IMCTL(X_I)) "w"); // r for above.
diff --git a/users/miles2go/config.h b/users/miles2go/config.h
index 2a1d6504d6..dad7acad10 100644
--- a/users/miles2go/config.h
+++ b/users/miles2go/config.h
@@ -2,7 +2,16 @@
#ifdef RGBLIGHT_ENABLE
#define RGBLIGHT_SLEEP
-#undef RGBLIGHT_ANIMATIONS
+#undef RGBLIGHT_EFFECT_RAINBOW_MOOD
+#undef RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#undef RGBLIGHT_EFFECT_SNAKE
+#undef RGBLIGHT_EFFECT_KNIGHT
+#undef RGBLIGHT_EFFECT_CHRISTMAS
+#undef RGBLIGHT_EFFECT_STATIC_GRADIENT
+#undef RGBLIGHT_EFFECT_RGB_TEST
+#undef RGBLIGHT_EFFECT_ALTERNATING
+#undef RGBLIGHT_EFFECT_TWINKLE
+
#define RGBLIGHT_EFFECT_BREATHING
#endif // RGBLIGHT_ENABLE
@@ -33,11 +42,11 @@
#define BABL_MODSWAP
#define BABL_MOVE // Uncomment to add basic cursor movement
#define BABL_OSKEYS // This adds Cut, paste, window movement and common OS shortcuts
-#define BABL_BROWSER // Browser shortcuts, with Chrome/Firefox as the default.
-// edit the appropriate OS config file to enable Safari, Edge, vimpirator &etc.
+#define BABL_BROWSER // Browser shortcuts, with Chrome/Firefox as the default.
+// edit the appropriate OS config file to enable Safari, Edge, vimpirator &etc.
#define BABL_APP // Application specific settings this has sub-options.
#define BABL_APP_CELLS // spreadsheets and tables
-#define BABL_APP_EDITOR // Fancy editor commands
+#define BABL_APP_EDITOR // Fancy editor commands
#define BABL_APP_WINDOWSPLITTING // splitting frames & windows
//All OSes
diff --git a/users/miles2go/keymaps/handwired/ms_sculpt_mobile/config.h b/users/miles2go/keymaps/handwired/ms_sculpt_mobile/config.h
index bedc08fc02..552e98ba2e 100644
--- a/users/miles2go/keymaps/handwired/ms_sculpt_mobile/config.h
+++ b/users/miles2go/keymaps/handwired/ms_sculpt_mobile/config.h
@@ -14,7 +14,7 @@
#define RGBLIGHT_COLOR_VI 0x00,0x90,0x00
#define RGBLIGHT_COLOR_READMUX 0x33,0xFF,0x33 // green screen
#define RGBLIGHT_COLOR_CHROMEOS 0xf4,0xc2,0xd // google yellows
-#endif
+#endif
#endif // bablpaste
@@ -29,8 +29,17 @@
#define RGBLIGHT_COLOR_LAYER_2 0xFF, 0x00, 0x00 // symbol
#define RGBLIGHT_COLOR_LAYER_3 0x00, 0xFF, 0xFF // move
#define RGBLIGHT_COLOR_LAYER_4 0xFF, 0x00, 0xFF // delmove
-#define RGBLIGHT_COLOR_LAYER_5 0x00, 0xFF, 0xFF
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_COLOR_LAYER_5 0x00, 0xFF, 0xFF
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
#define RGB_LIGHT_EFFECT_BREATHE_MAX 200
#define RGBLIGHT_RAINBOW_SWIRL_RANGE 127
#endif // rgblight
diff --git a/users/miles2go/milestogo.h b/users/miles2go/milestogo.h
index 3a99f6d2a8..c57c0cf7a2 100644
--- a/users/miles2go/milestogo.h
+++ b/users/miles2go/milestogo.h
@@ -36,8 +36,8 @@ enum userspace_layers { _QWERTY = 0, _CDH, _SYM, _MOV, _DMOV, _NUM };
/*
define modifiers here, since MOD_* doesn't seem to work for these
*/
-#define MODS_SHIFT_MASK (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))
-#define MODS_CTRL_MASK (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTRL))
+#define MODS_SHIFT_MASK (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT))
+#define MODS_CTRL_MASK (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL))
#define MODS_ALT_MASK (MOD_BIT(KC_LALT) | MOD_BIT(KC_RALT))
#define MODS_GUI_MASK (MOD_BIT(KC_LGUI) | MOD_BIT(KC_RGUI))
@@ -69,7 +69,7 @@ enum userspace_custom_keycodes {
#define QWERTY KC_QWERTY
#define COLEMAK KC_CDH
-#define KC_RESET RESET
+#define KC_RESET QK_BOOT
#if (!defined(LAYOUT) && defined(KEYMAP))
# define LAYOUT KEYMAP