Skip to content

Commit

Permalink
simplify keymap by removing raise and lower layers
Browse files Browse the repository at this point in the history
  • Loading branch information
@jdominpa
jdominpa committed Oct 9, 2024
1 parent 784ffac commit 64259f9
Show file tree
Hide file tree
Showing 6 changed files with 43 additions and 2,367 deletions.
4 changes: 0 additions & 4 deletions keyboards/kbdfans/kbd67/mkiirgb/keymaps/jdominpa/README.md
View file

This file was deleted.

2 changes: 1 addition & 1 deletion keyboards/kbdfans/kbd67/mkiirgb/keymaps/jdominpa/config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/* Mod tap */
#define TAPPING_TERM 200
#define PERMISSIVE_HOLD
#define QUICK_TAP_TERM 0
#define QUICK_TAP_TERM 50

/* Combos */
#define COMBO_TERM 30
Expand Down
102 changes: 41 additions & 61 deletions keyboards/kbdfans/kbd67/mkiirgb/keymaps/jdominpa/keymap.c
View file
Original file line number Diff line number Diff line change
@@ -1,90 +1,70 @@
#include QMK_KEYBOARD_H

/* Sticky mods */
#define OS_SHFT OSM(MOD_LSFT)
#define _OS_SHFT OSM(MOD_LSFT)

/* Layers */
#define MED_ESC LT(_MEDIA, KC_ESC)
#define NAV_SPC LT(_NAVIGATION, KC_SPC)
#define LOW_A LT(_LOWER, KC_A)
#define RAI_SCLN LT(_RAISE, KC_SCLN)
#define SYM_SPC LT(_SYMBOLS, KC_SPC)
#define TG_GAME TG(_GAMING)
/* Homerow mods */
#define _HOME_A LT(_SYMBOLS, KC_A)
#define _HOME_S LALT_T(KC_S)
#define _HOME_D LCTL_T(KC_D)
#define _HOME_F LSFT_T(KC_F)
#define _HOME_J RSFT_T(KC_J)
#define _HOME_K RCTL_T(KC_K)
#define _HOME_L LALT_T(KC_L)
#define _HOME_SCLN LT(_SYMBOLS, KC_SCLN)

#define _HOME_Z LGUI_T(KC_Z)
#define _HOME_SLSH RGUI_T(KC_SLSH)

/* Layer switching */
#define _NAV_SPC LT(_NAVIGATION, KC_SPC)
#define _TG_GAME TG(_GAMING)

/* Layers */
enum layers {
_ALPHA,
_GAMING,
_LOWER,
_RAISE,
_SYMBOLS,
_NAVIGATION,
_MEDIA,
_SYSTEM,
};

const uint16_t PROGMEM l_rai_f10_combo[] = {KC_F2, KC_F1, COMBO_END};
const uint16_t PROGMEM l_rai_f11_combo[] = {KC_F4, KC_F5, COMBO_END};
const uint16_t PROGMEM l_rai_f12_combo[] = {KC_F7, KC_F8, COMBO_END};
const uint16_t PROGMEM l_rai_f13_combo[] = {KC_F2, KC_F3, COMBO_END};
const uint16_t PROGMEM l_rai_f14_combo[] = {KC_F5, KC_F6, COMBO_END};
const uint16_t PROGMEM l_rai_f15_combo[] = {KC_F8, KC_F9, COMBO_END};

// clang-format off

combo_t key_combos[] = {
COMBO(l_rai_f10_combo, KC_F10), COMBO(l_rai_f11_combo, KC_F11), COMBO(l_rai_f12_combo, KC_F12),
COMBO(l_rai_f13_combo, KC_F13), COMBO(l_rai_f14_combo, KC_F14), COMBO(l_rai_f15_combo, KC_F15),
};

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_ALPHA] = LAYOUT_65_ansi_blocker( /* Alphas layer */
KC_GRV, 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_DEL,
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, XXXXXXX,
MED_ESC, LOW_A, LGUI_T(KC_S), LALT_T(KC_D), LCTL_T(KC_F), KC_G, KC_H, RCTL_T(KC_J), RALT_T(KC_K), RGUI_T(KC_L), RAI_SCLN, KC_QUOT, KC_ENT, TG_GAME,
OS_SHFT, KC_Z, KC_X, KC_C, LSFT_T(KC_V), KC_B, KC_N, RSFT_T(KC_M), KC_COMM, KC_DOT, KC_SLSH, OS_SHFT, KC_UP, XXXXXXX,
KC_LCTL, KC_LGUI, KC_LALT, NAV_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT),
KC_GRV, 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_DEL,
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, MO(_SYSTEM),
KC_ESC, _HOME_A, _HOME_S, _HOME_D, _HOME_F, KC_G, KC_H, _HOME_J, _HOME_K, _HOME_L, _HOME_SCLN, KC_QUOT, KC_ENT, _TG_GAME,
_OS_SHFT, _HOME_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, _HOME_SLSH, _OS_SHFT, KC_UP, XXXXXXX,
KC_LCTL, KC_LGUI, KC_LALT, _NAV_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT),

[_GAMING] = LAYOUT_65_ansi_blocker( /* Gaming layer */
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_DEL,
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, MO(_MEDIA),
KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, TG_GAME,
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_UP, MO(_RAISE),
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT),

