diff options
author | Jonas Avellana <14019120+ninjonas@users.noreply.github.com> | 2019-09-25 22:28:06 -0600 |
---|---|---|
committer | Drashna Jaelre <drashna@live.com> | 2019-09-25 21:28:06 -0700 |
commit | ff854565ce012a325ad04b09a7bcb7c8bb9d43c5 (patch) | |
tree | 69d4970d4ea40d49483f232bf404d16f383957ba /users/ninjonas/ninjonas.h | |
parent | 2a948e77715f0bd11d4b80315cf84c68890014d4 (diff) |
[Keymap] ninjonas keymap for crkbd & ninjonas userspace updates (#6797)
* [keymap(crkbd)] introducing crkbd keymap on ninjonas profile
* [keymap(crkbd)] introducing crkbd keymap on ninjonas profile
* [refactor(crkbd)] reducing file size by selecting RGB animations
* [refactor(crkbd)] added shiftit key
* [refactor(crkbd)] added shiftit key
* [chore(crkbd)] adding SLEEP_LED_ENABLE on rules.mk
* [refactor(crkbd)] added keylog & removed static rainbow RGB
* [feat(crkbd)] introduced em-dash '—' keymap
* [feat(crkbd)] added screenshot functionality
* [refactor(lily58,pinky3)] moving media keys
* [refactor(lily58)] Added emdash key
* [chore] removing NUMBERS & FUNCTIONS layers as they're useless
* [chore] removing NUMBERS & FUNCTIONS layers as they're useless
* [chore(crkbd,lily48)] Updating README.md
* [feat] added K_LAPP & K_RAPP to mimic command + tab
* [feat] added K_LAPP & K_RAPP to mimic command + tab
* [fix(#6797)] resolving changes requested by @drashna
* [fix(#6797)] first cut on using QMK OLED Driver
* [fix(#6797)] cleaning up rules.mk
* [fix(#6797)] making scrolling logo work
* [fix(#6797)] Using OLED Driver for Lily58
* [fix(#6797)] Moved OLED driver implementation to ninjonas userspace
* [fix(#6797)] Bringing back crkbd & lily58 logos
* [fix(#6797)] Turning off OLED based off @drashna's workaround in #5982
* [fix(#6797)] whoops! forgot to checkin crkbd/config.h
* [fix(#6797)] fixing issue with OLED randomly turning on
* [fix(#6797)] using default glcdfont.c for lily58 & crkbd
* [fix(#6797)] Using LINK_TIME_OPTIMIZATION_ENABLE rather than EXTRAFLAGS as per code review
* [fix(#6797)] updating M_MALL macro as per code review by @fauxpark
Diffstat (limited to 'users/ninjonas/ninjonas.h')
-rw-r--r-- | users/ninjonas/ninjonas.h | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/users/ninjonas/ninjonas.h b/users/ninjonas/ninjonas.h index 50d7c36802..227534c259 100644 --- a/users/ninjonas/ninjonas.h +++ b/users/ninjonas/ninjonas.h @@ -36,23 +36,19 @@ #define _LOWER 3 #define _RAISE 4 #define _ADJUST 5 -#ifdef KEYBOARD_pinky_3 - #define _NUMBERS 6 - #define _FUNCTIONS 7 -#endif // Shortcut Keys #define K_LOCK LGUI(LCTL(KC_Q)) // Locks screen on MacOS #define K_CSCN LGUI(LCTL(LSFT(KC_4))) // Copy a portion of the screen to the clipboard +#define K_MDSH LSFT(LALT(KC_MINS)) +#define K_LAPP SGUI(KC_TAB) // + Shift + Tab +#define K_RAPP LGUI(KC_TAB) // + Tab // Layer Keys -#define L_LOWER MO(_LOWER) +#define LM_LOW MO(_LOWER) +#define LM_RAI MO(_RAISE) #define LT_LOW LT(_LOWER, KC_ENT) #define LT_RAI LT(_RAISE, KC_SPC) -#ifdef KEYBOARD_pinky_3 - #define LT_NUM LT(_NUMBERS, KC_SPC) - #define LT_FUNC LT(_FUNCTIONS, KC_ENT) -#endif // Layout blocks #define _____________________QWERTY_L1______________________ T_TAB, T_Q, T_W, KC_E, KC_R, KC_T @@ -105,7 +101,7 @@ #define _________MEDIA_3_________ XXXXXXX, KC_MRWD, KC__VOLDOWN #define ________MOD_LEFT_________ KC_LALT, T_GUI, KC_LCTL -#define ________MOD_RIGHT________ KC_BSPC, KC_DEL, L_LOWER +#define ________MOD_RIGHT________ KC_BSPC, KC_DEL, LM_LOW // Layout wrappers #define LAYOUT_wrapper(...) LAYOUT(__VA_ARGS__) |