12 files changed, 193 insertions, 29 deletions
diff --git a/users/konstantin/config.h b/users/konstantin/config.h
index 4ca19f824..4edab2baa 100644
--- a/users/konstantin/config.h
+++ b/users/konstantin/config.h
@@ -14,8 +14,9 @@
 #define NO_ACTION_ONESHOT
 
 #define PERMISSIVE_HOLD
-#define TAPPING_TERM    200
-#define TAPPING_TOGGLE  2
+#define TAPPING_TERM        200
+#define TAPPING_TOGGLE      2
+#define TAP_HOLD_CAPS_DELAY 50
 
 #define UNICODE_CYCLE_PERSIST  false
 #define UNICODE_SELECTED_MODES UC_WINC, UC_WIN, UC_LNX
diff --git a/users/konstantin/rgb.c b/users/konstantin/rgb.c
index 0f0c73c49..a96cad019 100644
--- a/users/konstantin/rgb.c
+++ b/users/konstantin/rgb.c
@@ -1,24 +1,25 @@
 #include "rgb.h"
 
 #ifdef RGBLIGHT_EFFECT_BREATHING
-const uint8_t RGBLED_BREATHING_INTERVALS[] PROGMEM = {20, 30, 5, 10};
+const uint8_t PROGMEM RGBLED_BREATHING_INTERVALS[] = { 20, 30, 5, 10 };
 #endif
 
 #ifdef RGBLIGHT_EFFECT_RAINBOW_MOOD
-const uint8_t RGBLED_RAINBOW_MOOD_INTERVALS[] PROGMEM = {20, 50, 100};
+const uint8_t PROGMEM RGBLED_RAINBOW_MOOD_INTERVALS[] = { 20, 50, 100 };
 #endif
 
 #ifdef RGBLIGHT_EFFECT_RAINBOW_SWIRL
-const uint8_t RGBLED_RAINBOW_SWIRL_INTERVALS[] PROGMEM = {20, 50, 100};
+const uint8_t PROGMEM RGBLED_RAINBOW_SWIRL_INTERVALS[] = { 20, 50, 100 };
 #endif
 
 #ifdef RGBLIGHT_EFFECT_SNAKE
-const uint8_t RGBLED_SNAKE_INTERVALS[] PROGMEM = {20, 50, 100};
+const uint8_t PROGMEM RGBLED_SNAKE_INTERVALS[] = { 20, 50, 100 };
 #endif
 
 #ifdef RGBLIGHT_EFFECT_KNIGHT
-const uint8_t RGBLED_KNIGHT_INTERVALS[] PROGMEM = {20, 50, 100};
+const uint8_t PROGMEM RGBLED_KNIGHT_INTERVALS[] = { 20, 50, 100 };
 #endif
 
-const hsv_t GODSPEED_BLUE   = { .h = 280, .s = 68,  .v = RGBLIGHT_LIMIT_VAL };
-const hsv_t GODSPEED_YELLOW = { .h = 38,  .s = 153, .v = RGBLIGHT_LIMIT_VAL };
+const HSV GODSPEED_BLUE    = { .h = 198, .s = 68,  .v = 255 };
+const HSV GODSPEED_YELLOW  = { .h = 27,  .s = 153, .v = 255 };
+const HSV MODERN_DOLCH_RED = { .h = 252, .s = 255, .v = 144 };
diff --git a/users/konstantin/rgb.h b/users/konstantin/rgb.h
index aed855aa0..36a9d9cd7 100644
--- a/users/konstantin/rgb.h
+++ b/users/konstantin/rgb.h
@@ -2,17 +2,6 @@
 
 #include "quantum.h"
 
