Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Danielo515/redox #8232

Merged
merged 27 commits into from
Mar 12, 2020
Merged

Danielo515/redox #8232

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
c620f79
feat(build): added script for compiling with docker easily
danielo515 Oct 31, 2018
5a3e76f
chore: bring my own build with docker to master
danielo515 Jan 25, 2020
b502334
chore: delete a file that does not make sense anymore
danielo515 Jan 30, 2020
31e9c35
feat: first redox for danielo
danielo515 Jan 30, 2020
db17b26
chore: basic compatibility between redox and my space
danielo515 Jan 31, 2020
ac18543
refactor: removed some old stuff
danielo515 Feb 14, 2020
6350561
feat: added go coding symbols
danielo515 Feb 14, 2020
fe30547
feat: name control_k and alt_j
danielo515 Feb 16, 2020
b15612f
chore: reduce combo term
danielo515 Feb 16, 2020
ecd4279
feat: improved first layer of redox
danielo515 Feb 19, 2020
1c82379
feat: add configurations to the redox
danielo515 Feb 19, 2020
4d4c803
feat: make alt tab more portable
danielo515 Feb 19, 2020
2d290cc
feat: small improvements to redox layout
danielo515 Feb 19, 2020
ef45684
feat: added leader
danielo515 Feb 20, 2020
046a917
refactor: move leader defs to my userspace config
danielo515 Feb 20, 2020
1e8e37c
chore: movement modified
danielo515 Feb 20, 2020
5f47f5c
feat: more predefined keys and a a new combo
danielo515 Feb 20, 2020
ce5be7b
feat: redox alt tab functionality
danielo515 Feb 23, 2020
467e05b
refactor: move alt_tab processing to a separate file
danielo515 Feb 23, 2020
fa7ee91
refactor: early return
danielo515 Feb 23, 2020
7abe631
refactor: move process record to a separate file
danielo515 Feb 23, 2020
2e527c8
format leader function
danielo515 Feb 23, 2020
ed56032
chore: backspace on digits layer
danielo515 Feb 24, 2020
f4dd142
feat: add extra combo
danielo515 Feb 24, 2020
17fc04c
feat: added more combos
danielo515 Feb 26, 2020
6fb646c
implement guard proposed by @drashna
danielo515 Mar 6, 2020
6db354a
chore: include @drashna placeholder suggestion
danielo515 Mar 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
feat: name control_k and alt_j
  • Loading branch information
@danielo515
danielo515 committed Feb 16, 2020
commit fe305478ffe69dc89528df5182e59faa119725ee
4 changes: 2 additions & 2 deletions keyboards/ergodox_ez/keymaps/danielo515/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
OSM(MOD_LSFT) ,LT(2,KC_BSPACE) ,OSM(MOD_LGUI) ,


TO(1) ,KC_6 ,KC_7 ,KC_8 ,TD_F9 ,LT(3,KC_0) ,KC_DQUO ,
TO(1) ,KC_6 ,KC_7 ,KC_8 ,KC_9 ,LT(3,KC_0) ,KC_DQUO ,
KC_UNDS ,KC_Y ,KC_U ,KC_I ,KC_O ,KC_P ,RSFT_T(KC_MINUS) ,
HYPR_H ,ALT_T(KC_J) ,RCTL_T(KC_K) ,LT(6,KC_L) ,TD_CLN ,GUI_T(KC_QUOTE) ,
HYPR_H ,ALT_J ,CTL_K ,LT(6,KC_L) ,TD_CLN ,GUI_T(KC_QUOTE) ,
ALT_TAB ,KC_N ,MEH_T(KC_M) ,KC_COMMA ,KC_DOT ,KC_SLASH ,LT(4,KC_KP_ASTERISK),
LT(4,KC_ENTER) ,KC_DOWN ,KC_LBRACKET ,KC_RBRACKET ,OSL(2) ,
KC_AUDIO_MUTE ,KC_ESCAPE ,
Expand Down
46 changes: 24 additions & 22 deletions users/danielo515/danielo515.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,38 +66,40 @@ enum layers {
};

// Function letters
#define FN_F LT(_F,KC_F)
#define FN_D LT(_D,KC_D)
#define FN_S LT(_S,KC_S)
#define FN_A LT(_A,KC_A)
#define FN_K LT(_K,KC_K)
#define FN_J LT(_J,KC_J)
#define KC_FN_D FN_D
#define KC_FN_S FN_S
#define KC_FN_F FN_F
# define FN_F LT(_F,KC_F)
# define FN_D LT(_D,KC_D)
# define FN_S LT(_S,KC_S)
# define FN_A LT(_A,KC_A)
# define FN_K LT(_K,KC_K)
# define FN_J LT(_J,KC_J)
# define KC_FN_D FN_D
# define KC_FN_S FN_S
# define KC_FN_F FN_F

#define KC_MACROS OSL(_MACROS)
# define KC_MACROS OSL(_MACROS)


#define KC_E_COLN LSFT(KC_DOT)
#define KC_E_EQL ES_EQL
#define KC_GUI OSM(MOD_RGUI)
#define KC_R_NUB S(KC_NUBS)
#define KC_E_LT KC_NUBS
#define KC_E_GT S(KC_NUBS)
#define KC_E_TILD ES_TILD
#define KC_E_MINS ES_MINS
#define KC_S_SPC SFT_T(KC_SPC) // Tap for Space, hold for Shift
#define KC_E_OVRR ES_OVRR
#define KC_E_APOS ES_APOS
#define KC_E_IEXL ES_IEXL
# define KC_E_COLN LSFT(KC_DOT)
# define KC_E_EQL ES_EQL
# define KC_GUI OSM(MOD_RGUI)
# define KC_R_NUB S(KC_NUBS)
# define KC_E_LT KC_NUBS
# define KC_E_GT S(KC_NUBS)
# define KC_E_TILD ES_TILD
# define KC_E_MINS ES_MINS
# define KC_S_SPC SFT_T(KC_SPC) // Tap for Space, hold for Shift
# define KC_E_OVRR ES_OVRR
# define KC_E_APOS ES_APOS
# define KC_E_IEXL ES_IEXL
// Short hand for complex key combinations
# define WIN_LEFT_HALF LALT(LGUI(KC_LEFT))
# define WIN_RIGHT_HALF LALT(LGUI(KC_RIGHT))
# define WIN_TO_LEFT LALT(LSFT( LGUI(KC_LEFT) ))
# define WIN_TO_RIGHT LALT(LSFT( LGUI(KC_RIGHT) ))
# define SHIFT OSM(MOD_LSFT)
# define HYPR_H HYPR_T(KC_H)
# define CTL_K RCTL_T(KC_K)
# define ALT_J ALT_T(KC_J)
// Ready to use Tap dance definitions, just put them on your layout

#ifdef TAP_DANCE_ENABLE
Expand Down