[Keymap] danielo515/redox-1 (#9935)

* chore: pulled the latest from master

Bring my redox layout from my latest redox branch
Bring my latest user stuff from my redox branch

* Update users/danielo515/config.h

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

* chore: small cleanup

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

1 files changed, 26 insertions, 18 deletions

diff --git a/users/danielo515/combo.c b/users/danielo515/combo.c
index 1c8414377..b33cb838b 100644
--- a/users/danielo515/combo.c
+++ b/users/danielo515/combo.c
@@ -6,31 +6,39 @@ enum combos {
     UI_COM,
     IO_COM,
     QW_COM,
-    COM_SLS,
+    DOT_SLS,
     COM_DOT,
     M_COMM,
     N_M,
     OP_COM,
+    M_CM_DOT,
 };
 
-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};
+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 dot_sls[]               = {KC_DOT, 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};
+const uint16_t PROGMEM o_p_combo[]             = {KC_O, KC_P, COMBO_END};
+const uint16_t PROGMEM m_cm_dot_combo[]        = {KC_M, KC_COMMA, KC_DOT, 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_DLR),
-    [IO_COM] = COMBO(io_combo, KC_TILD),
+    [JK_ESC]   = COMBO(jk_combo, KC_ESC),
+    [YU_COM]   = COMBO(yu_combo, KC_AMPR),
+    [UI_COM]   = COMBO(ui_combo, KC_CIRC),
+    [IO_COM]   = COMBO(io_combo, KC_TILD),
+    [DOT_SLS]  = COMBO(dot_sls, KC_EXLM),
+    [COM_DOT]  = COMBO(com_dot, KC_QUES),
+    [N_M]      = COMBO(n_m, KC_DLR),
+    [OP_COM]   = COMBO(o_p_combo, KC_HASH),
+    // m + , = {
+    [M_COMM]   = COMBO(m_comm, KC_LCBR),
+    // m + , + . = }
+    // [M_CM_DOT] = COMBO(m_cm_dot_combo, KC_RCBR),
+    // Right hand side combos
     [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),
 };