From d84da3d62ee1a139e9652894f92bc14038128cf8 Mon Sep 17 00:00:00 2001
From: josiah <me@jowj.net>
Date: Thu, 6 Aug 2020 16:56:26 -0500
Subject: [PATCH] weird changes to help with rsi.

---
 .../ergodox_infinity/keymaps/josiah/keymap.c  | 28 +++++++++----------
 .../keymaps/josiah/readme.org                 |  2 ++
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/keyboards/ergodox_infinity/keymaps/josiah/keymap.c b/keyboards/ergodox_infinity/keymaps/josiah/keymap.c
index 136874c70..be7fdc21b 100644
--- a/keyboards/ergodox_infinity/keymaps/josiah/keymap.c
+++ b/keyboards/ergodox_infinity/keymaps/josiah/keymap.c
@@ -17,21 +17,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* Keymap 0: Basic layer
  *
  * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |   `    |   1  |   2  |   3  |   4  |   5  | ESC  |           |      |   6  |   7  |   8  |   9  |   0  | BSPACE |
+ * |   ESC  |   1  |   2  |   3  |   4  |   5  |   -  |           |  =   |   6  |   7  |   8  |   9  |   0  | BSPACE |
  * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * | TAB    |   Q  |   W  |   E  |   R  |   T  | SYMB |           | MEH  |   Y  |   U  |   I  |   O  |   P  |BSLASH  |
+ * | TAB    |   Q  |   W  |   E  |   R  |   T  | SYMB |           |symb  |   Y  |   U  |   I  |   O  |   P  |BSLASH  |
  * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * | CTRL   |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |  ;   |  '     |
+ * | `      |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |  ;   |  '     |
  * |--------+------+------+------+------+------|  [   |           |  ]   |------+------+------+------+------+--------|
- * |        |Z/Ctrl|   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |   ,  |   .  |  /   | RSHIFT |
+ * |        |   Z  |   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |   ,  |   .  |  /   |        |
  * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
  *   |L_FLHR|      |      |      | RALT |                                       | RALT |      |      |      |L_FLHR|
  *   `----------------------------------'                                       `----------------------------------'
  *                                        ,-------------.       ,-------------.
- *                                        |   -  | Lgui |       | Rgui |    = |
+ *                                        |      | Lgui |       | Rgui |      |
  *                                 ,------|------|------|       |------+--------+------.
  *                                 |      |      | MDIA |       | MDIA |        |      |
- *                                 | Space|DEL   |------|       |------|  ENTER |SPACE |
+ *                                 | SHIFT|DEL   |------|       |------|  ENTER |SPACE |
  *                                 |      |      | CTRL |       | CTRL |        |      |
  *                                 `--------------------'       `----------------------'
  */
@@ -39,18 +39,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // Otherwise, it needs KC_*
 [BASE] = LAYOUT_ergodox(  // layer 0 : default
         // left hand
-        KC_GRAVE,       KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   KC_ESC,
+        KC_ESC,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   KC_MINUS,
         KC_TAB,         KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   MO(SYMB),
-        KC_LCTRL,       KC_A,         KC_S,   KC_D,   KC_F,   KC_G,
-        KC_TRNS,      CTL_T(KC_Z),  KC_X,   KC_C,   KC_V,   KC_B,   KC_LBRC,
-        MO(FLHR),       KC_TRNS,      KC_TRNS,KC_TRNS,KC_LALT,
-                                               KC_MINUS,  KC_LGUI, MO(MDIA),
+        KC_GRAVE,       KC_A,         KC_S,   KC_D,   KC_F,   KC_G,
+        KC_TRNS,        KC_Z,         KC_X,   KC_C,   KC_V,   KC_B,   KC_LBRC,
+        MO(FLHR),       KC_TRNS,      KC_TRNS,KC_TRNS,KC_LALT,`xs
+                                               KC_TRNS,  KC_LGUI, MO(MDIA),
                                        	       KC_LSHIFT,    KC_DEL,  KC_LCTRL,
         // right hand
-             KC_TRNS,         KC_6,   KC_7,   KC_8,   KC_9,   KC_0,             KC_BSPACE,
-	     MEH_T(KC_NO),    KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,             KC_BSLASH,
+             KC_EQUAL,        KC_6,   KC_7,   KC_8,   KC_9,   KC_0,             KC_BSPACE,
+	     MO(SYMB),        KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,             KC_BSLASH,
                               KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,          KC_QUOTE,
-             KC_RBRC,         KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,          KC_RSHIFT,
+             KC_RBRC,         KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,          KC_TRNS,
 	                              KC_RALT,KC_TRNS,KC_TRNS,KC_TRNS,         MO(FLHR),
              KC_RALT,        KC_EQUAL,
 	MO(MDIA),
diff --git a/keyboards/ergodox_infinity/keymaps/josiah/readme.org b/keyboards/ergodox_infinity/keymaps/josiah/readme.org
index 59355311c..7c1cfe501 100644
--- a/keyboards/ergodox_infinity/keymaps/josiah/readme.org
+++ b/keyboards/ergodox_infinity/keymaps/josiah/readme.org
@@ -10,6 +10,8 @@
 	- sudo make ergodox_infinity:josiah:dfu-util MASTER=right 
 
       - leds only work on the left side, not the right. confused.
+
+      - if you are flashing from nixos you may have to prepend your flash commands with a CFLAGs arg, like: ~sudo CFLAGS="-Wno-error=deprecated" make ergodox_infinity:josiah MASTER=right~
 ** flashing old kii firmware mechanism
    - i don't rightly understand what's going on here, but /this/ firmware seems to make LEDs work on both halves.
    - they must have updated something in the firmware that doesn't work with older ergodox infinity models, which is pretty annoying.