/* NOTE: the position of the @ symbol can be improved in a keyboard with thumb keys */
[_LOWER] = LAYOUT_65_ansi_blocker( /* Lower layer */
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
XXXXXXX, XXXXXXX, KC_LCBR, KC_RCBR, KC_BSLS, KC_DLR, XXXXXXX, KC_7, KC_8, KC_9, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
XXXXXXX, XXXXXXX, KC_LPRN, KC_RPRN, KC_DQUO, KC_QUOT, XXXXXXX, KC_4, KC_5, KC_6, KC_DOT, XXXXXXX, XXXXXXX, XXXXXXX,
OS_SHFT, KC_AT, KC_LBRC, KC_RBRC, KC_QUES, KC_GRV, KC_0, KC_1, KC_2, KC_3, XXXXXXX, OS_SHFT, XXXXXXX, XXXXXXX,
XXXXXXX, XXXXXXX, XXXXXXX, SYM_SPC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX),

/* NOTE: the position of the % symbol can be improved in a keyboard with thumb keys */
[_RAISE] = LAYOUT_65_ansi_blocker( /* Raise layer */
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
XXXXXXX, XXXXXXX, KC_F9, KC_F8, KC_F7, XXXXXXX, KC_AMPR, KC_CIRC, KC_ASTR, KC_SLASH, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
XXXXXXX, XXXXXXX, KC_F6, KC_F5, KC_F4, KC_PERC, KC_HASH, KC_EQL, KC_PLUS, KC_MINS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
OS_SHFT, XXXXXXX, KC_F3, KC_F2, KC_F1, XXXXXXX, KC_EXLM, KC_UNDS, KC_PIPE, KC_TILD, XXXXXXX, OS_SHFT, XXXXXXX, XXXXXXX,
XXXXXXX, XXXXXXX, XXXXXXX, SYM_SPC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX),
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_DEL,
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, MO(_SYSTEM),
KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, _TG_GAME,
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_UP, MO(_NAVIGATION),
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT),

[_SYMBOLS] = LAYOUT_65_ansi_blocker( /* Symbols layer */
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
XXXXXXX, XXXXXXX, KC_LCBR, KC_RCBR, KC_BSLS, KC_DLR, KC_AMPR, KC_CIRC, KC_ASTR, KC_SLASH, KC_PERC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
XXXXXXX, KC_AT, KC_LPRN, KC_RPRN, KC_DQUO, KC_QUOT, KC_HASH, KC_EQL, KC_PLUS, KC_MINS, KC_DOT, XXXXXXX, XXXXXXX, XXXXXXX,
OS_SHFT, XXXXXXX, KC_LBRC, KC_RBRC, KC_QUES, KC_GRV, KC_EXLM, KC_UNDS, KC_PIPE, KC_TILD, XXXXXXX, OS_SHFT, XXXXXXX, XXXXXXX,
[_SYMBOLS] = LAYOUT_65_ansi_blocker( /* Symbol layer */
XXXXXXX, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, XXXXXXX, XXXXXXX,
XXXXXXX, KC_AT, KC_LCBR, KC_RCBR, KC_BSLS, KC_DLR, KC_AMPR, KC_CIRC, KC_ASTR, KC_SLASH, KC_PERC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
XXXXXXX, KC_QUOT, KC_LPRN, KC_RPRN, KC_DQUO, KC_SCLN, KC_PIPE, KC_EQL, KC_PLUS, KC_MINS, KC_EXLM, XXXXXXX, XXXXXXX, XXXXXXX,
XXXXXXX, KC_GRV, KC_LBRC, KC_RBRC, KC_HASH, KC_COLN, KC_TILD, KC_UNDS, KC_LABK, KC_RABK, KC_QUES, XXXXXXX, XXXXXXX, XXXXXXX,
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX),

[_NAVIGATION] = LAYOUT_65_ansi_blocker( /* Navigation and editing layer */
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT,
XXXXXXX, XXXXXXX, KC_ESC, KC_PGUP, KC_INS, XXXXXXX, XXXXXXX, KC_ENT, KC_BSPC, KC_DEL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
KC_CAPS, XXXXXXX, KC_LGUI, KC_LALT, KC_LCTL, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, XXXXXXX, XXXXXXX,
XXXXXXX, XXXXXXX, KC_RALT, KC_PGDN, KC_LSFT, XXXXXXX, XXXXXXX, KC_TAB, KC_HOME, KC_END, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
[_NAVIGATION] = LAYOUT_65_ansi_blocker( /* Navigation layer */
XXXXXXX, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, XXXXXXX, QK_BOOT,
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_ENT, KC_BSPC, KC_DEL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
KC_CAPS, KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, XXXXXXX, XXXXXXX,
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_HOME, KC_PGDN, KC_PGUP, KC_END, XXXXXXX, XXXXXXX, XXXXXXX,
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX),

[_MEDIA] = LAYOUT_65_ansi_blocker( /* Media layer */
[_SYSTEM] = LAYOUT_65_ansi_blocker( /* Media layer */
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
XXXXXXX, XXXXXXX, KC_MPLY, KC_MPRV, KC_MNXT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
XXXXXXX, XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_ESC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX),
};

Expand Down
Loading

0 comments on commit 64259f9

Please sign in to comment.