[Keymap] merge jdelkins userspace and associated keymaps (#11276)

* [Keymap] merge jdelkins userspace and associated keymaps

* Add copyright & license info

* Change rgblight_config.enable to rgblight_is_enabled()

* Update keyboards/dz60/keymaps/jdelkins/keymap.c

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

* Update keyboards/dz60/keymaps/jdelkins/keymap.c

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

* Update keyboards/dz60/keymaps/jdelkins/keymap.c

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

* Remove superfluous includes

* Change EXTRAFLAGS+=-flto to LTO_ENABLE=yes

* Remove unnecessary jdelkins_ss symlink in users

* Add copyright and license notices

* Use preferred way to determine capslock / numlock state

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

* Add #pragma once to a header

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

* Include QMK_KEYBOARD_H only once, in userspace header

* Remove unnecessary initialization in matrix_init_keymap

* Do process_record_keymap before cases handled in process_record_user

* Reorganize & simplify secrets feature enablement

* Use tap_code16

Co-authored-by: Ryan <fauxpark@gmail.com>

* Remove superfluous break

Co-authored-by: Ryan <fauxpark@gmail.com>

* Remove copyright from rules.mk

Co-authored-by: Ryan <fauxpark@gmail.com>

* Remove copyright from rules.mk

Co-authored-by: Ryan <fauxpark@gmail.com>

* Use tap_code16

Co-authored-by: Ryan <fauxpark@gmail.com>

* include "print.h" instead of <print.h>

Co-authored-by: Ryan <fauxpark@gmail.com>

* Use tap_cod16

Co-authored-by: Ryan <fauxpark@gmail.com>

* Use tap_code16

Co-authored-by: Ryan <fauxpark@gmail.com>

* Use tap_code16

Co-authored-by: Ryan <fauxpark@gmail.com>

* Use tap_code16

Co-authored-by: Ryan <fauxpark@gmail.com>

* Remove copyright from rules.mk

Co-authored-by: Ryan <fauxpark@gmail.com>

* add #pragma once to a header

Co-authored-by: Ryan <fauxpark@gmail.com>

* include "print.h" instead of <print.h>

Co-authored-by: Ryan <fauxpark@gmail.com>

* Remove copyright from rules.mk

Co-authored-by: Ryan <fauxpark@gmail.com>

* Remove copyright from rules.mk

Co-authored-by: Ryan <fauxpark@gmail.com>

* Remove copyright from rules.mk

Co-authored-by: Ryan <fauxpark@gmail.com>

* Use tap_code16

Co-authored-by: Ryan <fauxpark@gmail.com>

* Use tap_code16

Co-authored-by: Ryan <fauxpark@gmail.com>

* Use :flash target where possible

* Remove special case flash target and use PROGRAM_CMD

* dz60/jdelkins_ss: use tap_code16

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

18 files changed, 2305 insertions, 0 deletions

diff --git a/keyboards/dz60/keymaps/jdelkins/config.h b/keyboards/dz60/keymaps/jdelkins/config.h
new file mode 100644
index 0000000000..95b45b2c12
--- /dev/null
+++ b/keyboards/dz60/keymaps/jdelkins/config.h
@@ -0,0 +1,51 @@
+/*
+  Copyright 2020 Joel Elkins <joel@elkins.com>
+
+  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/>.
+*/
+
+#pragma once
+
+/* Directional arrangement | LAYOUT_directional
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │  0e   │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
+ * │10   │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e   │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │20    │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d      │
+ * ├──────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬───┬───┤
+ * │30     │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c │3d │3e │
+ * ├────┬──┴─┬─┴──┬┴───┴───┴───┴───┴───┴───┼───┼───┼───┼───┼───┤
+ * │40  │41  │43  │           46           │4a │4b │4c │4d │4e │
+ * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┘
+*/
+
+#define LAYOUT_directional_nosplitspace( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,      k0e, \
+    k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \
+    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,      \
+    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
+    k40, k41,      k43,           k46,                k4a, k4b, k4c, k4d, k4e  \
+) { \
+    { k00,  k01,   k02,   k03,  k04,  k05,   k06,  k07,   k08,  k09,   k0a,  k0b,  k0c,  KC_NO,k0e   }, \
+    { k10,  KC_NO, k12,   k13,  k14,  k15,   k16,  k17,   k18,  k19,   k1a,  k1b,  k1c,  k1d,  k1e   }, \
+    { k20,  KC_NO, k22,   k23,  k24,  k25,   k26,  k27,   k28,  k29,   k2a,  k2b,  k2c,  k2d,  KC_NO }, \
+    { k30,  KC_NO, k32,   k33,  k34,  k35,   k36,  k37,   k38,  k39,   k3a,  k3b,  k3c,  k3d,  k3e   }, \
+    { k40,  k41,   KC_NO, k43,  KC_NO,KC_NO, k46,  KC_NO, KC_NO,KC_NO, k4a,  k4b,  k4c,  k4d,  k4e   }  \
+}
+
+#define AUTO_SHIFT_TIMEOUT 160
+#define RGBLIGHT_LAYERS
+#define LEADER_TIMEOUT 400
+#define LEADER_PER_KEY_TIMING
diff --git a/keyboards/dz60/keymaps/jdelkins/keymap.c b/keyboards/dz60/keymaps/jdelkins/keymap.c
new file mode 100644
index 0000000000..c0bf4445a8
--- /dev/null
+++ b/keyboards/dz60/keymaps/jdelkins/keymap.c
@@ -0,0 +1,279 @@
+/*
+  Copyright 2020 Joel Elkins <joel@elkins.com>
+
+  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/>.
+*/
+
+#include "jdelkins.h"
+
+#undef LAYOUT
+#define LAYOUT LAYOUT_directional_nosplitspace
+
+#define IDLE_TIMEOUT 360
+uint16_t rgb_idle_seconds = 0;
+uint16_t rgb_timer;
+bool rgb_was_enabled;
+
+// Tap Dance
+
+int ctl_state = 0;
+
+void ctl_finished(qk_tap_dance_state_t *state, void *user_data) {
+    ctl_state = cur_dance(state);
+    switch(ctl_state) {
+        case SINGLE_TAP:    qk_leader_start(); break;
+        case SINGLE_HOLD:   register_code(KC_LCTL); break;
+        case DOUBLE_TAP:    tap_code(KC_RCTL); break;
+        case DOUBLE_HOLD:   register_code(KC_RCTL); break;
+        case TRIPLE_TAP:    tap_code(KC_RCTL); tap_code(KC_RCTL); break;
+        case TRIPLE_HOLD:   tap_code(KC_RCTL); register_code(KC_RCTL); break;
+    }
+}
+
+void ctl_reset(qk_tap_dance_state_t *state, void *user_data) {
+    switch(ctl_state) {
+        case SINGLE_HOLD:   unregister_code(KC_LCTL); break;
+        case DOUBLE_HOLD:
+        case TRIPLE_HOLD:   unregister_code(KC_RCTL); break;
+    }
+    ctl_state = 0;
+}
+
+void g_finished(qk_tap_dance_state_t *state, void *user_data) {
+    switch (cur_dance(state)) {
+        case SINGLE_TAP:
+            tap_code16(C(KC_END));
+            break;
+        case DOUBLE_TAP:
+            tap_code16(C(KC_HOME));
+            break;
+    }
+}
+
+enum {
+    TD_LDCTL,
+    TD_G,
+};
+
+qk_tap_dance_action_t tap_dance_actions[] = {
+    [TD_LDCTL] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, ctl_finished, ctl_reset),
+    [TD_G]     = ACTION_TAP_DANCE_FN_ADVANCED(NULL, g_finished, NULL),
+};
+
+// Layers
+
+const uint16_t PROGMEM keymaps[_LAYER_MAX][MATRIX_ROWS][MATRIX_COLS] = {
+    [_QWERTY] = LAYOUT(
+            KC_GESC,      KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8,    KC_9,    KC_0,        KC_MINS, KC_EQL,  KC_BSPC,
+            KC_TAB,       KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I,    KC_O,    KC_P,        KC_LBRC, KC_RBRC, KC_BSLS,
+            MY_CAPS,      KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K,    KC_L,    KC_SCLN,     KC_QUOT,          KC_ENT,
+            KC_LSFT,      KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT,  KC_SLSH,     KC_RSFT, KC_BSPC, MO(_ADJUST),
+            TD(TD_LDCTL), MY_GUI, MY_ALT,                 MY_SPC,                KC_RALT, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+    ),
+    [_GAME] = LAYOUT(
+            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+            KC_LCTL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+            _______, _______, KC_LALT,                       KC_SPC,                         _______, _______, _______, _______, _______
+    ),
+    [_FUNC] = LAYOUT(
+            KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,    KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,  KC_DEL,
+            _______, _______, FW_WRD,  KB_EOL,  _______, _______,  KB_COPY, KC_PGUP, _______, _______, KB_PASTE, KC_SLCK, _______, MY_CALC,
+            _______, KB_BOL,  _______, KC_PGDN, _______, TD(TD_G), KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______,  _______,          _______,
+            _______, _______, KC_DEL,  _______, _______, BK_WRD,   _______, _______, _______, _______, _______,  _______, KC_INS,  _______,
+            _______, MY_RGUI, MY_RALT,                        _______,                        _______, KC_HOME,  KC_PGDN, KC_PGUP, KC_END
+    ),
+    [_KP] = LAYOUT(
+            _______,    _______, _______, _______, _______, _______, _______, _______, KC_KP_ASTERISK, _______,   _______,     _______, _______, _______,
+            KC_NUMLOCK, _______, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, _______, KC_KP_7, KC_KP_8,        KC_KP_9,   KC_KP_MINUS, _______, _______, _______,
+            _______,    _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, _______, KC_KP_4, KC_KP_5,        KC_KP_6,   KC_KP_PLUS,  _______,          _______,
+            _______,    _______, _______, _______, _______, _______, _______, KC_KP_1, KC_KP_2,        KC_KP_3,   KC_KP_SLASH, _______, _______, TG(_KP),
+            _______,    _______, _______,                       KC_KP_0,                               KC_KP_DOT, _______,     _______, _______, _______
+    ),
+    [_ADJUST] = LAYOUT(
+            KC_GRV,  KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
+            _______, RGB_SPD,  RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, _______, _______, _______, KC_PSCR, KC_SLCK, _______, KC_MUTE,
+            _______, RGB_RMOD, RGB_VAD, RGB_MOD, RGB_HUD, RGB_SAD, _______, _______, TG(_KP), _______, _______, _______,          KC_MPLY,
+            _______, RGB_TOG,  KB_MAKE, KB_FLSH, KB_VRSN, KB_BOOT, _______, TG_SYS,  _______, _______, _______, _______, KC_DEL,  _______,
+            _______, MY_RGUI,  MY_RALT,                      _______,                         _______, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT
+    ),
+};
+
+const rgblight_segment_t PROGMEM game_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {0, 1, HSV_RED},
+    {7, 2, HSV_RED},
+    {15, 1, HSV_RED}
+);
+
+const rgblight_segment_t PROGMEM func_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {0, 8, HSV_GREEN}
+);
+
+const rgblight_segment_t PROGMEM kp_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {0, 16, HSV_ORANGE}
+);
+
+const rgblight_segment_t PROGMEM adjust_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {0, 16, HSV_BLUE}
+);
+
+const rgblight_segment_t PROGMEM capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {10, 4, HSV_WHITE}
+);
+
+const rgblight_segment_t PROGMEM numlock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {0, 2, HSV_PURPLE},
+    {14, 2, HSV_PURPLE}
+);
+
+
+enum rgb_layer_index {
+    L_GAME,
+    L_FUNC,
+    L_KP,
+    L_ADJUST,
+    L_CAPSLOCK,
+    L_NUMLOCK,
+};
+
+const rgblight_segment_t * const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
+        [L_GAME] = game_layer,
+        [L_FUNC] = func_layer,
+        [L_KP] = kp_layer,
+        [L_ADJUST] = adjust_layer,
+        [L_CAPSLOCK] = capslock_layer,
+        [L_NUMLOCK] = numlock_layer
+);
+
+layer_state_t layer_state_set_keymap(layer_state_t state) {
+    rgblight_set_layer_state(L_GAME, layer_state_cmp(state, _GAME));
+    rgblight_set_layer_state(L_FUNC, layer_state_cmp(state, _FUNC));
+    rgblight_set_layer_state(L_KP, layer_state_cmp(state, _KP));
+    rgblight_set_layer_state(L_ADJUST, layer_state_cmp(state, _ADJUST));
+    rgblight_set_layer_state(L_CAPSLOCK, CAPSLOCK_ON);
+    rgblight_set_layer_state(L_NUMLOCK, NUMLOCK_ON && layer_state_cmp(state, _KP));
+    if (layer_state_cmp(state, _GAME))
+        autoshift_disable();
+    else
+        autoshift_enable();
+    return state;
+}
+
+bool led_update_user(led_t led_state) {
+    rgblight_set_layer_state(L_CAPSLOCK, led_state.caps_lock);
+    rgblight_set_layer_state(L_NUMLOCK, led_state.num_lock && layer_state_is(_KP));
+    return true;
+}
+
+void keyboard_post_init_keymap(void) {
+    rgblight_layers = my_rgb_layers;
+    rgb_was_enabled = rgblight_is_enabled();
+}
+
+LEADER_EXTERNS();
+
+void matrix_scan_keymap(void) {
+    if (rgblight_is_enabled() && timer_elapsed(rgb_timer) > 1000) {
+        rgb_idle_seconds++;
+        rgb_timer = timer_read();
+    }
+    if (rgb_idle_seconds > IDLE_TIMEOUT) {
+        rgb_was_enabled = rgblight_is_enabled();
+        rgblight_disable_noeeprom();
+        rgb_idle_seconds = 0;
+    }
+    LEADER_DICTIONARY() {
+        leading = false;
+        leader_end();
+
+        SEQ_ONE_KEY(KC_K) {
+            layer_invert(_KP);
+        }
+        SEQ_ONE_KEY(KC_G) {
+            layer_invert(_GAME);
+        }
+        SEQ_ONE_KEY(KC_KP_5) {
+            layer_invert(_KP);
+        }
+        SEQ_TWO_KEYS(KC_SCLN, KC_1) {
+            send_secret_string(0);
+        }
+        SEQ_TWO_KEYS(KC_SCLN, KC_2) {
+            send_secret_string(1);
+        }
+        SEQ_TWO_KEYS(KC_SCLN, KC_3) {
+            send_secret_string(2);
+        }
+        SEQ_TWO_KEYS(KC_SCLN, KC_4) {
+            send_secret_string(3);
+        }
+        SEQ_TWO_KEYS(KC_SCLN, KC_5) {
+            send_secret_string(4);
+        }
+        SEQ_TWO_KEYS(KC_SCLN, KC_6) {
+            send_secret_string(5);
+        }
+        SEQ_TWO_KEYS(KC_SCLN, KC_M) {
+            send_secret_string(0);
+        }
+        SEQ_TWO_KEYS(KC_SCLN, KC_COMM) {
+            send_secret_string(1);
+        }
+        SEQ_TWO_KEYS(KC_SCLN, KC_DOT) {
+            send_secret_string(2);
+        }
+        SEQ_TWO_KEYS(KC_SCLN, KC_J) {
+            send_secret_string(3);
+        }
+        SEQ_TWO_KEYS(KC_SCLN, KC_K) {
+            send_secret_string(4);
+        }
+        SEQ_TWO_KEYS(KC_SCLN, KC_L) {
+            send_secret_string(5);
+        }
+        SEQ_ONE_KEY(KC_C) {
+            tap_code16(C(KC_C));
+        }
+    }
+}
+
+bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
+    static uint16_t gesc_timer;
+
+    rgb_idle_seconds = 0;
+    if (!rgblight_is_enabled() && rgb_was_enabled)
+        rgblight_enable_noeeprom();
+
+    switch (keycode) {
+        // custom handle KC_GESC to emulate auto shift on it
+        case KC_GESC:
+            if (get_autoshift_state()) {
+                if (record->event.pressed)
+                    gesc_timer = timer_read();
+                else {
+                    if (timer_elapsed(gesc_timer) > AUTO_SHIFT_TIMEOUT || MODS_SHIFT) {
+                        tap_code16(S(KC_GRV));
+                    } else if (MODS_GUI)
+                        tap_code(KC_GRV);
+                    else
+                        tap_code(KC_ESC);
+                }
+                return false;
+            }
+            return false;
+    }
+
+    return true;
+}
diff --git a/keyboards/dz60/keymaps/jdelkins/rules.mk b/keyboards/dz60/keymaps/jdelkins/rules.mk
new file mode 100644
index 0000000000..b0a4f73dd7
--- /dev/null
+++ b/keyboards/dz60/keymaps/jdelkins/rules.mk
@@ -0,0 +1,7 @@
+LEADER_ENABLE = yes
+MOUSEKEY_ENABLE = yes
+CONSOLE_ENABLE = no
+NKRO_ENABLE = no
+TAP_DANCE_ENABLE = yes
+LTO_ENABLE = yes
+AUTO_SHIFT_ENABLE = yes
diff --git a/keyboards/dz60/keymaps/jdelkins_ss/config.h b/keyboards/dz60/keymaps/jdelkins_ss/config.h
new file mode 100644
index 0000000000..e023d3452b
--- /dev/null
+++ b/keyboards/dz60/keymaps/jdelkins_ss/config.h
@@ -0,0 +1,51 @@
+/*
+  Copyright 2020 Joel Elkins <joel@elkins.com>
+
+  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/>.
+*/
+
+#pragma once
+
+/* My hhkb variant
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+ * │10   │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e   │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │20    │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d      │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+ * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d    │3e │
+ * ├────┬───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴──┬┴──┬┴──┬───┼───┤
+ * │40  │41  │43  │44      │46  │48        │4a │4b │4c │4d │4e │
+ * └────┴────┴────┴────────┴────┴──────────┴───┴───┴───┴───┴───┘
+ */
+
+#define LAYOUT_hhkb_split( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
+    k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \
+    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,      \
+    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3d, k3e, \
+    k40, k41,      k43, k44,      k46,      k48,      k4a, k4b, k4c, k4d, k4e  \
+) { \
+    { k00,  k01,   k02,   k03,  k04,  k05,   k06,  k07,   k08,  k09,   k0a,  k0b,  k0c,   k0d,  k0e   }, \
+    { k10,  KC_NO, k12,   k13,  k14,  k15,   k16,  k17,   k18,  k19,   k1a,  k1b,  k1c,   k1d,  k1e   }, \
+    { k20,  KC_NO, k22,   k23,  k24,  k25,   k26,  k27,   k28,  k29,   k2a,  k2b,  k2c,   k2d,  KC_NO }, \
+    { k30,  KC_NO, k32,   k33,  k34,  k35,   k36,  k37,   k38,  k39,   k3a,  k3b,  KC_NO, k3d,  k3e   }, \
+    { k40,  k41,   KC_NO, k43,  k44,  KC_NO, k46,  KC_NO, k48,  KC_NO, k4a,  k4b,  k4c,   k4d,  k4e   }  \
+}
+
+#define AUTO_SHIFT_TIMEOUT 165
+#define RGBLIGHT_LAYERS
+#define LEADER_TIMEOUT 400
+#define LEADER_PER_KEY_TIMING
diff --git a/keyboards/dz60/keymaps/jdelkins_ss/keymap.c b/keyboards/dz60/keymaps/jdelkins_ss/keymap.c
new file mode 100644
index 0000000000..2744c43727
--- /dev/null
+++ b/keyboards/dz60/keymaps/jdelkins_ss/keymap.c
@@ -0,0 +1,367 @@
+/*
+  Copyright 2020 Joel Elkins <joel@elkins.com>
+
+  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/>.
+*/
+
+#include "jdelkins.h"
+
+#undef LAYOUT
+#define LAYOUT LAYOUT_hhkb_split
+
+#define IDLE_TIMEOUT 360
+uint16_t rgb_idle_seconds = 0;
+uint16_t rgb_timer;
+uint16_t bspc_timer;
+bool rgb_was_enabled;
+
+enum {
+    MY_BSPC = USER_SAFE_RANGE,
+};
+
+// Tap Dance
+
+int ctl_state = 0;
+
+void ctl_finished(qk_tap_dance_state_t *state, void *user_data) {
+    ctl_state = cur_dance(state);
+    switch (ctl_state) {
+        case SINGLE_TAP:    qk_leader_start(); break;
+        case SINGLE_HOLD:   register_code(KC_LCTL); break;
+        case DOUBLE_TAP:    tap_code(KC_RCTL); break;
+        case DOUBLE_HOLD:   register_code(KC_RCTL); break;
+        case TRIPLE_TAP:    tap_code(KC_RCTL); tap_code(KC_RCTL); break;
+        case TRIPLE_HOLD:   tap_code(KC_RCTL); register_code(KC_RCTL); break;
+    }
+}
+
+void ctl_reset(qk_tap_dance_state_t *state, void *user_data) {
+    switch (ctl_state) {
+        case SINGLE_HOLD:   unregister_code(KC_LCTL); break;
+        case DOUBLE_HOLD:
+        case TRIPLE_HOLD:   unregister_code(KC_RCTL); break;
+    }
+    ctl_state = 0;
+}
+
+void g_finished(qk_tap_dance_state_t *state, void *user_data) {
+    switch (cur_dance(state)) {
+        case SINGLE_TAP:
+            tap_code16(C(KC_END));
+            break;
+        case DOUBLE_TAP:
+            tap_code16(C(KC_HOME));
+            break;
+    }
+}
+
+int kp_state = 0;
+
+void kp_finished(qk_tap_dance_state_t *state, void *user_data) {
+    kp_state = hold_cur_dance(state);
+    switch (kp_state) {
+        case SINGLE_TAP:
+            tap_code(KC_SPC);
+            break;
+        default:
+            layer_invert(_KP);
+            break;
+    }
+}
+
+void kp_reset(qk_tap_dance_state_t *state, void *user_data) {
+    switch (kp_state) {
+        case SINGLE_HOLD:
+        case DOUBLE_HOLD:
+        case TRIPLE_HOLD:
+            layer_invert(_KP);
+            break;
+    }
+}
+
+enum {
+    TD_LDCTL,
+    TD_G,
+    TD_KP,
+};
+
+qk_tap_dance_action_t tap_dance_actions[] = {
+    [TD_LDCTL] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, ctl_finished, ctl_reset),
+    [TD_G]     = ACTION_TAP_DANCE_FN_ADVANCED(NULL, g_finished, NULL),
+    [TD_KP]    = ACTION_TAP_DANCE_FN_ADVANCED(NULL, kp_finished, kp_reset),
+};
+
+// Layers
+
+const uint16_t PROGMEM keymaps[_LAYER_MAX][MATRIX_ROWS][MATRIX_COLS] = {
+    [_QWERTY] = LAYOUT(
+            KC_ESC,       KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8,    KC_9,   KC_0,    KC_MINS, KC_EQL, KC_BSPC, KC_GRV,
+            KC_TAB,       KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I,    KC_O,   KC_P,    KC_LBRC, KC_RBRC,         KC_BSLS,
+            MY_CAPS,      KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K,    KC_L,   KC_SCLN, KC_QUOT,                  KC_ENT,
+            KC_LSFT,      KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,                  MO(_ADJUST),
+            TD(TD_LDCTL), MY_GUI, MY_ALT,    MY_BSPC,   TD(TD_KP),   MY_SPC,         KC_RALT, KC_LEFT, KC_DOWN, KC_UP,  KC_RIGHT
+    ),
+    [_RPT] = LAYOUT(
+            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
+            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
+            _______, _______, _______,     _______,     _______,    _______,                          _______, _______, _______, _______, _______
+    ),
+    [_GAME] = LAYOUT(
+            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+            KC_LCTL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
+            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
+            _______, _______, KC_LALT,     KC_SPC,      KC_LALT,     _______,                         _______, _______, _______, _______, _______
+    ),
+    [_FUNC] = LAYOUT(
+            KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,    KC_F5,    KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12, KC_DEL, KC_F13,
+            _______, _______, FW_WRD,  KB_EOL,  TG(_RPT), _______,  KB_COPY, KC_PGUP, _______, _______, KB_PASTE, KC_SLCK, _______,        MY_CALC,
+            _______, KB_BOL,  _______, KC_PGDN, _______,  TD(TD_G), KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______,  _______,                 _______,
+            _______, _______, KC_DEL,  _______, _______,  BK_WRD,   _______, _______, _______, _______, _______,  _______,                 KC_NO,
+            _______, MY_RGUI, MY_RALT,     _______,      _______,     _______,                         _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END
+    ),
+    [_KP] = LAYOUT(
+            _______,    _______, _______, _______, _______, _______, _______, _______, KC_KP_ASTERISK, _______,   _______,     _______, _______, _______, _______,
+            KC_NUMLOCK, _______, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, _______, KC_KP_7, KC_KP_8,        KC_KP_9,   KC_KP_MINUS, _______, _______,          _______,
+            _______,    _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, _______, KC_KP_4, KC_KP_5,        KC_KP_6,   KC_KP_PLUS,  _______,                   _______,
+            _______,    _______, _______, _______, _______, _______, _______, KC_KP_1, KC_KP_2,        KC_KP_3,   KC_KP_SLASH, _______,                   TG(_KP),
+            _______,    _______, _______,  _______,     _______,     KC_KP_0,                                     KC_KP_DOT,   _______, _______, _______, _______
+    ),
+    [_ADJUST] = LAYOUT(
+            KC_GRV,  KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, KC_F13,
+            _______, RGB_SPD,  RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, _______, _______, _______, KC_PSCR, KC_SLCK, _______,         KC_MUTE,
+            _______, RGB_RMOD, RGB_VAD, RGB_MOD, RGB_HUD, RGB_SAD, _______, _______, TG(_KP), _______, _______, _______,                  KC_MPLY,
+            _______, RGB_TOG,  KB_MAKE, KB_FLSH, KB_VRSN, KB_BOOT, _______, TG_SYS,  _______, _______, _______, _______,                  _______,
+            _______, MY_RGUI,  MY_RALT,    KC_DEL,      _______,     _______,                         _______, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT
+    ),
+};
+
+const rgblight_segment_t PROGMEM rpt_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {8, 8, HSV_PINK}
+);
+
+const rgblight_segment_t PROGMEM game_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {0, 1, HSV_RED},
+    {7, 2, HSV_RED},
+    {15, 1, HSV_RED}
+);
+
+const rgblight_segment_t PROGMEM func_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {0, 8, HSV_GREEN}
+);
+
+const rgblight_segment_t PROGMEM kp_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {0, 16, HSV_ORANGE}
+);
+
+const rgblight_segment_t PROGMEM adjust_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {0, 16, HSV_BLUE}
+);
+
+const rgblight_segment_t PROGMEM capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {10, 4, HSV_WHITE}
+);
+
+const rgblight_segment_t PROGMEM numlock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {0, 2, HSV_PURPLE},
+    {14, 2, HSV_PURPLE}
+);
+
+
+enum rgb_layer_index {
+    L_RPT,
+    L_GAME,
+    L_FUNC,
+    L_KP,
+    L_ADJUST,
+    L_CAPSLOCK,
+    L_NUMLOCK,
+};
+
+const rgblight_segment_t * const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
+        [L_RPT] = rpt_layer,
+        [L_GAME] = game_layer,
+        [L_FUNC] = func_layer,
+        [L_KP] = kp_layer,
+        [L_ADJUST] = adjust_layer,
+        [L_CAPSLOCK] = capslock_layer,
+        [L_NUMLOCK] = numlock_layer
+);
+
+layer_state_t layer_state_set_keymap(layer_state_t state) {
+    rgblight_set_layer_state(L_RPT, layer_state_cmp(state, _RPT));
+    rgblight_set_layer_state(L_GAME, layer_state_cmp(state, _GAME));
+    rgblight_set_layer_state(L_FUNC, layer_state_cmp(state, _FUNC));
+    rgblight_set_layer_state(L_KP, layer_state_cmp(state, _KP));
+    rgblight_set_layer_state(L_ADJUST, layer_state_cmp(state, _ADJUST));
+    rgblight_set_layer_state(L_CAPSLOCK, CAPSLOCK_ON);
+    rgblight_set_layer_state(L_NUMLOCK, NUMLOCK_ON && layer_state_cmp(state, _KP));
+    if (layer_state_cmp(state, _GAME) || layer_state_cmp(state, _RPT))
+        autoshift_disable();
+    else
+        autoshift_enable();
+    return state;
+}
+
+bool led_update_user(led_t led_state) {
+    rgblight_set_layer_state(L_CAPSLOCK, led_state.caps_lock);
+    rgblight_set_layer_state(L_NUMLOCK, led_state.num_lock && layer_state_is(_KP));
+    return true;
+}
+
+void keyboard_post_init_keymap(void) {
+    rgblight_layers = my_rgb_layers;
+    rgb_was_enabled = rgblight_is_enabled();
+    bspc_timer = 0;
+}
+
+LEADER_EXTERNS();
+
+void matrix_scan_keymap(void) {
+    if (rgblight_is_enabled() && timer_elapsed(rgb_timer) > 1000) {
+        rgb_idle_seconds++;
+        rgb_timer = timer_read();
+    }
+    if (rgb_idle_seconds > IDLE_TIMEOUT) {
+        rgb_was_enabled = rgblight_is_enabled();
+        rgblight_disable_noeeprom();
+        rgb_idle_seconds = 0;
+    }
+    // if MY_BSPC is held down too long, pretend like it wasn't and start
+    // pressing backspace
+    if (bspc_timer > 0 && timer_elapsed(bspc_timer) > LEADER_TIMEOUT) {
+        layer_off(_FUNC);
+        bspc_timer = 0;
+        register_code(KC_BSPC);
+    }
+    LEADER_DICTIONARY() {
+        leading = false;
+        leader_end();
+
+        SEQ_ONE_KEY(KC_R) {
+            layer_invert(_RPT);
+        }
+        SEQ_ONE_KEY(KC_G) {
+            layer_invert(_GAME);
+        }
+        SEQ_ONE_KEY(KC_K) {
+            layer_invert(_KP);
+        }
+        SEQ_ONE_KEY(KC_KP_5) {
+            layer_invert(_KP);
+        }
+        SEQ_TWO_KEYS(KC_SCLN, KC_1) {
+            send_secret_string(0);
+        }
+        SEQ_TWO_KEYS(KC_SCLN, KC_2) {
+            send_secret_string(1);
+        }
+        SEQ_TWO_KEYS(KC_SCLN, KC_3) {
+            send_secret_string(2);
+        }
+        SEQ_TWO_KEYS(KC_SCLN, KC_4) {
+            send_secret_string(3);
+        }
+        SEQ_TWO_KEYS(KC_SCLN, KC_5) {
+            send_secret_string(4);
+        }
+        SEQ_TWO_KEYS(KC_SCLN, KC_6) {
+            send_secret_string(5);
+        }
+        SEQ_TWO_KEYS(KC_SCLN, KC_M) {
+            send_secret_string(0);
+        }
+        SEQ_TWO_KEYS(KC_SCLN, KC_COMM) {
+            send_secret_string(1);
+        }
+        SEQ_TWO_KEYS(KC_SCLN, KC_DOT) {
+            send_secret_string(2);
+        }
+        SEQ_TWO_KEYS(KC_SCLN, KC_J) {
+            send_secret_string(3);
+        }
+        SEQ_TWO_KEYS(KC_SCLN, KC_K) {
+            send_secret_string(4);
+        }
+        SEQ_TWO_KEYS(KC_SCLN, KC_L) {
+            send_secret_string(5);
+        }
+        SEQ_ONE_KEY(KC_C) {
+            tap_code16(C(KC_C));
+        }
+    }
+}
+
+bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
+    static bool bspc_del = false;
+    static bool bspc_initiated_func = false;
+    bool rc = true;
+
+    rgb_idle_seconds = 0;
+    if (!rgblight_is_enabled() && rgb_was_enabled)
+        rgblight_enable_noeeprom();
+
+    switch (keycode) {
+        case MY_BSPC:
+            if (record->event.pressed) {
+                if (IS_LAYER_ON(_FUNC)) {
+                    // special case: if _FUNC was turned on by another key,
+                    // treat this as KC_DEL and don't do anything else
+                    bspc_del = true;
+                    register_code(KC_DEL);
+                    return false;
+                } else {
+                    bspc_timer = timer_read();
+                    bspc_initiated_func = true;
+                    layer_on(_FUNC);
+                }
+            } else {
+                if (bspc_del) {
+