aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFredric Silberberg <fred@silberberg.xyz>2017-08-26 23:43:28 -0700
committerJack Humbert <jack.humb@gmail.com>2017-08-30 11:28:56 -0400
commit00d8f0c082a8e9fe447683a01961b1474aa5a02a (patch)
tree90d7e942170d138644e9e4de2979061293c796ef
parenta729d852fe502d62e09bab1a31f49b738f8892e4 (diff)
downloadqmk_firmware-00d8f0c082a8e9fe447683a01961b1474aa5a02a.tar.gz
qmk_firmware-00d8f0c082a8e9fe447683a01961b1474aa5a02a.zip
Small gaming layer and formatting updates to my nyquist config.
Diffstat
-rw-r--r--keyboards/nyquist/keymaps/333fred/keymap.c48
1 files changed, 24 insertions, 24 deletions
diff --git a/keyboards/nyquist/keymaps/333fred/keymap.c b/keyboards/nyquist/keymaps/333fred/keymap.c
index 2edfeefe7..dfbcd5285 100644
--- a/keyboards/nyquist/keymaps/333fred/keymap.c
+++ b/keyboards/nyquist/keymaps/333fred/keymap.c
@@ -35,11 +35,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
35 * `-----------------------------------------------------------------------------------' 35 * `-----------------------------------------------------------------------------------'
36 */ 36 */
37[_QWERTY] = KEYMAP( \ 37[_QWERTY] = KEYMAP( \
38 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, \ 38 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, \
39 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLASH, \ 39 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLASH, \
40 KC_ESC, KC_A, KC_S, KC_D, LT(_VIM, KC_F), KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ 40 KC_ESC, KC_A, KC_S, KC_D, LT(_VIM, KC_F), KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \
41 OSM(MOD_LSFT), LCTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, RCTL_T(KC_SLSH), OSM(MOD_RSFT), \ 41 OSM(MOD_LSFT), LCTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, RCTL_T(KC_SLSH), OSM(MOD_RSFT), \
42 KC_LCTL, KC_LALT, KC_F4, KC_LGUI, OSL(_LOWER), KC_BSPC, KC_SPC, KC_ENT, KC_LOCK, KC_EQL, TG(_GAME), KC_DEL \ 42 KC_LCTL, KC_LALT, KC_F4, KC_LGUI, OSL(_LOWER), KC_BSPC, KC_SPC, KC_ENT, KC_LOCK, KC_EQL, TG(_GAME), KC_DEL \
43), 43),
44 44
45/* Lower 45/* Lower
@@ -56,11 +56,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
56 * `-----------------------------------------------------------------------------------' 56 * `-----------------------------------------------------------------------------------'
57 */ 57 */
58[_LOWER] = KEYMAP( \ 58[_LOWER] = KEYMAP( \
59 KC_CAPS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, \ 59 KC_CAPS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, \
60 _______, KC_EXLM, KC_AT, KC_LPRN, KC_RPRN, KC_PIPE, KC_7, KC_8, KC_9, KC_ASTR, KC_RPRN, KC_F12, \ 60 _______, KC_EXLM, KC_AT, KC_LPRN, KC_RPRN, KC_PIPE, KC_7, KC_8, KC_9, KC_ASTR, KC_RPRN, KC_F12, \
61 _______, KC_HASH, KC_DLR, KC_LCBR, KC_RCBR, KC_GRV, KC_4, KC_5, KC_6, KC_PLUS, KC_RCBR, KC_PIPE, \ 61 _______, KC_HASH, KC_DLR, KC_LCBR, KC_RCBR, KC_GRV, KC_4, KC_5, KC_6, KC_PLUS, KC_RCBR, KC_PIPE, \
62 M(PSCREEN_APP), KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD, KC_1, KC_2, KC_3, KC_BSLS, KC_VOLD, KC_VOLU, \ 62 M(PSCREEN_APP), KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD, KC_1, KC_2, KC_3, KC_BSLS, KC_VOLD, KC_VOLU, \
63 KC_PSCR, _______, _______, _______, _______, _______, KC_0, KC_DOT, KC_EQL, KC_MPRV, KC_MNXT, KC_MPLY \ 63 KC_PSCR, _______, _______, _______, _______, _______, KC_0, KC_DOT, KC_EQL, KC_MPRV, KC_MNXT, KC_MPLY \
64), 64),
65 65
66/* Vim Movement (Hold down F) 66/* Vim Movement (Hold down F)
@@ -77,11 +77,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
77 * `-----------------------------------------------------------------------------------' 77 * `-----------------------------------------------------------------------------------'
78 */ 78 */
79[_VIM] = KEYMAP( \ 79[_VIM] = KEYMAP( \
80 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ 80 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
81 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ 81 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
82 _______, M(DLEFT), M(DRIGHT), KC_LCTL, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, \ 82 _______, M(DLEFT), M(DRIGHT), KC_LCTL, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, \
83 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ 83 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
84 _______, _______, _______, _______, KC_LSFT, _______, _______, _______, _______, _______, _______, _______ \ 84 _______, _______, _______, _______, KC_LSFT, _______, _______, _______, _______, _______, _______, _______ \
85), 85),
86 86
87/* Gaming mode (Raise) 87/* Gaming mode (Raise)
@@ -93,24 +93,24 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
93 * |------+------+------+------+------+------+------+------+------+------+------+------| 93 * |------+------+------+------+------+------+------+------+------+------+------+------|
94 * | CTRL | | | | F | | | | | | | | 94 * | CTRL | | | | F | | | | | | | |
95 * |------+------+------+------+------+------+------+------+------+------+------+------| 95 * |------+------+------+------+------+------+------+------+------+------+------+------|
96 * | Shift| Z | | | | | | | | | | | 96 * | Shift| Z | | | | | | | | | | GUI |
97 * |------+------+------+------+------+------+------+------+------+------+------+------| 97 * |------+------+------+------+------+------+------+------+------+------+------+------|
98 * | Enter| | Lock | | Alt | Spc | Lower| Left | Up | Down | Right|QWERTY| 98 * | Enter| | Lock | Bksp | Alt | Spc | Lower| Left | Up | Down | Right|QWERTY|
99 * `-----------------------------------------------------------------------------------' 99 * `-----------------------------------------------------------------------------------'
100 */ 100 */
101[_GAME] = KEYMAP( \ 101[_GAME] = KEYMAP( \
102 KC_ESC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ 102 KC_ESC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
103 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ 103 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
104 KC_LCTL, _______, _______, _______, KC_F, _______, _______, _______, _______, _______, _______, _______, \ 104 KC_LCTL, _______, _______, _______, KC_F, _______, _______, _______, _______, _______, _______, _______, \
105 KC_LSFT, KC_Z, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ 105 KC_LSFT, KC_Z, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LGUI, \
106 KC_ENT, _______, KC_LOCK, _______, KC_LALT, KC_SPC, OSL(_LOWER), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, TO(_QWERTY) \ 106 KC_ENT, _______, KC_LOCK, KC_BSPC, KC_LALT, KC_SPC, OSL(_LOWER), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, TO(_QWERTY) \
107) 107)
108 108
109}; 109};
110 110
111void persistent_default_layer_set(uint16_t default_layer) { 111void persistent_default_layer_set(uint16_t default_layer) {
112 eeconfig_update_default_layer(default_layer); 112 eeconfig_update_default_layer(default_layer);
113 default_layer_set(default_layer); 113 default_layer_set(default_layer);
114} 114}
115 115
116const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { 116const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-03 17:49:10 +0000