diff --git a/q8/keymap.c b/q8/keymap.c index 1a06da9..4dc36e2 100644 --- a/q8/keymap.c +++ b/q8/keymap.c @@ -16,34 +16,7 @@ #include QMK_KEYBOARD_H -enum layer_number { - _BASE, - _COLDH, - _NAV, - _NUM, - _SYM, - _FUN, - _MUS, - _MOUSE -}; - -enum custom_keycodes { - M_PASS1 = SAFE_RANGE, - M_PASS2 -}; - -// Tap Dance declarations -enum { - TD_Q_ESC, - TD_W_GRV, -}; - -// Tap Dance definitions -tap_dance_action_t tap_dance_actions[] = { - // Tap once for Q, twice for Escape - [TD_Q_ESC] = ACTION_TAP_DANCE_DOUBLE(KC_Q, KC_ESC), - [TD_W_GRV] = ACTION_TAP_DANCE_DOUBLE(KC_W, KC_GRAVE), -}; +#include "dgvigil.h" enum combos { FA_GUI, @@ -70,47 +43,43 @@ combo_t key_combos[] = { [JK_CTL] = COMBO(jk_combo, KC_RCTL), }; -// LEFT THUMB KEYS -#define MUS_ESC LT(_MUS, KC_ESC) -#define NAV_BKSP LT(_NAV, KC_BSPC) -#define MOUSE_TAB LT(_MOUSE, KC_TAB) -// RIGHT THUMB KEYS -#define SYM_ENTER LT(_SYM, KC_ENTER) -#define NUM_SPC LT(_NUM, KC_SPC) -#define FUN_DEL LT(_FUN, KC_DEL) -// TAP DANCE -#define Q_ESC TD(TD_Q_ESC) -#define W_GRV TD(TD_W_GRV) const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_BASE] = LAYOUT_ansi_69( - 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_MUTE, - KC_LPAD, Q_ESC, W_GRV, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, - KC_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_HOME, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, - KC_LCTL, KC_LOPT, MUS_ESC, NAV_BKSP, MOUSE_TAB,SYM_ENTER, NUM_SPC, FUN_DEL, KC_LEFT, KC_DOWN, KC_RGHT), + 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_MUTE, + KC_LPAD, __________________BASE_L1____________________, __________________BASE_R1____________________, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, + KC_CAPS, __________________BASE_L2____________________, __________________BASE_R2____________________, KC_QUOT, KC_ENT, KC_HOME, + KC_LSFT, __________________BASE_L3____________________, SPOTLI, __________________BASE_R3____________________, KC_RSFT, KC_UP, + KC_LCTL, KC_LOPT, ___________THUMB_L3________, ___________THUMB_R3________, KC_LEFT, KC_DOWN, KC_RGHT), [_COLDH] = LAYOUT_ansi_69( 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, RGB_TOG, KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_CAPS, KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O, KC_QUOT, KC_ENT, KC_HOME, KC_LSFT, KC_Z, KC_X, KC_C, KC_D, KC_V, KC_GRV, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, - KC_LCTL, KC_LOPT, MUS_ESC, NAV_BKSP, MOUSE_TAB,SYM_ENTER, NUM_SPC, FUN_DEL, KC_LEFT, KC_DOWN, KC_RGHT), + KC_LCTL, KC_LOPT, ___________THUMB_L3________, SYM_ENTER, NUM_SPC, FUN_DEL, KC_LEFT, KC_DOWN, KC_RGHT), [_NAV] = LAYOUT_ansi_69( QK_BOOT, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, - KC_TAB, _______, _______, _______, _______, _______, _______, _______, KC_PSTE, KC_COPY, KC_CUT, KC_UNDO, KC_RBRC, KC_BSLS, KC_DEL, - KC_CAPS, _______, _______, _______, _______, _______, KC_CAPS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_QUOT, KC_ENT, KC_HOME, - KC_LSFT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_PGDN, KC_END, KC_SLSH, KC_RSFT, KC_UP, - KC_LCTL, KC_LOPT, MUS_ESC, NAV_BKSP, MOUSE_TAB,SYM_ENTER, NUM_SPC, FUN_DEL, KC_LEFT, KC_DOWN, KC_RGHT), + KC_TAB, __________________EMPTY_____________________, __________________NAV_R1____________________, KC_UNDO, KC_RBRC, KC_BSLS, KC_DEL, + KC_CAPS, __________________NAV_L2____________________, __________________NAV_R2____________________, KC_QUOT, KC_ENT, KC_HOME, + KC_LSFT, __________________NAV_L3____________________, LINUX, __________________NAV_R3____________________, KC_RSFT, KC_UP, + KC_LCTL, KC_LOPT, ___________THUMB_L3________, ___________THUMB_R3________, KC_LEFT, KC_DOWN, KC_RGHT), + + [_NUM] = LAYOUT_ansi_69( + QK_BOOT, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, + KC_TAB, __________________NUM_L1____________________, _________________BOOT_R1____________________, KC_UNDO, KC_RBRC, KC_BSLS, KC_DEL, + KC_CAPS, __________________NUM_L2____________________, __________________EMPTY_____________________, KC_QUOT, KC_ENT, KC_HOME, + KC_LSFT, __________________NUM_L3____________________, LINUX, __________________EMPTY_____________________, KC_RSFT, KC_UP, + KC_LCTL, KC_LOPT, _________NUM_TH_L3________, ___________THUMB_3__BLANK__, KC_LEFT, KC_DOWN, KC_RGHT), [_SYM] = LAYOUT_ansi_69( KC_GRV, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, RGB_TOG, - RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), + RGB_TOG, __________________SYM_L1____________________, __________________EMPTY_____________________, _______, _______, _______, _______, + _______, __________________SYM_L2____________________, __________________EMPTY_____________________, _______, _______, _______, + _______, __________________SYM_L3____________________, _______, __________________EMPTY_____________________, _______, _______, + _______, _______, _________SYM_TH_L3________, ___________THUMB_3__BLANK__, _______, _______, _______), [_FUN] = LAYOUT_ansi_69( KC_GRV, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, RGB_TOG,