2 files changed, 57 insertions, 11 deletions

diff --git a/keyboards/atreus/keymaps/xyverz/keymap.c b/keyboards/atreus/keymaps/xyverz/keymap.c
index 560a9d301..ed943eb66 100644
--- a/keyboards/atreus/keymaps/xyverz/keymap.c
+++ b/keyboards/atreus/keymaps/xyverz/keymap.c
@@ -15,14 +15,16 @@ extern keymap_config_t keymap_config;
 #define _DVORAK 0
 #define _QWERTY 1
 #define _COLEMAK 2
-#define _LOWER 3
-#define _RAISE 4
+#define _DVORMAC 3
+#define _LOWER 4
+#define _RAISE 5
 #define _ADJUST 16
 
 enum planck_keycodes {
   DVORAK = SAFE_RANGE,
   QWERTY,
   COLEMAK,
+  DVORMAC,
   LOWER,
   RAISE,
   BACKLIT
@@ -33,6 +35,8 @@ enum planck_keycodes {
 #define SFTSLSH SFT_T(KC_SLSH)
 #define SFTZED SFT_T(KC_Z)
 #define ALTENT ALT_T(KC_ENT)
+#define ESCTRL CTL_T(KC_ESC)
+#define TABALT ALT_T(KC_TAB)
 
 // Fillers to make layering more clear
 #define _______ KC_TRNS
@@ -53,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     {KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    XXXXXXX, KC_F,    KC_G,    KC_C,    KC_R,    KC_L   },
     {KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    XXXXXXX, KC_D,    KC_H,    KC_T,    KC_N,    KC_S   },
     {SFTSCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_LCTL, KC_B,    KC_M,    KC_W,    KC_V,    SFTZED },
-    {KC_ESC,  KC_TAB,  KC_LGUI, LOWER,   KC_BSPC, ALTENT,  KC_SPC,  RAISE,   KC_MINS, KC_SLSH, KC_BSLS}
+    {ESCTRL,  TABALT,  KC_LGUI, LOWER,   KC_BSPC, ALTENT,  KC_SPC,  RAISE,   KC_MINS, KC_SLSH, KC_BSLS}
   },
 
 /* QWERTY Layer
@@ -70,7 +74,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     {KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    XXXXXXX, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P   },
     {KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    XXXXXXX, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN},
     {SFTZED,  KC_X,    KC_C,    KC_V,    KC_B,    KC_LCTL, KC_N,    KC_M,    KC_COMM, KC_DOT,  SFTSLSH},
-    {KC_ESC,  KC_TAB,  KC_LGUI, LOWER,   KC_BSPC, ALTENT,  KC_SPC,  RAISE,   KC_MINS, KC_QUOT, KC_BSLS}
+    {ESCTRL,  TABALT,  KC_LGUI, LOWER,   KC_BSPC, ALTENT,  KC_SPC,  RAISE,   KC_MINS, KC_QUOT, KC_BSLS}
   },
 
 /* Colemak Layer
@@ -87,7 +91,24 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     {KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    XXXXXXX, KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN},
     {KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    XXXXXXX, KC_H,    KC_N,    KC_E,    KC_I,    KC_O   },
     {SFTZED,  KC_X,    KC_C,    KC_V,    KC_B,    KC_LCTL, KC_K,    KC_M,    KC_COMM, KC_DOT,  SFTSLSH},
-    {KC_ESC,  KC_TAB,  KC_LGUI, LOWER,   KC_BSPC, ALTENT,  KC_SPC,  RAISE,   KC_MINS, KC_QUOT, KC_BSLS}
+    {ESCTRL,  TABALT,  KC_LGUI, LOWER,   KC_BSPC, ALTENT,  KC_SPC,  RAISE,   KC_MINS, KC_QUOT, KC_BSLS}
+  },
+
+/* Dvorak Layer with Command key on left thumb instead of Control
+        ,----------------------------------.              ,----------------------------------.
+        |   '  |   ,  |   .  |   P  |   Y  |              |   F  |   G  |   C  |   R  |   L  |
+        |------+------+------+------+------|              |------+------+------+------+------|
+        |   A  |   O  |   E  |   U  |   I  |              |   D  |   H  |   T  |   N  |   S  |
+        |------+------+------+------+------|------.,------|------+------+------+------+------|
+        |SFT/ ;|   Q  |   J  |   K  |   X  | CMD  ||Alt / |   B  |   M  |   W  |   V  |SFT/ Z|
+        |------+------+------+------+------|      ||Enter |------+------+------+------+------|
+        |  Esc |  Tab |  GUI | LOWER| BkSp |------'`------|  Spc | RAISE|   -  |   /  |   \  |
+        `----------------------------------'              `----------------------------------' */
+  [_DVORMAC] = {
+    {KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    XXXXXXX, KC_F,    KC_G,    KC_C,    KC_R,    KC_L   },
+    {KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    XXXXXXX, KC_D,    KC_H,    KC_T,    KC_N,    KC_S   },
+    {SFTSCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_LGUI, KC_B,    KC_M,    KC_W,    KC_V,    SFTZED },
+    {ESCTRL,  TABALT,  KC_LGUI, LOWER,   KC_BSPC, ALTENT,  KC_SPC,  RAISE,   KC_MINS, KC_SLSH, KC_BSLS}
   },
 
 /* LOWER Layer
@@ -130,14 +151,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         |------+------+------+------+------|              |------+------+------+------+------|
         |  F11 |      |      |      |      |              |      | PrSc | ScLk | Paus | F12  |
         |------+------+------+------+------|------.,------|------+------+------+------+------|
-        |      |QWERTY|COLEMK|DVORAK|      |      ||      |      |      |      |      |      |
+        |      |QWERTY|COLEMK|DVORAK|DVORMC|      ||      |      |      |      |      |      |
         |------+------+------+------+------|      ||      |------+------+------+------+------|
         |      |      |      |      |      |------'`------|      |      |      |      | RESET|
         `----------------------------------'              `----------------------------------'*/
   [_ADJUST] = {
     {KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   XXXXXXX, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10 },
     {KC_F11,  _______, _______, _______, _______, XXXXXXX, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_F12 },
-    {_______, QWERTY,  COLEMAK, DVORAK,  _______, _______, _______, _______, _______, _______, _______},
+    {_______, QWERTY,  COLEMAK, DVORAK,  DVORMAC, _______, _______, _______, _______, _______, _______},
     {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET  }
   }
 
@@ -172,6 +193,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
           }
           return false;
           break;
