Danielo515/redox (#8232)

* feat(build): added script for compiling with docker easily

* chore: bring my own build with docker to master

* chore: delete a file that does not make sense anymore

* feat: first redox for danielo

* chore: basic compatibility between redox and my space

* refactor: removed some old stuff

* feat: added go coding symbols

* feat: name control_k and alt_j

* chore: reduce combo term

* feat: improved first layer of redox

* feat: add configurations to the redox

* feat: make alt tab more portable

* feat: small improvements to redox layout

* feat: added leader

* refactor: move leader defs to my userspace config

* chore: movement modified

* feat: more predefined keys and a a new combo

* feat: redox alt tab functionality

* refactor: move alt_tab processing to a separate file

* refactor: early return

* refactor: move process record to a separate file

* format leader function

* chore: backspace on digits layer

* feat: add extra combo

* feat: added more combos

* implement guard proposed by @drashna

Co-Authored-By: Drashna Jaelre <drashna@live.com>

* chore: include @drashna placeholder suggestion

Co-Authored-By: Drashna Jaelre <drashna@live.com>

Co-authored-by: Drashna Jaelre <drashna@live.com>

16 files changed, 609 insertions, 481 deletions

diff --git a/keyboards/ergodox_ez/keymaps/danielo515/config.h b/keyboards/ergodox_ez/keymaps/danielo515/config.h
index 6a3d37f1c6..8982e76536 100644
--- a/keyboards/ergodox_ez/keymaps/danielo515/config.h
+++ b/keyboards/ergodox_ez/keymaps/danielo515/config.h
@@ -16,10 +16,6 @@
 
 #undef MOUSEKEY_WHEEL_TIME_TO_MAX
 #define MOUSEKEY_WHEEL_TIME_TO_MAX 60
-// Timeout settings for leader key
-#undef  LEADER_TIMEOUT
-#define LEADER_TIMEOUT 350
-#define LEADER_PER_KEY_TIMING
 
 #undef DEBOUNCE
 #define DEBOUNCE 45
diff --git a/keyboards/ergodox_ez/keymaps/danielo515/keymap.c b/keyboards/ergodox_ez/keymaps/danielo515/keymap.c
index 538eab0163..ee8c321352 100644
--- a/keyboards/ergodox_ez/keymaps/danielo515/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/danielo515/keymap.c
@@ -36,9 +36,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     OSM(MOD_LSFT)       ,LT(2,KC_BSPACE)     ,OSM(MOD_LGUI)              ,
 
 
-    TO(1)               ,KC_6                ,KC_7                ,KC_8                ,TD_F9               ,LT(3,KC_0)          ,KC_DQUO             ,
+    TO(1)               ,KC_6                ,KC_7                ,KC_8                ,KC_9                ,LT(3,KC_0)          ,KC_DQUO             ,
     KC_UNDS             ,KC_Y                ,KC_U                ,KC_I                ,KC_O                ,KC_P                ,RSFT_T(KC_MINUS)            ,
-    HYPR_T(KC_H)        ,ALT_T(KC_J)         ,RCTL_T(KC_K)        ,LT(6,KC_L)          ,TD_CLN              ,GUI_T(KC_QUOTE)     ,
+    HYPR_H              ,ALT_J               ,CTL_K               ,LT(6,KC_L)          ,TD_CLN              ,CMD_QUOT            ,
     ALT_TAB             ,KC_N                ,MEH_T(KC_M)         ,KC_COMMA            ,KC_DOT              ,KC_SLASH            ,LT(4,KC_KP_ASTERISK),
     LT(4,KC_ENTER)      ,KC_DOWN             ,KC_LBRACKET         ,KC_RBRACKET         ,OSL(2)              ,
     KC_AUDIO_MUTE       ,KC_ESCAPE           ,
@@ -88,14 +88,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRANSPARENT     ,KC_TRANSPARENT     ,KC_TRANSPARENT     ,KC_LABK            ,KC_RABK            ,KC_TRANSPARENT     ,KC_TRANSPARENT     ,
     KC_TRANSPARENT     ,KC_AT              ,KC_TRANSPARENT     ,KC_EQL             ,F_ARROW            ,KC_GRAVE           ,
     KC_TRANSPARENT     ,KC_TRANSPARENT     ,KC_TRANSPARENT     ,KC_LBRACKET        ,KC_RBRACKET        ,KC_TRANSPARENT     ,KC_TRANSPARENT     ,
-    KC_TRANSPARENT     ,KC_TRANSPARENT     ,KC_TRANSPARENT     ,KC_TRANSPARENT     ,KC_TRANSPARENT     ,
+    KC_TRANSPARENT     ,KC_TRANSPARENT     ,KC_TRANSPARENT     ,IARROW             ,ARROW               ,
     KC_TRANSPARENT     ,KC_TRANSPARENT     ,
     KC_TRANSPARENT     ,
     // Right hand
     KC_TRANSPARENT     ,KC_TRANSPARENT     ,KC_TRANSPARENT     ,
     KC_TRANSPARENT     ,KC_TRANSPARENT     ,KC_TRANSPARENT     ,KC_TRANSPARENT     ,KC_TRANSPARENT     ,KC_TRANSPARENT     ,KC_TRANSPARENT     ,
     LALT(LSFT(KC_UP))  ,KC_HASH            ,KC_LCBR            ,KC_RCBR            ,KC_KP_ASTERISK     ,KC_PERC            ,KC_DLR             ,
-                        KC_AMPR            ,KC_LPRN            ,KC_RPRN            ,KC_CIRC            ,KC_KP_PLUS         ,KC_PIPE            ,
+                        KC_AMPR            ,KC_LPRN            ,KC_RPRN            ,CLN_EQ             ,KC_KP_PLUS         ,KC_PIPE            ,
     LALT(LSFT(KC_DOWN)),KC_EXLM            ,KC_TILD            ,KC_CIRC            ,ARROW              ,KC_BSLASH          ,KC_BSLASH          ,
     KC_TRANSPARENT     ,KC_TRANSPARENT     ,KC_TRANSPARENT     ,KC_TRANSPARENT     ,KC_TRANSPARENT     ,
     RESET              ,KC_TRANSPARENT     ,
@@ -316,3 +316,11 @@ void oneshot_mods_changed_user(uint8_t mods) {
 void oneshot_locked_mods_changed_user(uint8_t mods) {
     oneshot_mods_changed_user(mods);
 }
+
+//=============== alt_tab callbacks
+void alt_tab_activated(void){
+    layer_on(7); // activate motion layer
+}
+void alt_tab_deactivated(void){
+    layer_off(7); // activate motion layer
+}
diff --git a/keyboards/redox_w/keymaps/danielo515/config.h b/keyboards/redox_w/keymaps/danielo515/config.h
new file mode 100644
index 0000000000..43d4ff9cb2
--- /dev/null
+++ b/keyboards/redox_w/keymaps/danielo515/config.h
@@ -0,0 +1,6 @@
+#pragma once
+
+#define IGNORE_MOD_TAP_INTERRUPT
+#define TAPPING_TERM 200
+#undef ONESHOT_TIMEOUT
+#define ONESHOT_TIMEOUT 1500
diff --git a/keyboards/redox_w/keymaps/danielo515/keymap.c b/keyboards/redox_w/keymaps/danielo515/keymap.c
new file mode 100644
index 0000000000..2b37a4be33
--- /dev/null
+++ b/keyboards/redox_w/keymaps/danielo515/keymap.c
@@ -0,0 +1,159 @@
+#include QMK_KEYBOARD_H
+#include "danielo515.h"
+
+// Shortcut to make keymap more readable
+# define SYM_L   OSL(_SYMB)
+
+# define KC_ALAS LALT_T(KC_PAST) // alt or keypad *
+# define KC_CTPL LCTL_T(KC_BSLS) // <C-\>
+
+# define KC_NAGR LT(_NAV, KC_GRV)
+# define KC_NAMI LT(_NAV, KC_MINS)
+# define AD_ESC LT(_ADJUST, KC_ESC)
+# define NAV_SPC LT(_NAV, KC_SPACE)
+
+# define KC_ADPU LT(_ADJUST, KC_PGUP)
+# define WIN_LEFT WIN_TO_LEFT
+# define WIN_RIGHT WIN_TO_RIGHT
+# define COPY_CUT TD(COPY_CUT)
+# define TD_PASTE TD(PASTE_DANCE)
+# define CTL OSM(MOD_LCTL)
+# define ALT OSM(MOD_LALT)
+# define GUI OSM(MOD_LGUI)
+# define ENT_SYM LT(_SYMB, KC_ENT)
+# define __S LT(_S,KC_S)
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [_QWERTY] = LAYOUT(
+  //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
+	 KC_NAGR ,KC_1    ,KC_2    ,KC_3    ,KC_4    ,KC_5    ,                                            KC_6    ,KC_7    ,KC_8    ,KC_9    ,KC_0    ,KC_DQUO ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+	 KC_TAB  ,KC_Q    ,KC_W    ,KC_E    ,KC_R    ,KC_T    ,TD_PASTE,                          ALT_TAB ,KC_Y    ,KC_U    ,KC_I    ,KC_O    ,KC_P    ,SFT_MINS,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+	 SHIFT   ,KC_A    ,__S     ,FN_D    ,FN_F    ,KC_G    ,COPY_CUT,                          KC_UNDS ,HYPR_H  ,ALT_J   ,CTL_K   ,KC_L    ,TD_CLN  ,CMD_QUOT,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+	 KC_BSLS ,KC_Z    ,KC_X    ,KC_C    ,KC_V    ,KC_B    ,KC_DEL  ,KC_PGDN ,        ALT_TAB ,AD_ESC  ,KC_N    ,KC_M    ,KC_COMM ,KC_DOT  ,KC_SLSH ,KC_ASTR ,
+  //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
+	 CTL     ,ALT     ,KC_LEFT ,KC_RIGHT,     GUI     ,    SHIFT   ,KC_BSPC ,        KC_LEAD ,NAV_SPC ,    ENT_SYM,     KC_LBRC ,KC_RBRC ,KC_DOWN ,KC_UP
+  //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
+  ),
+
+  [_SYMB] = LAYOUT(
+  //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
+	 _______ ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,                                            KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,KC_F11  ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+	 _______ ,KC_EXLM ,KC_DLR   ,KC_LCBR ,KC_RCBR ,KC_PIPE ,_______ ,                         _______ ,KC_PSLS ,KC_P7 	,KC_P8 	 ,KC_P9   ,KC_PERC ,KC_PMNS ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+	 _______ ,KC_AT   ,KC_DLR  , KC_LPRN, KC_RPRN,KC_GRV  ,_______ ,                          _______ ,KC_PAST ,KC_P4 	,KC_P5   ,KC_P6   ,KC_PPLS ,KC_BSPC ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+	 _______ ,KC_PERC ,KC_CIRC ,KC_LBRC ,KC_RBRC ,KC_TILD ,_______ ,_______ ,        _______ ,_______ ,KC_COLN ,KC_P1 	,KC_P2   ,KC_P3   ,KC_PENT ,XXXXXXX ,
+  //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
+	 _______ ,_______ ,_______ ,_______ ,     _______ ,    _______ ,_______ ,        _______ ,_______ ,    KC_P0   ,     KC_P0   ,KC_PDOT ,KC_PENT ,XXXXXXX
+  //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
+  ),
+
+  [_NAV] = LAYOUT(
+  //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
+	 _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                                            _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+	 XXXXXXX ,XXXXXXX ,KC_MS_U ,XXXXXXX ,KC_WH_U ,XXXXXXX ,_______ ,                          _______ ,XXXXXXX,SFT_LEFT,SFT_RIGHT,XXXXXXX ,XXXXXXX ,XXXXXXX ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+	 XXXXXXX ,KC_MS_L ,KC_MS_D ,KC_MS_R ,KC_WH_D ,XXXXXXX ,_______ ,                          _______ ,KC_LEFT ,KC_DOWN ,KC_UP   ,KC_RIGHT,XXXXXXX ,XXXXXXX ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+	 XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ ,_______ ,        _______ ,XXXXXXX ,KC_HOME ,CTL_LEFT,CTL_RIGHT,XXXXXXX,XXXXXXX ,XXXXXXX ,
+  //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
+	 XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,     KC_BTN1 ,    KC_BTN2 ,_______ ,        _______ ,_______ ,    XXXXXXX ,     XXXXXXX ,XXXXXXX ,WIN_LEFT,WIN_RIGHT
+  //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
+  ),
+  [_ADJUST] = LAYOUT(
+  //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
+	 XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                                            XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+	 XXXXXXX ,RESET   ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                          XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,KC_F12  ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+	 XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                          XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+	 XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,        KC_MUTE ,_______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
+  //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
+	 XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,     XXXXXXX ,    XXXXXXX ,XXXXXXX ,        XXXXXXX ,XXXXXXX ,    XXXXXXX ,     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX
+  //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
+  ),
+[_F] = LAYOUT(
+  //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
+	 XXXXXXX ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,                                            KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,KC_F11  ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+	 XXXXXXX ,XXXXXXX ,ALL_WIN ,EXPOSE  ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                          XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+	 XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ ,XXXXXXX ,XXXXXXX ,                          XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+	 XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,        XXXXXXX ,_______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
+  //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
+	 XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,     XXXXXXX ,    XXXXXXX ,XXXXXXX ,        XXXXXXX ,_______ ,    XXXXXXX ,     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX
+  //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
+  ),
+  [_D] = LAYOUT(
+  //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
+	 XXXXXXX ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,                                            KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,KC_F12  ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+	 XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                          _______ ,KC_PSLS ,KC_P7 	,KC_P8 	 ,KC_P9   ,KC_PERC ,KC_PMNS ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+	 XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                          _______ ,KC_PAST ,KC_P4 	,KC_P5   ,KC_P6   ,KC_PPLS ,KC_BSPC ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+	 XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,        _______ ,_______ ,KC_COLN ,KC_P1 	,KC_P2   ,KC_P3   ,KC_PENT ,XXXXXXX ,
+  //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
+	 XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,     XXXXXXX ,    XXXXXXX ,_______ ,        _______ ,_______ ,    KC_P0   ,     KC_P0   ,KC_PDOT ,KC_PENT ,XXXXXXX
+  //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
+  ),
+	[_S] = LAYOUT(
+  //┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
+	 XXXXXXX ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,                                            KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,XXXXXXX ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+	 XXXXXXX ,XXXXXXX ,XXXXXXX ,KC_LT   ,KC_GT   ,XXXXXXX ,XXXXXXX ,                          XXXXXXX ,KC_HASH ,KC_LCBR ,KC_RCBR ,KC_ASTR ,KC_PERC ,KC_DLR ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+	 XXXXXXX ,XXXXXXX ,_______ ,KC_EQL  ,F_ARROW ,KC_GRAVE,XXXXXXX ,                          XXXXXXX ,KC_AMPR ,KC_LPRN ,KC_RPRN ,CLN_EQ  ,KC_PLUS ,KC_PIPE ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+	 XXXXXXX ,XXXXXXX ,XXXXXXX ,KC_CIRC ,KC_DLR  ,XXXXXXX ,XXXXXXX ,XXXXXXX ,        XXXXXXX ,XXXXXXX ,KC_EXLM ,KC_TILD ,KC_CIRC ,ARROW  ,KC_BSLASH,IARROW  ,
+  //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
+	 XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,     XXXXXXX ,    XXXXXXX ,_______ ,        XXXXXXX ,_______ ,    XXXXXXX ,     XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX
+  //└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
+  )
+
+};
+
+void alt_tab_activated(void){
+    layer_on(_NAV);
+};
+void alt_tab_deactivated(void){
+    layer_off(_NAV);
+};
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+	switch (get_highest_layer(state)) {
+		case _QWERTY:
+			set_led_off;
+			break;
+		case _SYMB:
+        case _D:
+			set_led_green;
+			break;
+		case _NAV:
+			set_led_blue;
+			break;
+		case _ADJUST:
+			set_led_red;
+			break;
+		case _S:
+			set_led_magenta;
+			break;
+		case _F:
+			set_led_white;
+			break;
+		default:
+			break;
+	}
+  return state;
+}
+
+
diff --git a/keyboards/redox_w/keymaps/danielo515/readme.md b/keyboards/redox_w/keymaps/danielo515/readme.md
new file mode 100644
index 0000000000..0db7072b80
--- /dev/null
+++ b/keyboards/redox_w/keymaps/danielo515/readme.md
@@ -0,0 +1,2 @@
+# Danielo keymap for Redox Wireless
+Most of the custom functionality is on my user-space `users/danielo515`
diff --git a/keyboards/redox_w/keymaps/danielo515/rules.mk b/keyboards/redox_w/keymaps/danielo515/rules.mk
new file mode 100644
index 0000000000..18f126693e
--- /dev/null
+++ b/keyboards/redox_w/keymaps/danielo515/rules.mk
@@ -0,0 +1,6 @@
+
+TAP_DANCE_ENABLE = yes # Enable the tap dance feature.
+COMBO_ENABLE = yes
+LEADER_ENABLE = yes
+CONSOLE_ENABLE = no
+LTO_ENABLE = yes # link time optimizations
diff --git a/users/danielo515/alt_tab.c b/users/danielo515/alt_tab.c
new file mode 100644
index 0000000000..1602ee6fb2
--- /dev/null
+++ b/users/danielo515/alt_tab.c
@@ -0,0 +1,38 @@
+#include "danielo515.h"
+#include "alt_tab.h"
+
+bool                       altPressed = false;
+__attribute__((weak)) void alt_tab_activated(void){};
+__attribute__((weak)) void alt_tab_deactivated(void){};
+extern bool                onMac;
+
+// =============== ALT_TAB single key handling
+bool process_alt_tab(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case ALT_TAB:
+            if (!record->event.pressed) {
+                return false;
+            }
+            if (altPressed) {
+                tap_code(KC_TAB);
+            } else {
+                altPressed = true;
+                onMac ? register_code(KC_LGUI) : register_code(KC_LALT);
+                tap_code(KC_TAB);
+                alt_tab_activated();
+            }
+        // avoid alt releasing if the key is of movement
+        case KC_RIGHT ... KC_UP:
+            if (altPressed) {
+                return true;  // yes QMK, do your stuff
+            }
+    }
+    // Reset sticky alt tab when any other key is pressed
+    if (altPressed) {
+        onMac ? unregister_code(KC_LGUI) : unregister_code(KC_LALT);
+        altPressed = false;
+        alt_tab_deactivated();
+        return false;
+    }
+    return true;
+};
diff --git a/users/danielo515/alt_tab.h b/users/danielo515/alt_tab.h
new file mode 100644
index 0000000000..f84350c298
--- /dev/null
+++ b/users/danielo515/alt_tab.h
@@ -0,0 +1,4 @@
+#pragma once
+#include "quantum.h"
+
+bool process_alt_tab(uint16_t keycode, keyrecord_t *record);
diff --git a/users/danielo515/combo.c b/users/danielo515/combo.c
index bf7d5f9a8a..1c84143772 100644
--- a/users/danielo515/combo.c
+++ b/users/danielo515/combo.c
@@ -1,21 +1,36 @@
 #include "combo.h"
