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.

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

Feature/alfrdmalr/keymap update #8174

Merged
merged 44 commits into from
Mar 3, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
5d01cdf
WIP do not merge
alfrdmalr Dec 29, 2019
a8af5bd
first pass at custom preonic layout
alfrdmalr Jan 7, 2020
99ec959
add auto shift and reset via leader key
alfrdmalr Jan 7, 2020
a03b69b
revert WIP changes
alfrdmalr Jan 7, 2020
9a929ca
Update readme
alfrdmalr Jan 12, 2020
01dc84d
update copyright notice
alfrdmalr Jan 12, 2020
795e328
formatting changes
alfrdmalr Jan 13, 2020
e4558f7
fix: use MO instead of process_record_user
alfrdmalr Jan 13, 2020
48b1828
added backslash and moved grave position
alfrdmalr Jan 13, 2020
0b8d7f3
remove extraneous 'j' characer in NUMPAD template
alfrdmalr Jan 13, 2020
3ef6a5a
update template formatting
alfrdmalr Jan 13, 2020
d53a51d
remove process_record_user
alfrdmalr Jan 20, 2020
d58470a
swap "!" with "@"
alfrdmalr Jan 20, 2020
9788639
fix readme formatting
alfrdmalr Jan 20, 2020
2aac6cb
update readme layout image
alfrdmalr Jan 20, 2020
c75f0a3
restore settings layer
alfrdmalr Jan 21, 2020
12eb00b
add windows minimize sequence
alfrdmalr Jan 23, 2020
c723fb9
Merge branch 'master' into feature/userspace-alfrdmalr
alfrdmalr Jan 23, 2020
de7c5ad
fix: switch to correct seq function for three-key sequence
alfrdmalr Jan 23, 2020
d2e50e3
fix: missing semicolon
alfrdmalr Jan 23, 2020
2f0fbb1
refactor: move keymap to userspace and generic 5x12 layout
alfrdmalr Jan 27, 2020
bc10b60
add numlock to numpad layer
alfrdmalr Jan 27, 2020
acd1002
add readme
alfrdmalr Jan 27, 2020
e25cde7
update readme formatting
alfrdmalr Jan 28, 2020
33d160e
Merge branch 'master' into feature/userspace-alfrdmalr
alfrdmalr Jan 28, 2020
b98c72e
remove unused wrappers from layout keymap
alfrdmalr Jan 28, 2020
0a9eacc
update readme title to reflect new location
alfrdmalr Jan 28, 2020
cc035dd
remove alfrdmalr directory from preonic/keymaps
alfrdmalr Jan 28, 2020
d1b7855
add ortho 4x12 support
alfrdmalr Jan 31, 2020
dca932c
add 'trilayer' settings and update keymap
alfrdmalr Feb 4, 2020
13895d4
update SYMBOLS layer to SYMBOL
alfrdmalr Feb 4, 2020
5b48ab7
remove minimize sequence
alfrdmalr Feb 6, 2020
757a627
clean up user config
alfrdmalr Feb 6, 2020
cb9d629
Merge pull request #1 from alfrdmalr/feature/userspace-alfrdmalr
alfrdmalr Feb 6, 2020
95df5f4
Merge branch 'feature/userspace-alfrdmalr' into feature/alfrdmalr/tri…
alfrdmalr Feb 6, 2020
457ff88
add brightness controls
alfrdmalr Feb 7, 2020
d14bc31
Merge branch 'master' of https://github.com/alfrdmalr/qmk_firmware
alfrdmalr Feb 13, 2020
3f9c300
Merge branch 'master' into feature/layouts/community/ortho4x12/alfrdmalr
alfrdmalr Feb 13, 2020
c487df7
Merge branch 'master' into feature/alfrdmalr/trilayer-settings
alfrdmalr Feb 13, 2020
a050a33
Merge pull request #2 from alfrdmalr/feature/layouts/community/ortho4…
alfrdmalr Feb 13, 2020
5948fce
Merge branch 'master' into feature/alfrdmalr/trilayer-settings
alfrdmalr Feb 13, 2020
1e66ac6
Merge pull request #3 from alfrdmalr/feature/alfrdmalr/trilayer-settings
alfrdmalr Feb 13, 2020
2f86688
update settings ascii
alfrdmalr Feb 13, 2020
f68b26f
moved some symbols around to make vim/linux smoother
alfrdmalr Feb 13, 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
remove minimize sequence
  • Loading branch information
