[Keymap] updating ninjonas userspace (#6903)

* [refactor] updating ninjonas layout blocks and standardized LOWER & ADJUST

* [feat] added new macro M_TERM to open MacOS terminal app

* [feat] introducing mod-tap functionality on keymap

* [fix] fixing oled turning on when it feels like it. thanks @drashna for helping

* [feat] updating OLED to rotate logo 180 degrees

* [feat] updating keymaps to reflect VSCode frequent habits

* [refactor] converting crkbd modifier keys to layer blocks

* [fix(#6903)] converting _delay_ms to wait_ms on launching terminal macro

4 files changed, 29 insertions, 29 deletions

diff --git a/keyboards/crkbd/keymaps/ninjonas/keymap.c b/keyboards/crkbd/keymaps/ninjonas/keymap.c
index 21f83cc78e..57164441b6 100644
--- a/keyboards/crkbd/keymaps/ninjonas/keymap.c
+++ b/keyboards/crkbd/keymaps/ninjonas/keymap.c
@@ -10,7 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+-------|      |--------+--------+--------+--------+--------+-------|
      _____________________QWERTY_L3______________________,       _____________________QWERTY_R3______________________,
   //|--------+--------+--------+--------+--------+-------|      |--------+--------+--------+--------+--------+-------|
-                                    T_GUI, KC_LCTL,LT_RAI,       LT_LOW,KC_BSPC,KC_DEL
+                                ________MOD_LEFT_________,       ________MOD_RIGHT________
                                  //`---------------------'      `---------------------'
   ),
 
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+-------|      |--------+--------+--------+--------+--------+-------|
      _____________________DVORAK_L3______________________,       _____________________DVORAK_R3______________________,
   //|--------+--------+--------+--------+--------+-------|      |--------+--------+--------+--------+--------+-------|
-                                    T_GUI, KC_LCTL,LT_RAI,       LT_LOW,KC_BSPC,KC_DEL
+                                ________MOD_LEFT_________,       ________MOD_RIGHT________
                                  //`---------------------'      `---------------------'
   ),
 
@@ -34,17 +34,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+-------|      |--------+--------+--------+--------+--------+-------|
      _____________________COLEMAK_L3_____________________,       _____________________COLEMAK_R3_____________________,
   //|--------+--------+--------+--------+--------+-------|      |--------+--------+--------+--------+--------+-------|
-                                    T_GUI, KC_LCTL,LT_RAI,       LT_LOW,KC_BSPC,KC_DEL
+                                ________MOD_LEFT_________,       ________MOD_RIGHT________
                                  //`---------------------'      `---------------------'
   ),
 
   [_LOWER] = LAYOUT_wrapper(
   //,----------------------------------------------------.      ,----------------------------------------------------.
-      M_XXX2,  M_XXX3, _________MEDIA_1_________,  K_CSCN,       _______________NAV_1______________,  XXXXXXX, K_MDSH,
+     _____________________LOWER_L1_______________________,       _____________________LOWER_R1_______________________,
   //|--------+--------+--------+--------+--------+-------|      |--------+--------+--------+--------+--------+-------|
-      M_XXX4,  M_XXX5, _________MEDIA_2_________, XXXXXXX,       _______________NAV_2______________,   K_LOCK, XXXXXXX,
+     _____________________LOWER_L2_______________________,       _____________________LOWER_R2_______________________,
   //|--------+--------+--------+--------+--------+-------|      |--------+--------+--------+--------+--------+-------|
-     KC_LSFT,  M_SHFT, _________MEDIA_3_________,  T_LBRC,         T_RBRC,    KC_M, XXXXXXX,  M_CODE,  M_XXX1, M_PYNV,
+     _____________________LOWER_L3_______________________,       _____________________LOWER_R3_______________________,
   //|--------+--------+--------+--------+--------+-------|      |--------+--------+--------+--------+--------+-------|
                                     _______,_______,_______,     _______,_______,_______
                                  //`---------------------'      `---------------------'
@@ -64,11 +64,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_ADJUST] = LAYOUT_wrapper( \
   //,----------------------------------------------------.      ,----------------------------------------------------.
-       M_MAKE, EEP_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,       RGB_TOG, XXXXXXX, XXXXXXX, COLEMAK,  DVORAK, QWERTY,
+     _____________________ADJUST_L1______________________,       _____________________ADJUST_R1______________________,
   //|--------+--------+--------+--------+--------+-------|      |--------+--------+--------+--------+--------+-------|
-       M_VRSN,  M_MALL, RGB_SPI, RGB_SAI, RGB_HUI, RGB_VAI,       XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+     _____________________ADJUST_L2______________________,       _____________________ADJUST_R2______________________,
   //|--------+--------+--------+--------+--------+-------|      |--------+--------+--------+--------+--------+-------|
-       M_FLSH, XXXXXXX, RGB_SPD, RGB_SAD, RGB_HUD, RGB_VAD,       RGB_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+     _____________________ADJUST_L3______________________,       _____________________ADJUST_R3______________________,
   //|--------+--------+--------+--------+--------+-------|      |--------+--------+--------+--------+--------+-------|
                                     _______,_______,_______,     _______,_______,_______
                                  //`---------------------'      `---------------------'
diff --git a/keyboards/hotdox/keymaps/ninjonas/keymap.c b/keyboards/hotdox/keymaps/ninjonas/keymap.c
index 7a505b4e1b..eea86200c7 100644
--- a/keyboards/hotdox/keymaps/ninjonas/keymap.c
+++ b/keyboards/hotdox/keymaps/ninjonas/keymap.c
@@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                 KC_LEFT, KC_RGHT,
                 KC_PGUP,
                 KC_PGDN,
-                KC_DEL,  LT_LOW
+                MT_DEL,  LT_LOW
     ),
 
 /* DVORAK
@@ -108,7 +108,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                 KC_LEFT, KC_RGHT,
                 KC_PGUP,
                 KC_PGDN,
-                KC_DEL,  LT_LOW
+                MT_DEL,  LT_LOW
     ),
 
 /* COLEMAK
@@ -155,7 +155,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                 KC_LEFT, KC_RGHT,
                 KC_PGUP,
                 KC_PGDN,
-                KC_DEL,  LT_LOW
+                MT_DEL,  LT_LOW
     ),
 
 /* LOWER
diff --git a/keyboards/lily58/keymaps/ninjonas/keymap.c b/keyboards/lily58/keymaps/ninjonas/keymap.c
index 6c6a41b3b7..0ed197c141 100644
--- a/keyboards/lily58/keymaps/ninjonas/keymap.c
+++ b/keyboards/lily58/keymaps/ninjonas/keymap.c
@@ -100,9 +100,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [_LOWER] = LAYOUT_wrapper( \
 	_____________________FUNC_LEFT______________________,                     _____________________FUNC_RIGHT_____________________, \
-	 M_XXX2,  M_XXX3, _________MEDIA_1_________, _______,                     _______________NAV_1______________, _______,  K_MDSH, \
-	 M_XXX4,  M_XXX5, _________MEDIA_2_________, _______,                     _______________NAV_2______________,  K_LOCK, _______, \
-	_______,  M_SHFT, _________MEDIA_3_________, _______, _______,   _______, _______,    KC_M, _______, _______,  M_XXX1,  M_PYNV, \
+	_____________________LOWER_L1_______________________,                     _____________________LOWER_R1_______________________, \
+	_____________________LOWER_L2_______________________,                     _____________________LOWER_R2_______________________, \
+	_____________________LOWER_L3_______________________, _______,   _______, _____________________LOWER_R3_______________________, \
 	                           __________________________________,   _______, _______, M_CODE,  _______ \
 	),
 
@@ -121,7 +121,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                   `----------------------------'           '------''--------------------'
  */
 [_RAISE] = LAYOUT_wrapper( \
-  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   K_CSCN, XXXXXXX,                        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
+  XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
   XXXXXXX,  XXXXXXX, _____________MOUSE_1______________,                        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
   XXXXXXX,  XXXXXXX, _____________MOUSE_2______________,                        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
   XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,\
@@ -130,9 +130,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 /* ADJUST
  * ,------------------------------------------.                    ,-----------------------------------------.
- * |EEP_RST|      |      |      |      |      |                    |      |      |      |COLMAK|DVORAK|QWERTY|
+ * |       |      |      |      |      |      |                    |      |      |      |      |      |      |
  * |-------+------+------+------+------+------|                    |------+------+------+------+------+------|
- * |M_MAKE |      |      |      |      |      |                    |      |      |      |      |      |      |
+ * |M_MAKE |EEPRST|      |      |      |      |                    |      |      |      |COLMAK|DVORAK|QWERTY|
  * |-------+------+------+------+------+------|                    |------+------+------+------+------+------|
  * |M_VRSN |M_MALL|      |      |      |      |-------.    ,-------|      |      |      |      |      |      |
  * |-------+------+------+------+------+------|       |    |       |------+------+------+------+------+------|
@@ -143,10 +143,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                    `----------------------------'           '------''--------------------'
  */
 [_ADJUST] = LAYOUT_wrapper( \
-  EEP_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                        XXXXXXX, XXXXXXX, XXXXXXX, COLEMAK,  DVORAK,  QWERTY, \
-  M_MAKE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
-  M_VRSN, M_MALL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
-  M_FLSH, 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, \
+  _____________________ADJUST_L1______________________,                        _____________________ADJUST_R1______________________, \
+  _____________________ADJUST_L2______________________,                        _____________________ADJUST_R2______________________, \
+  _____________________ADJUST_L3______________________, XXXXXXX,      XXXXXXX, _____________________ADJUST_R3______________________,\
+                             __________________________________,      __________________________________ \
   ),
 };