+
 enum combos {
-  JK_ESC,
-  YU_COM,
-  UI_COM,
-  IO_COM,
-  OP_COM,
-  QW_COM
+    JK_ESC,
+    YU_COM,
+    UI_COM,
+    IO_COM,
+    QW_COM,
+    COM_SLS,
+    COM_DOT,
+    M_COMM,
+    N_M,
+    OP_COM,
 };
 
 const uint16_t PROGMEM ui_combo[] = {KC_U, KC_I, COMBO_END};
 const uint16_t PROGMEM jk_combo[] = {KC_J, KC_K, COMBO_END};
 const uint16_t PROGMEM yu_combo[] = {KC_Y, KC_U, COMBO_END};
 const uint16_t PROGMEM io_combo[] = {KC_I, KC_O, COMBO_END};
+const uint16_t PROGMEM qw_combo[] = {KC_Q, KC_W, COMBO_END};
+const uint16_t PROGMEM com_sls[] = {KC_COMMA, KC_SLSH, COMBO_END};
+const uint16_t PROGMEM com_dot[] = {KC_COMMA, KC_DOT, COMBO_END};
+const uint16_t PROGMEM m_comm[] = {KC_M,KC_COMMA,  COMBO_END};
+const uint16_t PROGMEM n_m[] = {KC_N, KC_M,COMBO_END};
 
 combo_t key_combos[COMBO_COUNT] = {
-  [JK_ESC] = COMBO(jk_combo, KC_ESC),
-  [YU_COM] = COMBO(yu_combo, KC_CIRC),
-  [UI_COM] = COMBO(ui_combo, KC_ESC),
-  [IO_COM] = COMBO(io_combo, KC_TILD)
+    [JK_ESC] = COMBO(jk_combo, KC_ESC),
+    [YU_COM] = COMBO(yu_combo, KC_CIRC),
+    [UI_COM] = COMBO(ui_combo, KC_DLR),
+    [IO_COM] = COMBO(io_combo, KC_TILD),
+    [QW_COM] = COMBO(qw_combo, KC_AT),
+    [COM_SLS] = COMBO(com_sls, KC_QUES),
+    [COM_DOT] = COMBO(com_dot, KC_QUES),
+    [M_COMM] = COMBO(m_comm, KC_ESC),
+    [N_M] = COMBO(n_m, KC_DLR),
 };
