aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--keyboards/ergodox_ez/ergodox_ez.h61
-rw-r--r--keyboards/ergodox_ez/keymaps/drashna/keymap.c251
-rw-r--r--users/drashna/drashna.h1
3 files changed, 147 insertions, 166 deletions
diff --git a/keyboards/ergodox_ez/ergodox_ez.h b/keyboards/ergodox_ez/ergodox_ez.h
index 4433dbe6d..d6fa30bb2 100644
--- a/keyboards/ergodox_ez/ergodox_ez.h
+++ b/keyboards/ergodox_ez/ergodox_ez.h
@@ -188,6 +188,67 @@ inline void ergodox_led_all_set(uint8_t n)
188 { k0D, k1D, k2D, k3D, k4D, KC_NO } \ 188 { k0D, k1D, k2D, k3D, k4D, KC_NO } \
189 } 189 }
190 190
191#define KEYMAP_PRETTY( \
192 /* left hand, spatial positions */ /* right hand, spatial positions */ \
193 L00,L01,L02,L03,L04,L05,L06, R00,R01,R02,R03,R04,R05,R06, \
194 L10,L11,L12,L13,L14,L15,L16, R10,R11,R12,R13,R14,R15,R16, \
195 L20,L21,L22,L23,L24,L25, R21,R22,R23,R24,R25,R26, \
196 L30,L31,L32,L33,L34,L35,L36, R30,R31,R32,R33,R34,R35,R36, \
197 L40,L41,L42,L43,L44, R42,R43,R44,R45,R46, \
198 L55,L56, R50,R51, \
199 L54, R52, \
200 L53,L52,L51, R55,R54,R53 ) \
201 \
202 /* matrix positions */ \
203 { \
204 { L00, L10, L20, L30, L40, KC_NO }, \
205 { L01, L11, L21, L31, L41, L51 }, \
206 { L02, L12, L22, L32, L42, L52 }, \
207 { L03, L13, L23, L33, L43, L53 }, \
208 { L04, L14, L24, L34, L44, L54 }, \
209 { L05, L15, L25, L35, KC_NO, L55 }, \
210 { L06, L16, KC_NO, L36, KC_NO, L56 }, \
211 \
212 { R00, R10, KC_NO, R30,KC_NO, R50 }, \
213 { R01, R11, R21, R31,KC_NO, R51 }, \
214 { R02, R12, R22, R32, R42, R52 }, \
215 { R03, R13, R23, R33, R43, R53 }, \
216 { R04, R14, R24, R34, R44, R54 }, \
217 { R05, R15, R25, R35, R45, R55 }, \
218 { R06, R16, R26, R36, R46, KC_NO } \
219 }
220
221#define KEYMAP_PRETTY_80( \
222 /* left hand, spatial positions */ /* right hand, spatial positions */ \
223 L00,L01,L02,L03,L04,L05,L06, R00,R01,R02,R03,R04,R05,R06, \
224 L10,L11,L12,L13,L14,L15,L16, R10,R11,R12,R13,R14,R15,R16, \
225 L20,L21,L22,L23,L24,L25, R21,R22,R23,R24,R25,R26, \
226 L30,L31,L32,L33,L34,L35,L36, R30,R31,R32,R33,R34,R35,R36, \
227 L40,L41,L42,L43,L44, R42,R43,R44,R45,R46, \
228 L55,L56, R50,R51, \
229 L45,L46,L54, R52,R40,R41, \
230 L53,L52,L51, R55,R54,R53 ) \
231 \
232 /* matrix positions */ \
233 { \
234 { L00, L10, L20, L30, L40, KC_NO }, \
235 { L01, L11, L21, L31, L41, L51 }, \
236 { L02, L12, L22, L32, L42, L52 }, \
237 { L03, L13, L23, L33, L43, L53 }, \
238 { L04, L14, L24, L34, L44, L54 }, \
239 { L05, L15, L25, L35, L45, L55 }, \
240 { L06, L16, KC_NO, L36, L46, L56 }, \
241 \
242 { R00, R10, KC_NO, R30, R40, R50 }, \
243 { R01, R11, R21, R31, R41, R51 }, \
244 { R02, R12, R22, R32, R42, R52 }, \
245 { R03, R13, R23, R33, R43, R53 }, \
246 { R04, R14, R24, R34, R44, R54 }, \
247 { R05, R15, R25, R35, R45, R55 }, \
248 { R06, R16, R26, R36, R46, KC_NO } \
249 }
250
191#define LAYOUT_ergodox KEYMAP 251#define LAYOUT_ergodox KEYMAP
252#define LAYOUT_ergodox_pretty KEYMAP_PRETTY
192 253
193#endif 254#endif
diff --git a/keyboards/ergodox_ez/keymaps/drashna/keymap.c b/keyboards/ergodox_ez/keymaps/drashna/keymap.c
index aeadbb1fc..1b30196ec 100644
--- a/keyboards/ergodox_ez/keymaps/drashna/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/drashna/keymap.c
@@ -52,25 +52,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
52 * | | | End | | PgDn | | | 52 * | | | End | | PgDn | | |
53 * `---------------------' `---------------------' 53 * `---------------------' `---------------------'
54 */ 54 */
55 [_QWERTY] = LAYOUT_ergodox_wrapper( 55 [_QWERTY] = LAYOUT_ergodox_pretty_wrapper(
56 KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, OSL(_MOUS), 56 // left hand // right hand
57 KC_TAB, _________________QWERTY_L1_________________, TG(_DIABLO), 57 KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, OSL(_MOUS), OSL(_MOUS), KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
58 KC_BSPC, _________________QWERTY_L2_________________, 58 KC_TAB, _________________QWERTY_L1_________________, TG(_DIABLO), TG(_DIABLO), _________________QWERTY_R1_________________, KC_BSLS,
59 KC_MLSF, _________________QWERTY_L3_________________, TG(_GAMEPAD), 59 TG(_MODS), _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, GUI_T(KC_QUOT),
60 LT(_SYMB,KC_GRV), ___________ERGODOX_BOTTOM_LEFT_____________, 60 KC_MLSF, _________________QWERTY_L3_________________, TG(_GAMEPAD), TG(_GAMEPAD), _________________QWERTY_R3_________________, KC_MRSF,
61 61 LT(_SYMB,KC_GRV), ___________ERGODOX_BOTTOM_LEFT_____________, ___________ERGODOX_BOTTOM_RIGHT____________, TT(_SYMB),
62 ALT_T(KC_APP), KC_LGUI, 62 ALT_T(KC_APP), KC_LGUI, KC_RGUI, CTL_T(KC_ESCAPE),
63 KC_HOME, 63 KC_HOME, KC_PGUP,
64 KC_SPACE,KC_BSPC, KC_END, 64 KC_SPACE,KC_BSPC, KC_END, KC_PGDN, KC_DEL, KC_ENTER
65
65 66
66 OSL(_MOUS), KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
67 TG(_DIABLO), _________________QWERTY_R1_________________, KC_BSLS,
68 _________________QWERTY_R2_________________, GUI_T(KC_QUOT),
69 TG(_GAMEPAD), _________________QWERTY_R3_________________, KC_MRSF,
70 ___________ERGODOX_BOTTOM_RIGHT____________, TT(_SYMB),
71 KC_RGUI, CTL_T(KC_ESCAPE),
72 KC_PGUP,
73 KC_PGDOWN, KC_DELETE, KC_ENTER
74 ), 67 ),
75/* Keymap 0: Basic layer 68/* Keymap 0: Basic layer
76 * 69 *
@@ -95,25 +88,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
95 */ 88 */
96// If it accepts an argument (i.e, is a function), it doesn't need KC_. 89// If it accepts an argument (i.e, is a function), it doesn't need KC_.
97// Otherwise, it needs KC_* 90// Otherwise, it needs KC_*
98[_COLEMAK] = LAYOUT_ergodox_wrapper( 91[_COLEMAK] = LAYOUT_ergodox_pretty_wrapper(
99 // left hand 92 // left hand // right hand
100 KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, OSL(_MOUS), 93 KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, OSL(_MOUS), OSL(_MOUS), KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
101 KC_TAB, _________________COLEMAK_L1________________, TG(_DIABLO), 94 KC_TAB, _________________COLEMAK_L1________________, TG(_DIABLO), TG(_DIABLO), _________________COLEMAK_R1________________, KC_BSLS,
102 KC_BSPC, _________________COLEMAK_L2________________, 95 TG(_MODS), _________________COLEMAK_L2________________, _________________COLEMAK_R2________________, GUI_T(KC_QUOT),
103 KC_MLSF, _________________COLEMAK_L3________________, TG(_GAMEPAD), 96 KC_MLSF, _________________COLEMAK_L3________________, TG(_GAMEPAD), TG(_GAMEPAD), _________________COLEMAK_R3________________, KC_MRSF,
104 LT(_SYMB,KC_GRV), ___________ERGODOX_BOTTOM_LEFT_____________, 97 LT(_SYMB,KC_GRV), ___________ERGODOX_BOTTOM_LEFT_____________, ___________ERGODOX_BOTTOM_RIGHT____________, TT(_SYMB),
105 ALT_T(KC_APP), KC_LGUI, 98 ALT_T(KC_APP), KC_LGUI, KC_RGUI, CTL_T(KC_ESCAPE),
106 KC_HOME, 99 KC_HOME, KC_PGUP,
107 KC_SPACE,KC_BSPC, KC_END, 100 KC_SPACE,KC_BSPC, KC_END, KC_PGDN, KC_DEL, KC_ENTER
108 // right hand
109 OSL(_MOUS), KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
110 TG(_DIABLO), _________________COLEMAK_R1________________, KC_BSLS,
111 _________________COLEMAK_R2________________, GUI_T(KC_QUOT),
112 TG(_GAMEPAD), _________________COLEMAK_R3________________, KC_MRSF,
113 ___________ERGODOX_BOTTOM_RIGHT____________, TT(_SYMB),
114 KC_RGUI, CTL_T(KC_ESCAPE),
115 KC_PGUP,
116 KC_PGDOWN, KC_DELETE, KC_ENTER
117 ), 101 ),
118/* Keymap 0: Basic layer 102/* Keymap 0: Basic layer
119 * 103 *
@@ -138,25 +122,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
138 */ 122 */
139// If it accepts an argument (i.e, is a function), it doesn't need KC_. 123// If it accepts an argument (i.e, is a function), it doesn't need KC_.
140// Otherwise, it needs KC_* 124// Otherwise, it needs KC_*
141[_DVORAK] = LAYOUT_ergodox_wrapper( 125[_DVORAK] = LAYOUT_ergodox_pretty_wrapper(
142 // left hand 126 // left hand // right hand
143 KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, OSL(_MOUS), 127 KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, OSL(_MOUS), OSL(_MOUS), KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLS,
144 KC_TAB, _________________DVORAK_L1_________________, TG(_DIABLO), 128 KC_TAB, _________________DVORAK_L1_________________, TG(_DIABLO), TG(_DIABLO), _________________DVORAK_R1_________________, KC_SLSH,
145 KC_BSPC, _________________DVORAK_L2_________________, 129 TG(_MODS), _________________DVORAK_L2_________________, _________________DVORAK_R2_________________, GUI_T(KC_MINS),
146 KC_MLSF, _________________DVORAK_L3_________________, TG(_GAMEPAD), 130 KC_MLSF, _________________DVORAK_L3_________________, TG(_GAMEPAD), TG(_GAMEPAD), _________________DVORAK_R3_________________, KC_MRSF,
147 LT(_SYMB,KC_GRV), ___________ERGODOX_BOTTOM_LEFT_____________, 131 LT(_SYMB,KC_GRV), ___________ERGODOX_BOTTOM_LEFT_____________, ___________ERGODOX_BOTTOM_RIGHT____________, TT(_SYMB),
148 ALT_T(KC_APP), KC_LGUI, 132 ALT_T(KC_APP), KC_LGUI, KC_RGUI, CTL_T(KC_ESCAPE),
149 KC_HOME, 133 KC_HOME, KC_PGUP,
150 KC_SPACE,KC_BSPC, KC_END, 134 KC_SPACE,KC_BSPC, KC_END, KC_PGDN, KC_DEL, KC_ENTER
151 // right hand
152 OSL(_MOUS), KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLS,
153 TG(_DIABLO), _________________DVORAK_R1_________________, KC_SLSH,
154 _________________DVORAK_R2_________________, GUI_T(KC_MINS),
155 TG(_GAMEPAD), _________________DVORAK_R3_________________, KC_MRSF,
156 ___________ERGODOX_BOTTOM_RIGHT____________, TT(_SYMB),
157 KC_RGUI, CTL_T(KC_ESCAPE),
158 KC_PGUP,
159 KC_PGDOWN, KC_DELETE, KC_ENTER
160 ), 135 ),
161/* Keymap 0: Basic layer 136/* Keymap 0: Basic layer
162 * 137 *
@@ -181,45 +156,27 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
181 */ 156 */
182// If it accepts an argument (i.e, is a function), it doesn't need KC_. 157// If it accepts an argument (i.e, is a function), it doesn't need KC_.
183// Otherwise, it needs KC_* 158// Otherwise, it needs KC_*
184[_WORKMAN] = LAYOUT_ergodox_wrapper( 159[_WORKMAN] = LAYOUT_ergodox_pretty_wrapper(
185 // left hand 160 // left hand
186 KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, OSL(_MOUS), 161 KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, OSL(_MOUS), OSL(_MOUS), KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
187 KC_TAB, _________________WORKMAN_L1________________, TG(_DIABLO), 162 KC_TAB, _________________WORKMAN_L1________________, TG(_DIABLO), TG(_DIABLO), _________________WORKMAN_R1________________, KC_BSLS,
188 KC_BSPC, _________________WORKMAN_L2________________, 163 TG(_MODS), _________________WORKMAN_L2________________, _________________WORKMAN_R2________________, GUI_T(KC_QUOT),
189 KC_MLSF, _________________WORKMAN_L3________________, TG(_GAMEPAD), 164 KC_MLSF, _________________WORKMAN_L3________________, TG(_GAMEPAD), TG(_GAMEPAD), _________________WORKMAN_R3________________, KC_MRSF,
190 LT(_SYMB,KC_GRV), ___________ERGODOX_BOTTOM_LEFT_____________, 165 LT(_SYMB,KC_GRV), ___________ERGODOX_BOTTOM_LEFT_____________, ___________ERGODOX_BOTTOM_RIGHT____________, TT(_SYMB),
191 ALT_T(KC_APP), KC_LGUI, 166 ALT_T(KC_APP), KC_LGUI, KC_RGUI, CTL_T(KC_ESCAPE),
192 KC_HOME, 167 KC_HOME, KC_PGUP,
193 KC_SPACE,KC_BSPC, KC_END, 168 KC_SPACE,KC_BSPC, KC_END, KC_PGDN, KC_DEL, KC_ENTER
194 // right hand
195 OSL(_MOUS), KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
196 TG(_DIABLO), _________________WORKMAN_R1________________, KC_BSLS,
197 _________________WORKMAN_R2________________, GUI_T(KC_QUOT),
198 TG(_GAMEPAD), _________________WORKMAN_R3________________, KC_MRSF,
199 ___________ERGODOX_BOTTOM_RIGHT____________, TT(_SYMB),
200 KC_RGUI, CTL_T(KC_ESCAPE),
201 KC_PGUP,
202 KC_PGDOWN, KC_DELETE, KC_ENTER
203 ), 169 ),
204 170
205 [_MODS] = LAYOUT_ergodox( 171 [_MODS] = LAYOUT_ergodox_pretty(
206 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 172 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
207 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 173 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
208 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 174 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
209 KC_LSFT,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 175 KC_LSFT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_RSFT,
210 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 176 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
211 KC_TRNS, KC_TRNS, 177 _______, _______, _______, _______,
212 KC_TRNS, 178 _______, _______,
213 KC_TRNS, KC_TRNS, KC_TRNS, 179 _______, _______, _______, _______, _______, _______
214
215 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
216 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
217 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
218 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_RSFT,
219 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
220 KC_TRNS, KC_TRNS,
221 KC_TRNS,
222 KC_TRNS, KC_TRNS, KC_TRNS
223 ), 180 ),
224 181
225 /* Keymap 3: Symbol Layer 182 /* Keymap 3: Symbol Layer
@@ -243,24 +200,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
243* | DARK |BRITE | BLUE | | | | | 200* | DARK |BRITE | BLUE | | | | |
244* `--------------------' `--------------------' 201* `--------------------' `--------------------'
245*/ 202*/
246 [_SYMB] = LAYOUT_ergodox( 203 [_SYMB] = LAYOUT_ergodox_pretty(
247 EPRM, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, TG(_MODS), 204 EPRM, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_QWERTY, KC_QWERTY, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
248 KC_RESET, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_PIPE, KC_WORKMAN, 205 KC_RESET, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_PIPE, KC_WORKMAN, KC_DVORAK, KC_PPLS, KC_KP_7, KC_KP_8, KC_KP_9, KC_PAST, KC_F12,
249 KC_MAKE, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_GRAVE, 206 KC_MAKE, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_GRAVE, KC_PMNS, KC_KP_4, KC_KP_5, KC_KP_6, KC_PSLS, KC_PSCREEN,
250 VRSN, KC_PERC, KC_CIRC, KC_LBRACKET,KC_RBRACKET,KC_TILD, KC_COLEMAK, 207 VRSN, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD, KC_COLEMAK, KC_COLEMAK, KC_NLCK, KC_KP_1, KC_KP_2, KC_KP_3, KC_PEQL, KC_PAUSE,
251 KC_TRNS, KC_AMPR, KC_ASTR, KC_COLN, KC_SCOLON, 208 KC_TRNS, KC_AMPR, KC_ASTR, KC_COLN, KC_SCLN, KC_KP_0, KC_KP_0, KC_PDOT, KC_PENT, KC_TRNS,
252 RGB_SMOD, KC_RGB_T, 209 RGB_SMOD, KC_RGB_T, KC_TRNS, KC_TRNS,
253 RGB_HUI, 210 RGB_HUI, KC_TRNS,
254 RGB_M_R, RGB_M_SW, RGB_HUD, 211 RGB_M_R, RGB_M_SW, RGB_HUD, KC_PDOT, KC_KP_0, KC_PENT
255
256 KC_QWERTY, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
257 KC_DVORAK, KC_KP_PLUS, KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_ASTERISK, KC_F12,
258 KC_KP_MINUS,KC_KP_4, KC_KP_5, KC_KP_6, KC_KP_SLASH, KC_PSCREEN,
259 KC_COLEMAK, KC_NUMLOCK, KC_KP_1, KC_KP_2, KC_KP_3, KC_EQUAL, KC_PAUSE,
260 KC_KP_0, KC_KP_0, KC_KP_DOT, KC_KP_ENTER, KC_TRNS,
261 KC_TRNS, KC_TRNS,
262 KC_TRNS,
263 KC_KP_DOT, KC_KP_0, KC_KP_ENTER
264 ), 212 ),
265 213
266/* Keymap 4: Customized Overwatch Layout 214/* Keymap 4: Customized Overwatch Layout
@@ -284,24 +232,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
284 * | | | H | | | | | 232 * | | | H | | | | |
285 * `--------------------' `--------------------' 233 * `--------------------' `--------------------'
286 */ 234 */
287 [_GAMEPAD] = LAYOUT_ergodox( 235 [_GAMEPAD] = LAYOUT_ergodox_pretty(
288 KC_ESCAPE, KC_TRNS, KC_TRNS, KC_TRNS, HYPR(KC_D), HYPR(KC_Q), HYPR(KC_GRV), 236 KC_ESC, KC_TRNS, KC_TRNS, KC_TRNS, HYPR(KC_D), HYPR(KC_Q), HYPR(KC_GRV), KC_TRNS, KC_F9, KC_F10, KC_F11, KC_F12, KC_NO, KC_NO,
289 KC_F1, KC_K, KC_Q, KC_W, KC_E, KC_R, KC_T, 237 KC_F1, KC_K, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
290 KC_TAB, KC_G, KC_A, KC_S, KC_D, KC_F, 238 KC_TAB, KC_G, KC_A, KC_S, KC_D, KC_F, KC_I, KC_O, KC_NO, KC_NO, KC_NO, KC_NO,
291 KC_LCTL, KC_LSHIFT, KC_Z, KC_X, KC_C, KC_V, KC_TRNS, 239 KC_LCTL, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_TRNS, TG(_GAMEPAD), KC_N, KC_M, KC_NO, KC_NO, KC_NO, KC_NO,
292 KC_G, KC_U, KC_I, KC_Y, KC_T, 240 KC_G, KC_U, KC_I, KC_Y, KC_T, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_NO,
293 KC_O, KC_P, 241 KC_O, KC_P, KC_HYPR, MAGIC_TOGGLE_NKRO,
294 KC_LGUI, 242 KC_LGUI, KC_NO,
295 KC_V, KC_SPACE, KC_H, 243 KC_V, KC_SPC, KC_H, KC_PGDN, KC_DEL, KC_ENTER
296
297 KC_TRNS, KC_F9, KC_F10, KC_F11, KC_F12, KC_NO, KC_NO,
298 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
299 KC_I, KC_O, KC_NO, KC_NO, KC_NO, KC_NO,
300 TG(_GAMEPAD), KC_N, KC_M, KC_NO, KC_NO, KC_NO, KC_NO,
301 KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, KC_NO,
302 KC_HYPR, MAGIC_TOGGLE_NKRO,
303 KC_NO,
304 KC_PGDOWN, KC_DELETE, KC_ENTER
305 ), 244 ),
306 245
307/* Keymap 3: 246/* Keymap 3:
@@ -325,26 +264,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
325 * | SHIFT| ALT | 0MAC | | | | | 264 * | SHIFT| ALT | 0MAC | | | | |
326 * `--------------------' `--------------------' 265 * `--------------------' `--------------------'
327 */ 266 */
328 [_DIABLO] = LAYOUT_ergodox( 267 [_DIABLO] = LAYOUT_ergodox_pretty(
329 KC_ESCAPE, KC_V, KC_D, KC_LALT, KC_NO, KC_NO, KC_NO, 268 KC_ESC, KC_V, KC_D, KC_LALT, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_F9, KC_F10, KC_F11, KC_F12, KC_NO, KC_NO,
330 KC_TAB, KC_S, KC_I, KC_F, KC_M, KC_T, KC_TRNS, 269 KC_TAB, KC_S, KC_I, KC_F, KC_M, KC_T, KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
331 KC_Q, KC_1, KC_2, KC_3, KC_4, KC_G, 270 KC_Q, KC_1, KC_2, KC_3, KC_4, KC_G, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
332 KC_LCTL, KC_D3_1, KC_D3_2, KC_D3_3, KC_D3_4, KC_Z, KC_NO, 271 KC_LCTL, KC_D3_1, KC_D3_2, KC_D3_3, KC_D3_4, KC_Z, KC_NO, KC_NO, KC_N, KC_M, KC_NO, KC_NO, KC_NO, KC_NO,
333 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 272 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
334 KC_L, KC_J, 273 KC_L, KC_J, KC_NO, KC_NO,
335 KC_F, 274 KC_F, KC_NO,
336 SFT_T(KC_SPACE), ALT_T(KC_Q), KC_DIABLO_CLEAR, 275 SFT_T(KC_SPACE), ALT_T(KC_Q), KC_DIABLO_CLEAR, KC_PGDN, KC_DEL, KC_ENT
337
338
339
340 KC_TRNS, KC_F9, KC_F10, KC_F11, KC_F12, KC_NO, KC_NO,
341 KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
342 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
343 KC_NO, KC_N, KC_M, KC_NO, KC_NO, KC_NO, KC_NO,
344 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
345 KC_NO, KC_NO,
346 KC_NO,
347 KC_PGDOWN, KC_DELETE, KC_ENTER
348 ), 276 ),
349 277
350/* Keymap 4: Media and mouse keys 278/* Keymap 4: Media and mouse keys
@@ -368,24 +296,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
368 * | | | MWDn | | Mclk | | | 296 * | | | MWDn | | Mclk | | |
369 * `--------------------' `--------------------' 297 * `--------------------' `--------------------'
370 */ 298 */
371 [_MOUS] = LAYOUT_ergodox( 299 [_MOUS] = LAYOUT_ergodox_pretty(
372 KC_NO, KC_SECRET_1,KC_SECRET_2,KC_SECRET_3,KC_SECRET_4,KC_SECRET_5,KC_TRNS, 300 KC_NO, KC_SECRET_1,KC_SECRET_2,KC_SECRET_3,KC_SECRET_4,KC_SECRET_5,KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
373 KC_NO, KC_NO, KC_MS_U, KC_NO, KC_NO, KC_NO, KC_TRNS, 301 KC_NO, KC_NO, KC_MS_U, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
374 KC_NO, KC_MS_L, KC_MS_D, KC_MS_R, KC_NO, KC_NO, 302 KC_NO, KC_MS_L, KC_MS_D, KC_MS_R, KC_NO, KC_NO, KC_NO, KC_ACL0, KC_ACL1, KC_ACL2, KC_NO, KC_NO,
375 KC_NO, KC_ACL0, KC_ACL1, KC_ACL2, KC_NO, KC_NO, KC_TRNS, 303 KC_NO, KC_ACL0, KC_ACL1, KC_ACL2, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_NO, KC_MUTE, KC_VOLD, KC_VOLU, KC_NO, KC_NO,
376 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 304 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
377 KC_NO, KC_NO, 305 KC_NO, KC_NO, KC_NO, KC_NO,
378 KC_WH_U, 306 KC_WH_U, KC_NO,
379 KC_BTN1, KC_BTN2, KC_WH_D, 307 KC_BTN1, KC_BTN2, KC_WH_D, KC_BTN3, KC_BTN4, KC_BTN5
380
381 KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
382 KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
383 KC_NO, KC_ACL0, KC_ACL1, KC_ACL2, KC_NO, KC_NO,
384 KC_TRNS, KC_NO, KC_MUTE, KC_VOLD, KC_VOLU, KC_NO, KC_NO,
385 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
386 KC_NO,KC_NO,
387 KC_NO,
388 KC_MS_BTN3,KC_MS_BTN4,KC_MS_BTN5
389 ), 308 ),
390 309
391}; 310};
diff --git a/users/drashna/drashna.h b/users/drashna/drashna.h
index 8d32a5f98..8a022cd14 100644
--- a/users/drashna/drashna.h
+++ b/users/drashna/drashna.h
@@ -181,6 +181,7 @@ enum {
181// arguments, we need a wrapper in order for these definitions to be 181// arguments, we need a wrapper in order for these definitions to be
182// expanded before being used as arguments to the LAYOUT_xxx macro. 182// expanded before being used as arguments to the LAYOUT_xxx macro.
183#define LAYOUT_ergodox_wrapper(...) LAYOUT_ergodox(__VA_ARGS__) 183#define LAYOUT_ergodox_wrapper(...) LAYOUT_ergodox(__VA_ARGS__)
184#define LAYOUT_ergodox_pretty_wrapper(...) LAYOUT_ergodox_pretty(__VA_ARGS__)
184#define KEYMAP_wrapper(...) KEYMAP(__VA_ARGS__) 185#define KEYMAP_wrapper(...) KEYMAP(__VA_ARGS__)
185 186
186 187
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-06 07:44:32 +0000