\ No newline at end of file
diff --git a/keyboards/pinky/3/keymaps/ninjonas/keymap.c b/keyboards/pinky/3/keymaps/ninjonas/keymap.c
index b7d9f2fa75..2b93c5aa8e 100644
--- a/keyboards/pinky/3/keymaps/ninjonas/keymap.c
+++ b/keyboards/pinky/3/keymaps/ninjonas/keymap.c
@@ -61,11 +61,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_LOWER] = LAYOUT_wrapper(
   //,---------------------------------------------------------------------.  ,---------------------------------------------------------------------.
-       M_XXX2,   M_XXX3,  _________MEDIA_1_________,    XXXXXXX,   K_CSCN,     XXXXXXX, _______________NAV_1______________,      XXXXXXX,  K_MDSH,
+            _____________________LOWER_L1_______________________,   K_CSCN,     XXXXXXX, _____________________LOWER_R1_______________________,
   //|---------+---------+---------+---------+---------+---------+---------|  |---------+---------+---------+---------+---------+---------+---------|
-       M_XXX4,   M_XXX5,  _________MEDIA_2_________,    XXXXXXX,  XXXXXXX,     XXXXXXX, _______________NAV_2______________,       K_LOCK,  XXXXXXX,
+            _____________________LOWER_L2_______________________,  XXXXXXX,     XXXXXXX, _____________________LOWER_R2_______________________,
   //|---------+---------+---------+---------+---------+---------+---------|  |---------+---------+---------+---------+---------+---------+---------|
-       XXXXXXX,   M_SHFT,  _________MEDIA_3_________,    XXXXXXX,  _______,     _______,  XXXXXXX,     KC_M,  XXXXXXX,  XXXXXXX,   M_XXX1,   M_PYNV,
+            _____________________LOWER_L3_______________________,  _______,     _______, _____________________LOWER_R3_______________________,
   //|---------+---------+---------+---------+---------+---------+---------|  |---------+---------+---------+---------+---------+---------+---------|
                                         __________________________________,     _______,  _______,   M_CODE,  _______
                                 //`---------------------------------------'  `---------------------------------------'
@@ -85,11 +85,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_ADJUST] = LAYOUT_wrapper(
   //,---------------------------------------------------------------------.  ,---------------------------------------------------------------------.
-        M_MAKE,  EEP_RST,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,     XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  COLEMAK,   DVORAK,   QWERTY,
+            _____________________ADJUST_L1______________________,  XXXXXXX,     XXXXXXX,  _____________________ADJUST_R1______________________,
   //|---------+---------+---------+---------+---------+---------+---------|  |---------+---------+---------+---------+---------+---------+---------|
-        M_VRSN,   M_MALL,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,     XXXXXXX,  _____________________XXXXXXX________________________,
+            _____________________ADJUST_L2______________________,  XXXXXXX,     XXXXXXX,  _____________________ADJUST_R2______________________,
   //|---------+---------+---------+---------+---------+---------+---------|  |---------+---------+---------+---------+---------+---------+---------|
-        M_FLSH,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  _______,     _______,  _____________________XXXXXXX________________________,
+            _____________________ADJUST_L3______________________,  _______,     _______,  _____________________ADJUST_R3______________________,
   //|---------+---------+---------+---------+---------+---------+---------|  |---------+---------+---------+---------+---------+---------+---------|
                                         __________________________________,     __________________________________
                                 //`---------------------------------------'  `---------------------------------------'