alfrdmalr committed Feb 6, 2020
commit 5b48ab7041ed5e4b4a26cf88f6b4b2c10b185637
4 changes: 0 additions & 4 deletions users/alfrdmalr/alfrdmalr.c
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,6 @@ void matrix_scan_user(void) {
SEQ_FIVE_KEYS(KC_R, KC_E, KC_S, KC_E, KC_T) {
reset_keyboard();
}
// minimize window (Windows)
SEQ_THREE_KEYS(KC_M, KC_I, KC_N) {
SEND_STRING(SS_LALT(" ")"n");
}
leader_end();
}
}
Expand Down
24 changes: 11 additions & 13 deletions users/alfrdmalr/readme.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# alfrdmalr's userspace
## Overview
The alphanumeric characters and symbols are spread between three main 'typing' layers: REGULAR, NUMPAD, and SYMBOLS.
The alphanumeric characters and symbols are spread between three main 'typing' layers: REGULAR, NUMPAD, and SYMBOL.

A fourth layer, NAVIGATION, contains useful modifiers, shortcuts, and navigation functions like the arrow keys and page up/down. This layer also provides access to the `ENTER` and `ESC` keys.

Expand All @@ -22,27 +22,25 @@ The NUMPAD layer puts a numpad under the right hand, surrounding the home row po

This layer also holds the first twelve function keys.

#### SYMBOLS
This layer holds all the symbols that are not accessible from the REGULAR layer. There is some redundancy (for instance, `/` exists in both the REGULAR and SYMBOLS layer; its position, however, remains consistent) but with the exception of single and double quotes, all symbols are available from this layer.
#### SYMBOL
This layer holds all the symbols that are not accessible from the REGULAR layer. There is some redundancy (for instance, `/` exists in both the REGULAR and SYMBOL layer; its position, however, remains consistent) but with the exception of single and double quotes, all symbols are available from this layer.

#### NAVIGATION
The primary function of this layer is to provide arrow keys under hjkl. The surrounding keys contain similar functionality - for instance, the keys directly below `DOWN` and `UP` are `PAGEDOWN` and `PAGEUP`, respectively. `HOME` and `END` are inverted from this convention, simply because I kept hitting the wrong key when trying to jump to the beginning/end of lines when editing text.
Over time, this layer has become a general utility layer, though its primary function of is still to provide arrow keys under hjkl. The surrounding keys contain similar functionality - for instance, the keys directly below `DOWN` and `UP` are `PAGEDOWN` and `PAGEUP`, respectively. `HOME` and `END` are inverted from this convention, simply because I kept hitting the wrong key when trying to jump to the beginning/end of lines when editing text.

To the immediate right of the NAVIGATION layer key are the following modifiers: `SHIFT`, `CONTROL`, `ALT`, `GUI`. All modifiers are the "left" variants. The idea is to use the left hand to hold different modifiers as necessary while using the right hand to navigate and format.

`ESCAPE` is located on the spacebar from this layer, and `DELETE` is placed next to `BACKSPACE`, for convenience when formatting text. There are also four Windows shortcuts for undo, cut, copy, and paste, located in the same position as the relevant keys on the base layer (undo, for example, is in the same place as the `Z` key).
`ESCAPE` is located on the spacebar from this layer, and `DELETE` is placed next to `BACKSPACE`, for convenience when formatting text. There are also four Windows shortcuts for undo, cut, copy, and paste, located in the same position as the relevant keys on the base layer (undo, for example, is in the same place as the `Z` key). Again, this is for convenience when formatting text.

#### SETTINGS
Right now, this is pretty similar to the default settings layer (the planck's ADJUST layer). It's accessed in a similar manner: by activating a trilayer with NUMPAD and SYMBOLS. Currently, since the NUMPAD layer places a zero on the right SYMBOLS layer key, only the left SYMBOLS key (in conjunction with either of the NUMPAD keys) can be used to activate the settings layer. This is intentional, and allows more deleterious or consequential options to reside somewhat safely on the left side of the board, while more commonly accessed options are located on the right side.

Primary differences are the inclusion of an autoshift toggle and the removal of the reset button. The bootloader functionality has been moved to a leader key sequence: LEAD - R - E - S - E - T.
The SETTINGS layer can be accessed by pressing both SYMBOL layer keys at once. This is functionally the same as a trilayer, though because both keys are activating the same layer it doesn't actually use the trilayer feature.

This layer contains things like feature toggles, media controls, and other infrequently-used options.

### Leader Key Sequences
A complete list of leader sequences can be found below:
A complete list of leader sequences can be found below. The LEAD key that begins each sequence has been omitted.

#### Reset
LEAD - R - E - S - E - T

#### Minimize (Windows)
LEAD - M - I - N
| Sequence | Function |
| :------: | -------------------------------- |
| R-E-S-E-T | Reset the keyboard into DFU mode |