diff --git a/keyboards/handwired/dactyl_manuform/4x5/keymaps/thecount/keymap.c b/keyboards/handwired/dactyl_manuform/4x5/keymaps/thecount/keymap.c
index ab849ec..cf8ef90 100644
--- a/keyboards/handwired/dactyl_manuform/4x5/keymaps/thecount/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/4x5/keymaps/thecount/keymap.c
@@ -21,13 +21,12 @@ along with this program. If not, see .
#include QMK_KEYBOARD_H
#define _BASE 0
-#define _NUM_MEDIA_MOUSE 1
-#define _SYM_ARROWS_F 2
+#define _LAYER1 1
+#define _LAYER2 2
-
-#define L1_BSP LT(_NUM_MEDIA_MOUSE, KC_BACKSPACE)
+#define L1_BSP LT(1,KC_BACKSPACE)
#define ALT_ESC MT(MOD_LALT, KC_ESC)
-#define L2_SP LT(_SYM_ARROWS_F, KC_SPACE)
+#define L2_SPACE LT(2, KC_SPACE)
#define CTL_ENT MT(MOD_RCTL, KC_ENT)
#define CT_TAB MT(MOD_LCTL, KC_TAB)
#define GUI_DEL MT(MOD_RGUI, KC_DEL)
@@ -41,18 +40,6 @@ along with this program. If not, see .
#define KC_MB1 KC_MS_BTN1
#define KC_MB2 KC_MS_BTN2
-// clang-format off
-const char chordal_hold_layout[MATRIX_ROWS][MATRIX_COLS] PROGMEM =
- LAYOUT(
- 'L', 'L', 'L', 'L', 'L', 'R', 'R', 'R', 'R', 'R',
- 'L', 'L', 'L', 'L', 'L', 'R', 'R', 'R', 'R', 'R',
- 'L', 'L', 'L', 'L', 'L', 'R', 'R', 'R', 'R', 'R',
- 'L', 'L', 'R', 'R',
- 'L', 'L', 'R', 'R',
- 'L', 'L', 'R', 'R',
- 'L', 'L', 'R', 'R'
- );
-
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Base (qwerty)
* ,----------------------------------, ,----------------------------------,
@@ -79,23 +66,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_A, KC_S, KC_D, SFT_F, KC_G, KC_H, SFT_J, KC_K, KC_L, KC_SCLN,
KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLASH,
KC_LBRC, KC_RBRC, KC_MINS, KC_EQL,
- ALT_ESC, L1_BSP, L2_SP, CTL_ENT,
+ ALT_ESC, L1_BSP, L2_SPACE, CTL_ENT,
CT_TAB, KC_PGUP, KC_PGDN, GUI_DEL,
KC_GRV, KC_HOME, KC_END, KC_NUHS
),
- /* Layer 1 _NUM_MEDIA_MOUSE
+ /* Layer 1
* ,----------------------------------, ,----------------------------------,
- * |QKBOOT| | mup | | >> | | VOL+ | 7 | 8 | 9 | + |
+ * |QKBOOT| | mup | | | | VOL+ | | up | | PgUp |
* |------+------+------+------+------| |-------------+------+------+------|
- * | | mleft| mdown|mright| >|| | | MUTE | 4 | 5 | 6 | - |
+ * | | mleft| mdown|mright| | | MUTE | left | down |right | PgDn |
* |------+------+------+------+------| |------|------+------+------+------|
- * | | | | | << | | VOL- | 1 | 2 | 3 | * |
+ * | | | | | | | VOL- | / | \ | ? | | |
* |------+------+------+-------------, ,-------------+------+------+------,
* | | | | mbtn |mbtn2 |
* '------+------'-------------' '-------------'------+------'
* | | | | | |
- * | | | | | 0 |
+ * | | | | | |
* | | | | | |
* '------+------' '------+------'
* '------+------' '------+------'
@@ -104,25 +91,25 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | | |
* '------+------' '------+------'
*/
- [_NUM_MEDIA_MOUSE] = LAYOUT(
- QK_BOOT, _______, KC_MU, _______, KC_MNXT, KC_VOLU, KC_7, KC_8, KC_9, KC_KP_PLUS,
- _______, KC_ML, KC_MD, KC_MR, KC_MPLY, KC_MUTE, KC_4, KC_5, KC_6, KC_KP_MINUS,
- _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_1, KC_2, KC_3, KC_KP_ASTERISK,
- _______, _______, KC_MB1, KC_MB2,
- _______, _______, _______, KC_0 ,
+ [_LAYER1] = LAYOUT(
+ QK_BOOT, _______, KC_MU, _______, _______, KC_VOLU, _______, KC_UP, _______, KC_PGUP,
+ _______, KC_ML, KC_MD, KC_MR, _______, KC_MUTE, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN,
+ _______, _______, _______, _______, _______, KC_VOLD, KC_SLSH, KC_BSLS, KC_QUES, KC_PIPE,
+ _______, _______, KC_MB1, KC_MB2,
+ _______, _______, _______, _______,
_______, _______, _______, _______,
_______, _______, _______, _______
),
- /* Layer 2 _SYM_ARROWS_F
+ /* Layer 2
* ,----------------------------------, ,----------------------------------,
- * | ! | @ | # | $ | % | | ^ | & | * | ( | ) |
- * |------+------+------+------+------| |-------------+------+------+------|
- * | | | | | | | LEFT | DOWN | UP | RGHT | |
- * |------+------+------+------+------| |------|------+------+------+------|
* | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 |
+ * |------+------+------+------+------| |-------------+------+------+------|
+ * | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 |
+ * |------+------+------+------+------| |------|------+------+------+------|
+ * | ! | @ | # | $ | % | | ^ | & | * | ( | ) |
* |------+------+------+-------------, ,-------------+------+------+------,
- * | F11 | F12 | | | |
+ * | F11 | F12 | | - | = |
* '------+------'-------------' '-------------'------+------'
* | | | | | |
* | | | | | |
@@ -134,17 +121,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | | |
* '------+------' '------+------'
*/
- [_SYM_ARROWS_F] = LAYOUT(
- KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,
- _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, _______,
- KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10,
- KC_F11, KC_F12, _______, _______,
+ [_LAYER2] = LAYOUT(
+ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10,
+ KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,
+ KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,
+ KC_F11, KC_F12, _______, _______,
_______, _______, _______, _______,
_______, _______, _______, _______,
_______, _______, _______, _______
)
};
-// clang-format on
+
@@ -153,19 +140,25 @@ enum combo_events {
AS_AE,
OP_OE,
UI_UE,
- LSEMI_APOSTROPHE
+ LSEMI_APOSTROPHE,
+ QW_DESKTOPLEFT,
+ ER_DESKTOPORIGHT,
};
const uint16_t PROGMEM combo_ae[] = {KC_A, KC_S, COMBO_END};
const uint16_t PROGMEM combo_oe[] = {KC_O, KC_P, COMBO_END};
const uint16_t PROGMEM combo_ue[] = {KC_U, KC_I, COMBO_END};
const uint16_t PROGMEM combo_apostrophe[] = {KC_L, KC_SCLN, COMBO_END};
+const uint16_t PROGMEM combo_desktopleft[] = {KC_Q, KC_W, COMBO_END};
+const uint16_t PROGMEM combo_desktopright[] = {KC_E, KC_R, COMBO_END};
combo_t key_combos[] = {
[AS_AE] = COMBO_ACTION(combo_ae),
[OP_OE] = COMBO_ACTION(combo_oe),
[UI_UE] = COMBO_ACTION(combo_ue),
[LSEMI_APOSTROPHE] = COMBO_ACTION(combo_apostrophe),
+ [QW_DESKTOPLEFT] = COMBO_ACTION(combo_desktopleft),
+ [ER_DESKTOPORIGHT] = COMBO_ACTION(combo_desktopright),
};
/* COMBO_ACTION(x) is same as COMBO(x, KC_NO) */
@@ -191,5 +184,19 @@ void process_combo_event(uint16_t combo_index, bool pressed) {
tap_code16(KC_QUOT);
}
break;
+ case QW_DESKTOPLEFT:
+ if (pressed) {
+ tap_code16(KC_LCTL);
+ tap_code16(KC_LGUI);
+ tap_code16(KC_LEFT);
+ }
+ break;
+ case ER_DESKTOPORIGHT:
+ if (pressed) {
+ tap_code16(KC_LCTL);
+ tap_code16(KC_LGUI);
+ tap_code16(KC_RGHT);
+ }
+ break;
}
}
diff --git a/keyboards/handwired/dactyl_manuform/4x5/keymaps/thecount/rules.mk b/keyboards/handwired/dactyl_manuform/4x5/keymaps/thecount/rules.mk
index d550a5b..ab1e438 100644
--- a/keyboards/handwired/dactyl_manuform/4x5/keymaps/thecount/rules.mk
+++ b/keyboards/handwired/dactyl_manuform/4x5/keymaps/thecount/rules.mk
@@ -1,11 +1 @@
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-SPLIT_KEYBOARD = yes
COMBO_ENABLE = yes
diff --git a/users/.keep b/users/.keep
new file mode 100644
index 0000000..e69de29
diff --git a/users/thecount/config.h b/users/thecount/config.h
deleted file mode 100644
index 6c42e7a..0000000
--- a/users/thecount/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#define PERMISSIVE_HOLD
-#define CHORDAL_HOLD
-#define TAPPING_TERM 250