-typedef struct {
-    uint16_t h;  // 0–360
-    uint8_t  s;  // 0–255
-    uint8_t  v;  // 0–255
-} hsv_t;
-
-typedef struct {
-    uint8_t r;  // 0–255
-    uint8_t g;  // 0–255
-    uint8_t b;  // 0–255
-} rgb_t;
-
-extern const hsv_t GODSPEED_BLUE;
-extern const hsv_t GODSPEED_YELLOW;
+extern const HSV GODSPEED_BLUE;
+extern const HSV GODSPEED_YELLOW;
+extern const HSV MODERN_DOLCH_RED;
diff --git a/users/konstantin/tap_dance.c b/users/konstantin/tap_dance.c
index fa43288ce..ba1453fc0 100644
--- a/users/konstantin/tap_dance.c
+++ b/users/konstantin/tap_dance.c
@@ -110,6 +110,7 @@ qk_tap_dance_action_t tap_dance_actions[] = {
     [TD_RAL_LAL] = ACTION_TAP_DANCE_DOUBLE_MOD(KC_RALT, KC_LALT),
     [TD_RAL_RGU] = ACTION_TAP_DANCE_DOUBLE_MOD(KC_RALT, KC_RGUI),
     [TD_RCT_RSF] = ACTION_TAP_DANCE_DOUBLE_MOD(KC_RCTL, KC_RSFT),
+    [TD_RSF_RCT] = ACTION_TAP_DANCE_DOUBLE_MOD(KC_RSFT, KC_RCTL),
 
     [TD_LSFT_FN] = ACTION_TAP_DANCE_MOD_LAYER(KC_LSFT, L_FN),
     [TD_RCTL_FN] = ACTION_TAP_DANCE_MOD_LAYER(KC_RCTL, L_FN),
diff --git a/users/konstantin/tap_dance.h b/users/konstantin/tap_dance.h
index 13d682a60..d2f00c8cb 100644
--- a/users/konstantin/tap_dance.h
+++ b/users/konstantin/tap_dance.h
@@ -7,6 +7,7 @@
 #define RAL_LAL TD(TD_RAL_LAL)
 #define RAL_RGU TD(TD_RAL_RGU)
 #define RCT_RSF TD(TD_RCT_RSF)
+#define RSF_RCT TD(TD_RSF_RCT)
 
 #define LSFT_FN TD(TD_LSFT_FN)
 #define RCTL_FN TD(TD_RCTL_FN)
@@ -18,6 +19,7 @@ enum tap_dance {
     TD_RAL_LAL,
     TD_RAL_RGU,
     TD_RCT_RSF,
+    TD_RSF_RCT,
 
     TD_LSFT_FN,
     TD_RCTL_FN,
diff --git a/users/mattly/config.h b/users/mattly/config.h
new file mode 100644
index 000000000..25d379801
--- /dev/null
+++ b/users/mattly/config.h
@@ -0,0 +1,9 @@
+#pragma once
+
+// Most tactile encoders have detents every 4 stages
+#define ENCODER_RESOLUTION 4
+
+#define IGNORE_MOD_TAP_INTERRUPT
+#define PERMISSIVE_HOLD
+#define TAPPING_TOGGLE 2
+#define TAPPING_TERM 200
diff --git a/users/mattly/mattly.c b/users/mattly/mattly.c
new file mode 100644
index 000000000..1e61e0126
--- /dev/null
+++ b/users/mattly/mattly.c
@@ -0,0 +1,70 @@
+#include "mattly.h"
+
+__attribute__ ((weak))
+layer_state_t layer_state_set_keymap (layer_state_t state) {
+  return state;
+}
+
+void set_lights_default(void) {
+    #ifdef RGBLIGHT_ENABLE
+        if (IS_HOST_LED_ON(USB_LED_CAPS_LOCK)) {
+            rgblight_sethsv_noeeprom(HSV_CAPS);
+        } else {
+            rgblight_sethsv_noeeprom(HSV_DEFAULT);
+        }
+    #endif
+}
+
+void layer_state_set_rgb(layer_state_t state) {
+#ifdef RGBLIGHT_ENABLE
+    switch (biton32(state)) {
+        case _QWERTY:
+            set_lights_default();
+            break;
+        case _SYMBOL:
+            rgblight_sethsv_noeeprom(HSV_SYMBOL);
+            break;
+        case _NAVNUM:
+            rgblight_sethsv_noeeprom(HSV_NAVNUM);
+            break;
+        case _FUNCT:
+            rgblight_sethsv_noeeprom(HSV_FUNCT);
+            break;
+    }
+#endif
+}
+
+
+layer_state_t layer_state_set_user (layer_state_t state) {
+  state = update_tri_layer_state(state, _SYMBOL, _NAVNUM, _FUNCT);
+  layer_state_set_rgb(state);
+  return layer_state_set_keymap (state);
+}
+
+void on_reset(void) {
+    #ifdef RGBLIGHT_ENABLE
+    rgblight_sethsv_noeeprom(HSV_RESET);
+    #endif
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case KC_CAPS:
+            #ifdef RGBLIGHT_ENABLE
+            set_lights_default();
+            #endif
+            return true;
+        case RESET:
+            on_reset();
+            return true;
+        default:
+            return true;
+    }
+}
+
+void keyboard_post_init_user(void) {
+#ifdef RGBLIGHT_ENABLE
+    rgblight_enable_noeeprom();
+    set_lights_default();
+#endif
+}
diff --git a/users/mattly/mattly.h b/users/mattly/mattly.h
new file mode 100644
index 000000000..08318840d
--- /dev/null
+++ b/users/mattly/mattly.h
@@ -0,0 +1,83 @@
+/* Copyright 2019 Matthew Lyon
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef USERSPACE
+#define USERSPACE
+
+#include "quantum.h"
+
+enum {
+    _QWERTY,
+    _NAVNUM,
+    _SYMBOL,
+    _FUNCT,
+};
+
+// left hand
+#define ESC_HYP MT(MOD_HYPR, KC_ESC)
+#define BSP_NUM LT(_NAVNUM, KC_BSPC)
+#define ENT_SFT MT(MOD_LSFT, KC_ENT)
+#define SPC_SFT MT(MOD_LSFT, KC_SPC)
+
+// right hand
+#define SPC_SFT MT(MOD_LSFT, KC_SPC)
+#define TAB_SYM LT(_SYMBOL, KC_TAB)
+#define DEL_WRP MT(MOD_LCTL | MOD_LALT | MOD_LGUI, KC_DEL)
+
+#define NAVLOCK TG(_NAVNUM)
+#define SYMLOCK TG(_SYMBOL)
+
+
+// QWERTY
+
+#define A_CTRL  MT(MOD_LCTL, KC_A)
+#define S_ALT   MT(MOD_LALT, KC_S)
+#define D_GUI   MT(MOD_LGUI, KC_D)
+#define F_SHFT  MT(MOD_LSFT, KC_F)
+#define J_SHFT  MT(MOD_RSFT, KC_J)
+#define K_GUI   MT(MOD_RGUI, KC_K)
+#define L_ALT   MT(MOD_RALT, KC_L)
+#define MINSCTL MT(MOD_RCTL, KC_MINS)
+
+#define BWORD   LALT(KC_LEFT)
+#define FWORD   LALT(KC_RIGHT)
+
+// OS X default keys
+#define NWIN    LGUI(KC_GRV)        // Next Window
+#define PWIN    LGUI(LSFT(KC_GRV))  // Prev Window
+#define NTAB    LGUI(LSFT(KC_RBRC)) // Next Tab
+#define PTAB    LGUI(LSFT(KC_LBRC)) // Prev Tab
+#define NAVBACK LGUI(KC_LBRC)       // Navigate Forward
+#define NAVFWD  LGUI(KC_RBRC)       // Navigate Back
+
+// my personal mappings to window manager commands
+#define XALLWIN HYPR(KC_F14)
+#define XDESKTP HYPR(KC_F15)
+#define XNXTSPC HYPR(KC_F16)
+#define XPRVSPC HYPR(KC_F17)
+#define XNOTIFY HYPR(KC_F18)
+
+#ifdef RGBLIGHT_ENABLE
+#define HSV_CAPS     42, 255, 255
+#define HSV_DEFAULT  30, 218, 255
+#define HSV_SYMBOL   22, 255, 255
+#define HSV_NAVNUM  245, 200, 255
+#define HSV_FUNCT   233, 255, 255
+#define HSV_RESET   180, 255, 255
+#endif
+
+#endif
+
diff --git a/users/mattly/readme.md b/users/mattly/readme.md
new file mode 100644
index 000000000..356992534
--- /dev/null
+++ b/users/mattly/readme.md
@@ -0,0 +1,10 @@
+# mattly's layouts
+
+My layouts are based around:
+
+* making the most from small layouts on keyboards like the iris or planck
+* moving held-modifiers from pinkies to thumbs or home row, giving many keys dual purposes via mod/layer taps
+* easy home-row navigation on a layer, using standard keys, available to all programs, not just a specially-configured editor
+* easy access to punctuation symbols used in the programming languages I work in
+
+[Here is an image](https://lyonheart.us/etc/mattly-keymap.png) with an outdated description of my keymap
+\ No newline at end of file
diff --git a/users/mattly/rules.mk b/users/mattly/rules.mk
new file mode 100644
index 000000000..6803d361d
--- /dev/null
+++ b/users/mattly/rules.mk
@@ -0,0 +1,2 @@
+SRC += mattly.c
+MOUSEKEY_ENABLE = yes
diff --git a/users/xulkal/custom_oled.c b/users/xulkal/custom_oled.c
index d871e96f0..7280ef701 100644
--- a/users/xulkal/custom_oled.c
+++ b/users/xulkal/custom_oled.c
@@ -80,7 +80,7 @@ static void render_status(void)
     oled_set_cursor(0, oled_max_lines() - 7);
     oled_write_P(PSTR("-----"), false);
     static char buffer[26] = {0};
-    snprintf(buffer, sizeof(buffer), "h%3d s%3d v%3d s%3d m%3d\n", rgb_matrix_config.hue, rgb_matrix_config.sat, rgb_matrix_config.val, rgb_matrix_config.speed, rgb_matrix_config.mode);
+    snprintf(buffer, sizeof(buffer), "h%3d s%3d v%3d s%3d m%3d\n", rgb_matrix_config.hsv.h, rgb_matrix_config.hsv.s, rgb_matrix_config.hsv.v, rgb_matrix_config.speed, rgb_matrix_config.mode);
     oled_write(buffer, false);
 #elif defined(RGBLIGHT_ENABLE)
     oled_set_cursor(0, oled_max_lines() - 7);
@@ -137,7 +137,7 @@ static void render_status(void)
 
 #if defined(RGB_MATRIX_ENABLE)
     static char buffer[20] = {0};
-    snprintf(buffer, sizeof(buffer), "    h%3d s%3d v%3d\n", rgb_matrix_config.hue, rgb_matrix_config.sat, rgb_matrix_config.val);
+    snprintf(buffer, sizeof(buffer), "    h%3d s%3d v%3d\n", rgb_matrix_config.hsv.h, rgb_matrix_config.hsv.s, rgb_matrix_config.hsv.v);
     oled_write(buffer, false);
 #elif defined(RGBLIGHT_ENABLE)
     static char buffer[20] = {0};
diff --git a/users/xulkal/process_records.c b/users/xulkal/process_records.c
index 115623caa..2c5d2a4e7 100644
--- a/users/xulkal/process_records.c
+++ b/users/xulkal/process_records.c
@@ -2,10 +2,6 @@
 #include "custom_keycodes.h"
 #include "timer_utils.h"
 
-#if defined(RGB_MATRIX_ENABLE)
-extern void eeconfig_update_rgb_matrix_default(void);
-#endif
-
 #ifdef TRILAYER_ENABLED
 uint32_t layer_state_set_user(uint32_t state)
 {