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

Xton's first keymap! #2941

Merged
merged 26 commits into from
May 12, 2018
Merged

Xton's first keymap! #2941

Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
044571c
FORK!
May 5, 2018
e5e150d
WIP - just how i like it
May 5, 2018
2285fca
empty
May 5, 2018
751de2b
more movement
May 6, 2018
c5ffe6a
mouse keys
May 6, 2018
d5f7d30
more vimminess
May 6, 2018
1a033a6
append/insert shift
May 6, 2018
bbc7350
WIP - vim macros
May 6, 2018
794f941
blocked out layer below in cmd mode.
May 7, 2018
d0e1e27
WIP - new vim layer
May 7, 2018
7c8dc56
debugged some, got key repeat working
May 8, 2018
d01d386
moooar coverage
May 8, 2018
0e1429b
moooar coverage
May 8, 2018
ed45311
regular vis mode
May 8, 2018
dda0cbf
basically done with basics.
May 8, 2018
4c8fa97
some refactoring
May 11, 2018
100b7b0
modkey passthru feature
May 11, 2018
86ccb83
stdized on cmd-left/right instead of ctrl-a/e
May 11, 2018
e235ef4
indicator lights
May 12, 2018
fef8511
moved vim layer into userspace
May 12, 2018
d4dae4a
cleaned up some yanking edge cases
May 12, 2018
2de860f
docs and some tweaks to layerescapes
May 12, 2018
69105bc
updated/added license strings
May 12, 2018
07681d3
updated comments
May 12, 2018
a74f1ea
moved config changes to keymap
May 12, 2018
70410d2
spurious changes removed
May 12, 2018
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
cleaned up some yanking edge cases
  • Loading branch information
Xton committed May 12, 2018
commit d4dae4a5354653a94c329ea5825278522c5aa055
25 changes: 15 additions & 10 deletions users/xtonhasvim/xtonhasvim.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ bool process_record_xtonhasvim(uint16_t keycode, keyrecord_t *record) {
CMD(KC_RIGHT);
RELEASE(KC_LSHIFT);
CMD(KC_X);
yank_was_lines = false;
EDIT;
} else {
vstate = VIM_C;
Expand Down Expand Up @@ -225,10 +226,12 @@ bool process_record_xtonhasvim(uint16_t keycode, keyrecord_t *record) {
CMD(KC_RIGHT);
RELEASE(KC_LSHIFT);
CMD(KC_X);
yank_was_lines = false;
EDIT;
} else {
SHIFT(KC_RIGHT);
CMD(KC_X);
yank_was_lines = false;
EDIT;
}
break;
Expand Down Expand Up @@ -264,13 +267,11 @@ bool process_record_xtonhasvim(uint16_t keycode, keyrecord_t *record) {
break;
case VIM_Y:
if(SHIFTED) {

CMD(KC_LEFT);
PRESS(KC_LSHIFT);
CMD(KC_RIGHT);
RELEASE(KC_LSHIFT);
SHIFT(KC_DOWN);
CMD(KC_C);
TAP(KC_LEFT);
TAP(KC_RIGHT);
yank_was_lines = true;
} else {
vstate = VIM_Y;
}
Expand Down Expand Up @@ -306,6 +307,7 @@ bool process_record_xtonhasvim(uint16_t keycode, keyrecord_t *record) {
case VIM_W:
simple_movement(keycode);
CMD(KC_X);
yank_was_lines = false;
EDIT;
break;

Expand All @@ -315,6 +317,7 @@ bool process_record_xtonhasvim(uint16_t keycode, keyrecord_t *record) {
CMD(KC_RIGHT);
RELEASE(KC_LSHIFT);
CMD(KC_X);
yank_was_lines = false;
EDIT;
break;
case VIM_I:
Expand All @@ -336,6 +339,7 @@ bool process_record_xtonhasvim(uint16_t keycode, keyrecord_t *record) {
ALT(KC_RIGHT);
RELEASE(KC_LSHIFT);
CMD(KC_X);
yank_was_lines = false;
EDIT;
default:
vstate = VIM_START;
Expand All @@ -356,14 +360,13 @@ bool process_record_xtonhasvim(uint16_t keycode, keyrecord_t *record) {
case VIM_W:
simple_movement(keycode);
CMD(KC_X);
yank_was_lines = false;
break;
case VIM_D:
CMD(KC_LEFT);
PRESS(KC_LSHIFT);
CMD(KC_RIGHT);
TAP(KC_RIGHT);
RELEASE(KC_LSHIFT);
SHIFT(KC_DOWN);
CMD(KC_X);
yank_was_lines = true;
vstate = VIM_START;
break;
case VIM_I:
Expand All @@ -385,6 +388,7 @@ bool process_record_xtonhasvim(uint16_t keycode, keyrecord_t *record) {
ALT(KC_RIGHT);
RELEASE(KC_LSHIFT);
CMD(KC_X);
yank_was_lines = false;
vstate = VIM_START;
default:
vstate = VIM_START;
Expand Down Expand Up @@ -550,13 +554,14 @@ bool process_record_xtonhasvim(uint16_t keycode, keyrecord_t *record) {
simple_movement(keycode);
CMD(KC_C);
TAP(KC_RIGHT);
yank_was_lines = false;
break;
case VIM_Y:
CMD(KC_LEFT);
SHIFT(KC_DOWN);
CMD(KC_C);
TAP(KC_RIGHT);
TAP(KC_LEFT);
yank_was_lines = true;
break;
default:
// NOTHING
Expand Down