diff --git a/users/danielo515/config.h b/users/danielo515/config.h
index 65654388d2..fb2472645c 100644
--- a/users/danielo515/config.h
+++ b/users/danielo515/config.h
@@ -1,6 +1,10 @@
 #pragma once
 
 #if defined(COMBO_ENABLE)
-  #define COMBO_COUNT 4
-  #define COMBO_TERM  50
+  #define COMBO_COUNT 9
+  #define COMBO_TERM  40
 #endif // !COMBO_ENABLE
+// Timeout settings for leader key
+#undef  LEADER_TIMEOUT
+#define LEADER_TIMEOUT 350
+#define LEADER_PER_KEY_TIMING
diff --git a/users/danielo515/danielo515.c b/users/danielo515/danielo515.c
index f37eebb375..f083650279 100644
--- a/users/danielo515/danielo515.c
+++ b/users/danielo515/danielo515.c
@@ -1,373 +1,87 @@
 #include "danielo515.h"
 
 bool onMac = true;
-// Send control or GUI depending if we are on windows or mac
-bool CMD(uint16_t kc) {
-  if(onMac){ tap_code16(LGUI(kc)); } else { tap_code16(LCTL(kc)); }
-  return false;
-}
-
-//**************** Handle keys function *********************//
-bool altPressed = false;
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record)
-{
-  bool pressed = record->event.pressed;
-  if(pressed){
-    refresh_incremental_macros(keycode);
-    if(process_incremental_macro(keycode)){
-      return false;
-    }
-    if(is_macro(keycode)){
-      return handle_macro(keycode);
-    }
-   switch (keycode) {
-        case MAC_TGL:
-        onMac = !onMac;
-        onMac ? SEND_STRING("On mac") : SEND_STRING("Not on MAC");
-        return false;
-      }
-  }
 
-  switch (keycode)
-  {
-    case QWERTY:
-        if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-        PLAY_SONG(tone_qwerty);
-        #endif
-        layer_on(_QWERTY);
+//**************** LEADER *********************//
+#ifdef LEADER_ENABLE
+LEADER_EXTERNS();
+#    ifdef RGBLIGHT_ENABLE
+
+void leader_start() { rgblight_setrgb_range(5, 100, 199, 10, 15); };
+
+void leader_end() { rgblight_setrgb_range(200, 200, 255, 10, 15); };
+#    endif
+
+void matrix_scan_user(void) {
+    if (leading && leader_sequence_size > 0 && timer_elapsed(leader_time) > LEADER_TIMEOUT) {
+        leading = false;
+        SEQ_ONE_KEY(KC_T) { SEND_STRING("``" SS_TAP(X_LEFT)); }
+        // Triple ticks
+        SEQ_TWO_KEYS(KC_T, KC_T) { SEND_STRING("```" SS_TAP(X_ENTER) SS_TAP(X_ENTER) "```" SS_TAP(X_UP)); }
+        // ==== International spanish accent vowels ====
+        SEQ_ONE_KEY(KC_A) { SEND_STRING(SS_LALT("e") "a"); }
+        SEQ_ONE_KEY(KC_E) { SEND_STRING(SS_LALT("e") "e"); }
+        SEQ_ONE_KEY(KC_I) { SEND_STRING(SS_LALT("e") "i"); }
+        SEQ_ONE_KEY(KC_O) { SEND_STRING(SS_LALT("e") "o"); }
+        SEQ_ONE_KEY(KC_U) { SEND_STRING(SS_LALT("e") "u"); }
+        SEQ_ONE_KEY(KC_N) { SEND_STRING(SS_LALT("n") "n"); }
+        // ==== MACROS ===
+        SEQ_ONE_KEY(KC_G) { SEND_STRING(" | grep "); }
+        SEQ_ONE_KEY(KC_K) { onMac ? SEND_STRING(SS_LCTRL(" ")) : SEND_STRING(SS_LCTRL("f")); }
+        // vim delete all
+        SEQ_TWO_KEYS(KC_D, KC_G) {
+            if (onMac) {
+                SEND_STRING(SS_LGUI("a") SS_TAP(X_D));
+            } else {
+                SEND_STRING(SS_LCTRL("a") SS_TAP(X_D));
+            }
         }
-        return false;
-    case LOWER:
-        if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-        } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
+        // tripe delete!
+        SEQ_ONE_KEY(KC_BSPACE) { SEND_STRING(SS_TAP(X_BSPACE) SS_TAP(X_BSPACE) SS_TAP(X_BSPACE)); }
+        SEQ_TWO_KEYS(KC_P, KC_G) { SEND_STRING("ps -ef | grep "); }
+        SEQ_TWO_KEYS(KC_J, KC_A) { SEND_STRING("() => {}" SS_TAP(X_LEFT) SS_TAP(X_LEFT) SS_TAP(X_LEFT) SS_TAP(X_LEFT) SS_TAP(X_LEFT) SS_TAP(X_LEFT) SS_TAP(X_LEFT)); }
+        // this is a pain to type
+        SEQ_TWO_KEYS(KC_S, KC_S) { SEND_STRING("~/.ssh/ "); }
+        SEQ_TWO_KEYS(KC_F, KC_T) { SEND_STRING("feat():" SS_TAP(X_LEFT) SS_TAP(X_LEFT)); }
+        // ### LAYER CHANGE
+        SEQ_ONE_KEY(KC_1) { layer_on(1); }
+        // control enter, because yes
+        SEQ_ONE_KEY(KC_H) { SEND_STRING(SS_DOWN(X_LCTRL) SS_TAP(X_ENTER) SS_UP(X_LCTRL)); }
+        // paste all
+        SEQ_ONE_KEY(KC_P) {
+            if (onMac) {
+                SEND_STRING(SS_LGUI("a") SS_LGUI("v"));
+            } else {
+                SEND_STRING(SS_LCTRL("a") SS_LCTRL("v"));
+            }
         }
-        return false;
-    case RAISE:
-        if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-        } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
+        SEQ_THREE_KEYS(KC_M, KC_A, KC_C) {
+            onMac = true;
+#    ifdef RGBLIGHT_ENABLE
+            rgblight_setrgb(255, 255, 255);
+#    endif
         }
-        return false;
-    case ADJUST:
-    if (record->event.pressed) {
-        layer_on(_ADJUST);
-        } else {
-        layer_off(_ADJUST);
+        SEQ_THREE_KEYS(KC_W, KC_I, KC_N) {
+            onMac = false;
+#    ifdef RGBLIGHT_ENABLE
+            rgblight_setrgb(255, 255, 0);
+#    endif
         }
-        return false;
- // == Macros START ===
-  case ARROW:
-    if (record->event.pressed) SEND_STRING("->");
-    return false;
-  case F_ARROW:
-    if (record->event.pressed) SEND_STRING("=>");
-    return false;
-  case GREP:
-    if (record->event.pressed) SEND_STRING(" | grep "); return false;
- // == Macros END ===
- // == Multi Os START ===
-  case KC_HOME:// make the home behave the same on OSX
-    if (record->event.pressed && onMac) {
-        SEND_STRING(SS_LCTRL("a"));
-        return false;
-    }
-  case KC_END:// make the end behave the same on OSX
-    if (record->event.pressed && onMac) {
-        tap_code16(C(KC_E));
-        return false;
-    }
-  case AC_A:// Accent á