aboutsummaryrefslogtreecommitdiff
path: root/users/mattly
diff options
context:
space:
mode:
authorMatthew Lyon <matthew@lyonheart.us>2019-10-05 12:22:52 -0700
committerDrashna Jaelre <drashna@live.com>2019-10-05 12:22:52 -0700
commit03c132b33124630ab64e7f6370be9419e7a26b04 (patch)
tree928b4c87b60a1cfeb9ea5a4b6a6f302e043f4241 /users/mattly
parent3e20697a33ddb5ce22e91dc786b8de3ff3c74f0c (diff)
downloadqmk_firmware-03c132b33124630ab64e7f6370be9419e7a26b04.tar.gz
qmk_firmware-03c132b33124630ab64e7f6370be9419e7a26b04.zip
[Keymap] finally committing my updates (#6904)
Diffstat (limited to 'users/mattly')
-rw-r--r--users/mattly/mattly.h37
1 files changed, 26 insertions, 11 deletions
diff --git a/users/mattly/mattly.h b/users/mattly/mattly.h
index 08318840d..da09ddcdb 100644
--- a/users/mattly/mattly.h
+++ b/users/mattly/mattly.h
@@ -26,36 +26,50 @@ enum {
26 _FUNCT, 26 _FUNCT,
27}; 27};
28 28
29// == Thumbs
29// left hand 30// left hand
30#define ESC_HYP MT(MOD_HYPR, KC_ESC) 31#define ESC_HYP MT(MOD_HYPR, KC_ESC)
31#define BSP_NUM LT(_NAVNUM, KC_BSPC) 32#define TAB_NUM LT(_NAVNUM, KC_TAB)
32#define ENT_SFT MT(MOD_LSFT, KC_ENT)
33#define SPC_SFT MT(MOD_LSFT, KC_SPC) 33#define SPC_SFT MT(MOD_LSFT, KC_SPC)
34#define ENT_SYM LT(_SYMBOL, KC_ENT)
35
34 36
35// right hand 37// right hand
36#define SPC_SFT MT(MOD_LSFT, KC_SPC) 38#define SPC_SFT MT(MOD_LSFT, KC_SPC)
37#define TAB_SYM LT(_SYMBOL, KC_TAB) 39#define BSP_SYM LT(_SYMBOL, KC_BSPC)
38#define DEL_WRP MT(MOD_LCTL | MOD_LALT | MOD_LGUI, KC_DEL) 40#define DEL_WRP MT(MOD_LCTL | MOD_LALT | MOD_LGUI, KC_DEL)
39 41
40#define NAVLOCK TG(_NAVNUM) 42#define NAVLOCK TG(_NAVNUM)
41#define SYMLOCK TG(_SYMBOL) 43#define SYMLOCK TG(_SYMBOL)
42 44
43 45
44// QWERTY 46// == QWERTY
45 47// left hand home row
46#define A_CTRL MT(MOD_LCTL, KC_A) 48#define A_CTRL MT(MOD_LCTL, KC_A)
47#define S_ALT MT(MOD_LALT, KC_S) 49#define S_ALT MT(MOD_LALT, KC_S)
48#define D_GUI MT(MOD_LGUI, KC_D) 50#define D_GUI MT(MOD_LGUI, KC_D)
49#define F_SHFT MT(MOD_LSFT, KC_F) 51#define F_SHFT MT(MOD_LSFT, KC_F)
52// left hand aux
53#define W_CTRL MT(MOD_LCTL, KC_W)
54#define E_ALT MT(MOD_LALT, KC_E)
55#define R_GUI MT(MOD_LGUI, KC_R)
56
57// right hand home row
50#define J_SHFT MT(MOD_RSFT, KC_J) 58#define J_SHFT MT(MOD_RSFT, KC_J)
51#define K_GUI MT(MOD_RGUI, KC_K) 59#define K_GUI MT(MOD_RGUI, KC_K)
52#define L_ALT MT(MOD_RALT, KC_L) 60#define L_ALT MT(MOD_RALT, KC_L)
53#define MINSCTL MT(MOD_RCTL, KC_MINS) 61#define MINSCTL MT(MOD_RCTL, KC_MINS)
62// right hand aux
63#define U_GUI MT(MOD_RGUI, KC_U)
64#define I_ALT MT(MOD_RALT, KC_I)
65#define O_CTRL MT(MOD_RCTL, KC_O)
54 66
67// == OS X default keys
68// movement by word
55#define BWORD LALT(KC_LEFT) 69#define BWORD LALT(KC_LEFT)
56#define FWORD LALT(KC_RIGHT) 70#define FWORD LALT(KC_RIGHT)
57 71
58// OS X default keys 72// gui navigation
59#define NWIN LGUI(KC_GRV) // Next Window 73#define NWIN LGUI(KC_GRV) // Next Window
60#define PWIN LGUI(LSFT(KC_GRV)) // Prev Window 74#define PWIN LGUI(LSFT(KC_GRV)) // Prev Window
61#define NTAB LGUI(LSFT(KC_RBRC)) // Next Tab 75#define NTAB LGUI(LSFT(KC_RBRC)) // Next Tab
@@ -70,12 +84,13 @@ enum {
70#define XPRVSPC HYPR(KC_F17) 84#define XPRVSPC HYPR(KC_F17)
71#define XNOTIFY HYPR(KC_F18) 85#define XNOTIFY HYPR(KC_F18)
72 86
87// == UNDERGLOW
73#ifdef RGBLIGHT_ENABLE 88#ifdef RGBLIGHT_ENABLE
74#define HSV_CAPS 42, 255, 255 89#define HSV_CAPS 60, 255, 255
75#define HSV_DEFAULT 30, 218, 255 90#define HSV_DEFAULT 30, 255, 255
76#define HSV_SYMBOL 22, 255, 255 91#define HSV_SYMBOL 18, 255, 255
77#define HSV_NAVNUM 245, 200, 255 92#define HSV_NAVNUM 250, 255, 255
78#define HSV_FUNCT 233, 255, 255 93#define HSV_FUNCT 238, 255, 255
79#define HSV_RESET 180, 255, 255 94#define HSV_RESET 180, 255, 255
80#endif 95#endif
81 96