+        case DVORMAC:
+          if (record->event.pressed) {
+            persistant_default_layer_set(1UL<<_DVORMAC);
+          }
+          return false;
+          break;
         case LOWER:
           if (record->event.pressed) {
             layer_on(_LOWER);
diff --git a/keyboards/atreus/keymaps/xyverz/readme.md b/keyboards/atreus/keymaps/xyverz/readme.md
index e7e217804..ec7d836c1 100644
--- a/keyboards/atreus/keymaps/xyverz/readme.md
+++ b/keyboards/atreus/keymaps/xyverz/readme.md
@@ -7,8 +7,15 @@ time, but still very much like the original Atreus keymap. I've managed to get t
 implemented (more like copied) the RAISE/LOWER/ADJUST layers. This is a work in progress, but I think I'm closer
 to a final go with this.
 
+I'm using MOD_TAP quite a bit in this keymap. On all layers, R4 pinky keys use mod-tap and are SHIFT when held
+and their normal keys when tapped. In addition, ESC and TAB are also set as Ctrl and ALT respectively when held,
+and Enter/ALT on the right thumb key for all layers.
+
 I've enabled persistent keymaps for Qwerty, Dvorak and Colemak layers, similar to the default Planck layouts.
 
+Recently added: Documentation, Formatting, and another Dvorak layer that has Command on the left thumb, instead of
+Control.
+
 ## Still to do:
 
  * Enjoy this revision; figure out new things later.
@@ -49,7 +56,19 @@ I've enabled persistent keymaps for Qwerty, Dvorak and Colemak layers, similar t
         |  Esc |  Tab |  GUI | LOWER| BkSp |------'`------|  Spc | RAISE|   -  |   '  |   \  |
         `----------------------------------'              `----------------------------------'
 
-### layer 3 : LOWER layer
+### Keymap 3: Dvorak for Mac layout
+
+        ,----------------------------------.              ,----------------------------------.
+        |   '  |   ,  |   .  |   P  |   Y  |              |   F  |   G  |   C  |   R  |   L  |
+        |------+------+------+------+------|              |------+------+------+------+------|
+        |   A  |   O  |   E  |   U  |   I  |              |   D  |   H  |   T  |   N  |   S  |
+        |------+------+------+------+------|------.,------|------+------+------+------+------|
+        |SFT/ ;|   Q  |   J  |   K  |   X  | CMD  ||Alt / |   B  |   M  |   W  |   V  |SFT/ Z|
+        |------+------+------+------+------|      ||Enter |------+------+------+------+------|
+        |  Esc |  Tab |  GUI | LOWER| BkSp |------'`------|  Spc | RAISE|   -  |   /  |   \  |
+        `----------------------------------'              `----------------------------------'
+
+### Keymap 4: LOWER layer
 
         ,----------------------------------.              ,----------------------------------.
         |   !  |   @  |   #  |   $  |   %  |              |   ^  |   &  |   *  |   (  |   )  |
@@ -62,7 +81,7 @@ I've enabled persistent keymaps for Qwerty, Dvorak and Colemak layers, similar t
         `----------------------------------'              `----------------------------------'
 
 
-### Keymap 4: RAISE layer
+### Keymap 5: RAISE layer
 
         ,----------------------------------.              ,----------------------------------.
         |   1  |   2  |   3  |   4  |   5  |              |   6  |   7  |   8  |   9  |   0  |
@@ -74,14 +93,14 @@ I've enabled persistent keymaps for Qwerty, Dvorak and Colemak layers, similar t
         |   `  |      |      |      | Del  |------'`------| Ins  |      |      |      |      |
         `----------------------------------'              `----------------------------------'
 
-### Keymap 5: ADJUST layer
+### Keymap 6: ADJUST layer
 
         ,----------------------------------.              ,----------------------------------.
         |  F1  |  F2  |  F3  |  F4  |  F5  |              |  F6  |  F7  |  F8  |  F9  | F10  |
         |------+------+------+------+------|              |------+------+------+------+------|
         |  F11 |      |      |      |      |              |      | PScr | SLck | Paus | F12  |
         |------+------+------+------+------|------.,------|------+------+------+------+------|
-        |      |QWERTY|COLEMK|DVORAK|      |      ||      |      |      |      |      |      |
+        |      |QWERTY|COLEMK|DVORAK|DVORMC|      ||      |      |      |      |      |      |
         |------+------+------+------+------|      ||      |------+------+------+------+------|
         |      |      |      |      |      |------'`------|      |      |      |      | RESET|
         `----------------------------------'              `----------------------------------'