back to vanilla canary

This commit is contained in:
Christoph Cullmann 2024-01-13 18:36:57 +01:00
parent 3ebc6e5d30
commit e20bd529d5
4 changed files with 26 additions and 34 deletions

View file

@ -1,25 +1,22 @@
# Christoph Cullmann's Layout
Layout with 34 keys, using Canary with thumb e hack:
Layout with 34 keys, using Canary as base layer:
canarye (chrcul) (0 likes)
w l y p b z f ; u '
c r s t g m n o i a
canary-ortho
w l y p b z f o u '
c r s t g m n e i a
q j v d k x h / , .
e
MT-QUOTES:
Alt: 24.61%
Rol: 48.53% (In/Out: 24.92% | 23.62%)
One: 3.36% (In/Out: 2.34% | 1.02%)
Red: 3.17% (Bad: 0.08%)
Alt: 23.47%
Rol: 48.11% (In/Out: 21.19% | 26.92%)
One: 2.20% (In/Out: 0.89% | 1.31%)
Red: 3.26% (Bad: 0.08%)
SFB: 0.70%
SFS: 5.73% (Red/Alt: 2.66% | 3.08%)
SFB: 0.94%
SFS: 7.80% (Red/Alt: 3.62% | 4.17%)
LH/RH: 42.13% | 57.87%
The ; in the layout is used to switch to some magic layer.
LH/RH: 42.15% | 57.85%
ATM this needs to be cloned to
@ -27,3 +24,10 @@ ATM this needs to be cloned to
to work properly.
Based on
https://github.com/Apsu/Canary
and
https://github.com/manna-harbour/miryoku

View file

@ -38,7 +38,7 @@
// details see https://precondition.github.io/home-row-mods
// the default is 200
#define TAPPING_TERM 175
#define TAPPING_TERM 150
#define TAPPING_TERM_PER_KEY
// Enable rapid switch from tap to hold, disables double tap hold auto-repeat.

View file

@ -20,18 +20,17 @@ enum my_layers {
_NUM,
_NAV,
_SYM,
_FN,
_MAGIC
_FN
};
// our keymap
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_BASE] = LAYOUT(
KC_W, KC_L, KC_Y, KC_P, KC_B, KC_Z, KC_F, OSL(_MAGIC), KC_U, KC_QUOT,
RALT_T(KC_C), LALT_T(KC_R), LCTL_T(KC_S), LSFT_T(KC_T), KC_G, KC_M, RSFT_T(KC_N), RCTL_T(KC_O), LALT_T(KC_I), RALT_T(KC_A),
KC_W, KC_L, KC_Y, KC_P, KC_B, KC_Z, KC_F, KC_O, KC_U, KC_QUOT,
RALT_T(KC_C), LALT_T(KC_R), LCTL_T(KC_S), LSFT_T(KC_T), KC_G, KC_M, RSFT_T(KC_N), RCTL_T(KC_E), LALT_T(KC_I), RALT_T(KC_A),
KC_Q, KC_J, KC_V, LGUI_T(KC_D), KC_K, KC_X, RGUI_T(KC_H), KC_SLSH, KC_COMM, KC_DOT,
MO(_SYM), LT(_NUM, KC_SPC), LT(_NAV, KC_E), MO(_FN)
MO(_SYM), LT(_NUM, KC_SPC), MO(_NAV), MO(_FN)
),
[_NUM] = LAYOUT(
@ -60,13 +59,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_F11, KC_F4, KC_F5, KC_F6, KC_DEL, XXXXXXX, KC_RSFT, KC_RCTL, KC_LALT, KC_RALT,
KC_F10, KC_F1, KC_F2, KC_F3, KC_INS, XXXXXXX, KC_RGUI, XXXXXXX, XXXXXXX, XXXXXXX,
KC_BSPC, KC_ESC, XXXXXXX, XXXXXXX
),
[_MAGIC] = LAYOUT(
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_CAPS, XXXXXXX, XXXXXXX,
KC_LBRC, KC_RBRC, KC_LPRN, KC_RPRN, XXXXXXX, XXXXXXX, KC_LCBR, KC_RCBR, S(KC_COMMA), S(KC_DOT),
TO(_NUM), TO(_SYM), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TO(_FN), TO(_NAV),
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
)
};
@ -82,7 +74,7 @@ uint16_t get_tapping_term(uint16_t keycode, keyrecord_t* record) {
case RGUI_T(KC_H):
case LALT_T(KC_I):
case RALT_T(KC_A):
return TAPPING_TERM + 50;
return TAPPING_TERM + 100;
default:
return TAPPING_TERM;

View file

@ -67,10 +67,6 @@ layer_state_t layer_state_set_user(layer_state_t state) {
rgblight_sethsv_noeeprom(HSV_GOLD);
break;
case _MAGIC:
rgblight_sethsv_noeeprom(HSV_MAGENTA);
break;
default:
break;
}