Updated to work with Make

.github/workflows/lint_and_compile.yml

@@ -19,27 +19,13 @@ jobs:
             run: |
                   cd /home/runner/work/dgvigil-keebs/dgvigil-keebs/
                   rsync -avP $(pwd)/dgvigil/ qmk_firmware/users/dgvigil/
-                  rsync -avP $(pwd)/draculad/ qmk_firmware/keyboards/draculad/keymaps/dgvigil/
                   rsync -avP $(pwd)/iris/ qmk_firmware/keyboards/keebio/iris/keymaps/dgvigil/
-                  rsync -avP $(pwd)/sweep/ qmk_firmware/keyboards/ferris/keymaps/dgvigil/
-                  rsync -avP $(pwd)/scottogame/ qmk_firmware/keyboards/handwired/scottokeebs/scottogame/keymaps/dgvigil/
-                  rsync -avP $(pwd)/swoop/ qmk_firmware/keyboards/bluebell/swoop/keymaps/dgvigil/
-                  rsync -avP $(pwd)/q8/ qmk_firmware/keyboards/keychron/q8/ansi_encoder/keymaps/dgvigil/
           - name: Build
             run: |
                   cd /home/runner/work/dgvigil-keebs/dgvigil-keebs/qmk_firmware/
-                  echo "Building QMK for draculad"
-                  qmk compile -kb draculad -km dgvigil -e CONVERT_TO=promicro_rp2040
-                  # echo "Building QMK for handwired/scottokeebs/scottogame"
-                  # qmk compile -kb handwired/scottokeebs/scottogame -km dgvigil
-                  # echo "Building QMK for Q8"
-                  # qmk compile -kb keychron/q8/ansi_encoder -km dgvigil
-                  # echo "Building QMK for ferris/sweep"
-                  # qmk compile -kb ferris/sweep -km dgvigil
                   echo "Building QMK for keebio/iris/rev8"
                   qmk compile -kb keebio/iris/rev8 -km dgvigil
-                  # echo "Building QMK for bluebell/swoop"
-                  # qmk compile -kb bluebell/swoop -km dgvigil -e CONVERT_TO=promicro_rp2040
+                  qmk compile -kb keebio/iris/rev8 -km via
                   find -maxdepth 1 -name "*.hex"
                   find -maxdepth 1 -name "*.uf2"
                   mkdir -p ~/compiled/firmware
@@ -57,4 +43,4 @@ jobs:
               prerelease: false
               files: |
                 /home/runner/compiled/firmware/*.hex
-                /home/runner/compiled/firmware/*.uf2
+                /home/runner/compiled/firmware/*.uf2

.gitmodules

@@ -1,6 +1,3 @@
 [submodule "qmk_firmware"]
 	path = qmk_firmware
-	url = https://github.com/dgvigil/qmk_firmware.git
-[submodule "kmk_firmware"]
-	path = kmk_firmware
-	url = git@github.com:KMKfw/kmk_firmware.git
+	url = https://github.com/qmk/qmk_firmware.git

dgvigil/definitions/keycodes.h

@@ -6,7 +6,7 @@
 
 // Tap dance codes
 
-enum { 
+enum {
     TD_Q_ESC,
     TD_W_GRV,
     BRT_OPA
@@ -22,7 +22,8 @@ enum {
 
 enum {
     CUSTOM_KEYCODE_START = SAFE_RANGE,
-    WINDOWS,
+    QWERTY,
+    LINUX,
     COPY,
     PASTE,
     CUT,
@@ -38,7 +39,7 @@ enum {
 };
 
 
-// Layer-taps
+// Layers
 
 // 3 LEFT THUMB KEYS
 #define MUS_ESC LT(_MUS, KC_ESC)
@@ -49,12 +50,12 @@ enum {
 #define NUM_SPC LT(_NUM, KC_SPC)
 #define FUN_DEL LT(_FUN, KC_DEL)
 
-#define QWERTY   TG(_QWERTY)
-#define COLEMAK  TG(_COLEMAK_DH)
-
 // 2 LEFT THUMB KEYS
 #define FUN_TAB LT(_FUN, KC_TAB)
 // 2 RIGHT THUMB KEYS
 #define NUM_SPC LT(_NUM, KC_SPC)
 
+// Default layer change
+#define QWERT DF(_QWERTY)
+#define COLDH DF(_COLEMAKDH)
 // clang-format on

dgvigil/definitions/keymap_blocks.h

@@ -15,18 +15,18 @@
 #define ____THUMB2BLANK_ _______, _______
 
 // EMPTY ROW
-#define __________________EMPTY_____________________ _______, _______, _______, _______, _______ 
+#define __________________EMPTY_____________________ _______, _______, _______, _______, _______
 // BOOTLOADER
-#define _________________BOOT_R1____________________ _______, _______, QWERTY, _______, QK_BOOTLOADER    
-#define _________________BOOT_L1____________________ QK_BOOTLOADER,_______,COLEMAK,_______,_______    
+#define _________________BOOT_R1____________________ COLDH, _______, _______, _______, QK_BOOTLOADER
+#define _________________BOOT_L1____________________ QK_BOOTLOADER,_______,_______,_______,QWERT
 
 
 // _BASE
-#define __________________BASE_L1____________________ Q_ESC,  KC_W,   KC_E,    KC_R,    KC_T    
+#define __________________BASE_L1____________________ Q_ESC,  KC_W,   KC_E,    KC_R,    KC_T
 #define __________________BASE_L2____________________ KC_A,   KC_S,    KC_D,    KC_F,    KC_G
 #define __________________BASE_L3____________________ KC_Z,   KC_X,    KC_C,    KC_V,    KC_B
 
-#define __________________BASE_R1____________________ KC_Y,   KC_U,    KC_I,    KC_O,    KC_P    
+#define __________________BASE_R1____________________ KC_Y,   KC_U,    KC_I,    KC_O,    KC_P
 #define __________________BASE_R2____________________ KC_H,   KC_J,    KC_K,    KC_L,    KC_QUOT
 #define __________________BASE_R3____________________ KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH
 
@@ -35,15 +35,15 @@
 #define __________________NAV_L2____________________ _______, _______, _______, M_PASS3, M_PASS4
 #define __________________NAV_L3____________________ _______, _______, _______, M_PASS2, M_PASS1
 
-#define __________________NAV_R1____________________ KC_CAPS, PASTE,   COPY,    CUT,     UNDO    
+#define __________________NAV_R1____________________ KC_CAPS, PASTE,   COPY,    CUT,     UNDO
 #define __________________NAV_R2____________________ KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______
 #define __________________NAV_R3____________________ SALL,    KC_HOME, KC_PGUP, KC_PGDN, KC_END
 
 
 // NUM
 
-#define __________________NUM_L1____________________ KC_LBRC, KC_7,    KC_8,    KC_9,    KC_RBRC    
-#define __________________NUM_L2____________________ KC_SCLN, KC_4,    KC_5,    KC_6,    KC_EQL    
+#define __________________NUM_L1____________________ KC_LBRC, KC_7,    KC_8,    KC_9,    KC_RBRC
+#define __________________NUM_L2____________________ KC_SCLN, KC_4,    KC_5,    KC_6,    KC_EQL
 #define __________________NUM_L3____________________ KC_DOT,  KC_1,    KC_2,    KC_3,    KC_BSLS
 #define _________NUM_TH_L3________ KC_DOT,  KC_0,    KC_MINUS
 #define _____NUM_TH_L2___ KC_0,    KC_MINUS
@@ -69,14 +69,14 @@
 
 // MOUSE
 #define __________________MOU_R1____________________  _______, KC_PSTE, KC_COPY, KC_CUT,  KC_UNDO
-#define __________________MOU_R2____________________  KC_BTN1,  KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R
-#define __________________MOU_R3____________________  KC_BTN2, KC_WH_L,  KC_WH_D, KC_WH_U, KC_WH_R
+#define __________________MOU_R2____________________  KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, _______
+#define __________________MOU_R3____________________  KC_BTN2, KC_BTN1,  KC_WH_D, KC_WH_U, KC_BTN2
 
 // COLEMAK-DH
-#define __________________COLEML1____________________ Q_ESC,  KC_W,   KC_F,    KC_P,    KC_B    
+#define __________________COLEML1____________________ Q_ESC,  KC_W,   KC_F,    KC_P,    KC_B
 #define __________________COLEML2____________________ KC_A,   KC_R,    KC_S,    KC_T,    KC_G
 #define __________________COLEML3____________________ KC_Z,   KC_X,    KC_C,    KC_D,    KC_V
 
-#define __________________COLEMR1____________________ KC_J,   KC_L,    KC_U,    KC_Y,    KC_QUOT    
+#define __________________COLEMR1____________________ KC_J,   KC_L,    KC_U,    KC_Y,    KC_QUOT
 #define __________________COLEMR2____________________ KC_M,   KC_N,    KC_E,    KC_I,    KC_O
 #define __________________COLEMR3____________________ KC_K,   KC_H,    KC_COMM, KC_DOT,  KC_SLSH

dgvigil/definitions/layers.h

@@ -1,12 +1,12 @@
 #pragma once
 
 typedef enum {
-  _QWERTY,
-  _NAV,
-  _NUM,
-  _SYM,
-  _FUN,
-  _MUS,
-  _MOUSE,
-  _COLEMAK_DH
-} layers_t;
+  _QWERTY, // 0
+  _COLEMAKDH,
+  _NAV, // 2
+  _NUM, //3
+  _SYM, // 4
+  _FUN, // 5
+  _MUS, // 6
+  _MOUSE // 7
+} layers_t;

draculad/keymap.c

@@ -44,19 +44,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        __________________BASE_L3____________________,       __________________BASE_R3____________________,
 //     └────────┴────────┴────────┴────────┼────────┤       ├────────┼────────┴────────┴────────┴────────┘
                                             _______,         _______,
-//                       ┌────────┬────────┼────────┼       ┼────────┼────────┬────────┐
-                          ___________THUMB_L3________,      ___________THUMB_R3________
-                      // └────────┴────────┴────────┘       └────────┴────────┴────────┘
-    ),
-    [_COLEMAK_DH] =  LAYOUT_wrapper(
-//     ┌────────┬────────┬────────┬────────┬────────┐       ┌────────┬────────┬────────┬────────┬────────┐
-       __________________COLEML1____________________,       __________________COLEMR1____________________,
-//     ├────────┼────────┼────────┼────────┼────────┤       ├────────┼────────┼────────┼────────┼────────┤
-       __________________COLEML2____________________,       __________________COLEMR2____________________,
-//     ├────────┼────────┼────────┼────────┼────────┤       ├────────┼────────┼────────┼────────┼────────┤
-       __________________COLEML3____________________,       __________________COLEMR3____________________,
-//     └────────┴────────┴────────┴────────┼────────┤       ├────────┼────────┴────────┴────────┴────────┘
-                                            _______,         _______,
 //                       ┌────────┬────────┼────────┼       ┼────────┼────────┬────────┐
                           ___________THUMB_L3________,      ___________THUMB_R3________
                       // └────────┴────────┴────────┘       └────────┴────────┴────────┘
@@ -71,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 //     └────────┴────────┴────────┴────────┼────────┤       ├────────┼────────┴────────┴────────┴────────┘
                                             _______,         _______,
 //                       ┌────────┬────────┼────────┼       ┼────────┼────────┬────────┐
-                         ___________THUMB_3__BLANK__,        ___________THUMB_3__BLANK__
+                         ___________THUMB_L3________,        ___________THUMB_R3________
                       // └────────┴────────┴────────┘       └────────┴────────┴────────┘
 
     ),
@@ -98,7 +85,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 //     └────────┴────────┴────────┴────────┼────────┤       ├────────┼────────┴────────┴────────┴────────┘
                                             _______,         _______,
 //                       ┌────────┬────────┼────────┼       ┼────────┼────────┬────────┐
-                          _________SYM_TH_L3________,        _______, _______, _______
+                          _________SYM_TH_L3________,        ___________THUMB_3__BLANK__
                       // └────────┴────────┴────────┘       └────────┴────────┴────────┘
     ),
     [_FUN] = LAYOUT_wrapper(
@@ -306,17 +293,18 @@ bool oled_task_user(void) {
 
 uint8_t mod_state;
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    static bool isWindows = false;
+    static bool isLinux = false;
     mod_state = get_mods();
     switch (keycode) {
-        case WINDOWS:
+
+        case LINUX:
             if (record->event.pressed) {
-                isWindows = !isWindows;
+                isLinux = !isLinux;
             }
             return false;
         case COPY:
             if (record->event.pressed) {
-                if (isWindows) {
+                if (isLinux) {
                     tap_code16(LCTL(KC_C));
                 } else {
                     tap_code16(LGUI(KC_C));
@@ -325,7 +313,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             }
         case PASTE:
             if (record->event.pressed) {
-                if (isWindows) {
+                if (isLinux) {
                     tap_code16(LCTL(KC_V));
                 } else {
                     tap_code16(LGUI(KC_V));
@@ -334,7 +322,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             }
         case CUT:
             if (record->event.pressed) {
-                if (isWindows) {
+                if (isLinux) {
                     tap_code16(LCTL(KC_X));
                 } else {
                     tap_code16(LGUI(KC_X));
@@ -343,7 +331,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             }
         case UNDO:
             if (record->event.pressed) {
-                if (isWindows) {
+                if (isLinux) {
                     tap_code16(LCTL(KC_Z));
                 } else {
                     tap_code16(LGUI(KC_Z));
@@ -352,7 +340,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             }
         case REDO:
             if (record->event.pressed) {
-                if (isWindows) {
+                if (isLinux) {
                     tap_code16(LCTL(KC_Y));
                 } else {
                     tap_code16(LSG(KC_Z));
@@ -361,7 +349,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             }
         case SALL:
             if (record->event.pressed) {
-                if (isWindows) {
+                if (isLinux) {
                     tap_code16(LCTL(KC_A));
                 } else {
                     tap_code16(LGUI(KC_A));
@@ -375,17 +363,22 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             return false;
         case M_PASS2:
             if (record->event.pressed) {
-               SEND_STRING("ThisisThel0ve0fchrist!");
+               SEND_STRING("CindieVerano!2024");
             }
             return false;
         case M_PASS3:
             if (record->event.pressed) {
-               SEND_STRING("1029");
+               SEND_STRING("1290");
             }
             return false;
         case M_PASS4:
             if (record->event.pressed) {
-               SEND_STRING("10242677");
+               SEND_STRING("Thel0ve0fchrist!");
+            }
+            return false;
+        case SPOTLI:
+            if (record->event.pressed) {
+               tap_code16(LGUI(KC_SPACE));
             }
             return false;
   }

iris/keymap.c

@@ -1,20 +1,51 @@
 #include QMK_KEYBOARD_H
-
-#ifdef OS_DETECTION_ENABLE
-  #include "os_detection.h"
-#endif
-
-#include "dgvigil.h"
+#include <stdint.h>
 
 #define LAYOUT_wrapper(...) LAYOUT(__VA_ARGS__)
 
+enum layer_names {
+    _QWERTY, // 0
+    _COLEMAKDH,
+    _NAV, // 2
+    _NUM, //3
+    _SYM, // 4
+    _FUN, // 5
+    _MUS, // 6
+    _MOUSE // 7
+  };
+
+  enum {
+    CUSTOM_KEYCODE_START = SAFE_RANGE,
+    QWERTY,
+    COLDH,
+    LINUX,
+    COPY,
+    PASTE,
+    CUT,
+    UNDO,
+    REDO,
+    SALL,
+    SPOTLI,
+    M_PASS1,
+    M_PASS2,
+    M_PASS3,
+    M_PASS4,
+    CUSTOM_KEYCODE_END
+};
+
 enum combos {
   FA_GUI,
   FS_ALT,
   FD_CTL,
   JQUOT_GUI,
   JL_ALT,
-  JK_CTL
+  JK_CTL,
+  TA_GUI,
+  TR_ALT,
+  TS_CTL,
+  NO_GUI,
+  NI_ALT,
+  NE_CTL
 };
 
 const uint16_t PROGMEM fa_combo[] = {KC_F, KC_A, COMBO_END};
@@ -24,144 +55,178 @@ const uint16_t PROGMEM jquote_combo[] = {KC_J, KC_QUOT, COMBO_END};
 const uint16_t PROGMEM jl_combo[] = {KC_J, KC_L, COMBO_END};
 const uint16_t PROGMEM jk_combo[] = {KC_J, KC_K, COMBO_END};
 
+const uint16_t PROGMEM ta_combo[] = {KC_T, KC_A, COMBO_END};
+const uint16_t PROGMEM tr_combo[] = {KC_T, KC_R, COMBO_END};
+const uint16_t PROGMEM ts_combo[] = {KC_T, KC_S, COMBO_END};
+const uint16_t PROGMEM no_combo[] = {KC_N, KC_O, COMBO_END};
+const uint16_t PROGMEM ni_combo[] = {KC_N, KC_I, COMBO_END};
+const uint16_t PROGMEM ne_combo[] = {KC_N, KC_E, COMBO_END};
+
 combo_t key_combos[] = {
+// QWERTY
   [FA_GUI] = COMBO(fa_combo, KC_LGUI),
   [FS_ALT] = COMBO(fs_combo, KC_LALT),
   [FD_CTL] = COMBO(fd_combo, KC_LCTL),
   [JQUOT_GUI] = COMBO(jquote_combo, KC_RGUI),
   [JL_ALT] = COMBO(jl_combo, KC_RALT),
   [JK_CTL] = COMBO(jk_combo, KC_RCTL),
+// COLEMAK-DH
+  [TA_GUI] = COMBO(ta_combo, KC_LGUI),
+  [TR_ALT] = COMBO(tr_combo, KC_LALT),
+  [TS_CTL] = COMBO(ts_combo, KC_LCTL),
+  [NO_GUI] = COMBO(no_combo, KC_RGUI),
+  [NI_ALT] = COMBO(ni_combo, KC_RALT),
+  [NE_CTL] = COMBO(ne_combo, KC_RCTL),
 };
 
+// Layer tap definitions
+#define MUS_ESC LT(_MUS, KC_ESC)
+#define NAV_BKSP LT(_NAV, KC_BSPC)
+#define MOUSE_TAB LT(_MOUSE, KC_TAB)
+#define SYM_ENTER LT(_SYM, KC_ENTER)
+#define NUM_SPC LT(_NUM, KC_SPC)
+#define FUN_DEL LT(_FUN, KC_DEL)
 
+// Simple keycode for now (can be enhanced to tap dance later)
+#define Q_ESC KC_Q
+
+// Default layer change
+#define QWERT DF(_QWERTY)
+#define COLDH DF(_COLEMAKDH)
+
+// Tap dance actions array (required by QMK) - add at least one dummy action
+tap_dance_action_t tap_dance_actions[] = {
+    [0] = ACTION_TAP_DANCE_DOUBLE(KC_NO, KC_NO), // Dummy action to satisfy the array requirement
+};
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_wrapper(
+  [_QWERTY] = LAYOUT(
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
      KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                               KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MUTE,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_TAB,  __________________BASE_L1____________________,                          __________________BASE_R1____________________, KC_GRV,
+     KC_TAB,  Q_ESC,   KC_W,    KC_E,    KC_R,    KC_T,                               KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_GRV,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_LCTL, __________________BASE_L2____________________,                          __________________BASE_R2____________________, _______,
+     KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                               KC_H,    KC_J,    KC_K,    KC_L,    KC_QUOT, KC_RCTL,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_LSFT, __________________BASE_L3____________________,SPOTLI,          _______, __________________BASE_R3____________________, KC_RSFT,
+     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,     SPOTLI,          _______, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
   //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    ___________THUMB_L3________,                 ___________THUMB_R3________
+                                    MUS_ESC, NAV_BKSP,MOUSE_TAB,                 SYM_ENTER,NUM_SPC,FUN_DEL
                                 // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
   ),
 
-  [_COLEMAK_DH] = LAYOUT_wrapper(
+  [_COLEMAKDH] = LAYOUT(
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______, _______, _______, _______, _______, KC_LPAD,                            SPOTLI, _______, _______, _______, _______, _______,
+     KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                               KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MUTE,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, __________________COLEML1____________________,                           __________________COLEMR1____________________, _______,
+     KC_TAB,  Q_ESC,   KC_W,   KC_F,    KC_P,    KC_B,                                KC_J,   KC_L,    KC_U,    KC_Y,    KC_QUOT, KC_GRV,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, __________________COLEML2____________________,                           __________________COLEMR2____________________, _______,
+     KC_LCTL, KC_A,    KC_R,    KC_S,    KC_T,    KC_G,                               KC_M,   KC_N,    KC_E,    KC_I,    KC_O, KC_RCTL,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, __________________COLEML3____________________, SPOTLI,         _______, __________________COLEMR3____________________, _______,
+     KC_LSFT, KC_Z,   KC_X,    KC_C,    KC_D,    KC_V ,     SPOTLI,          _______, KC_K,   KC_H,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
   //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                   ___________THUMB_3__BLANK__,                  ___________THUMB_3__BLANK__
+                                    MUS_ESC, NAV_BKSP,MOUSE_TAB,                 SYM_ENTER,NUM_SPC,FUN_DEL
                                 // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
   ),
 
-  [_NAV] = LAYOUT_wrapper(
+  [_NAV] = LAYOUT(
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______, _______, _______, _______, _______, KC_LPAD,                            SPOTLI, _______, _______, _______, _______, RGB_TOG,
+     _______, _______, _______, _______, _______, RGB_MODE_SWIRL,                     SPOTLI, _______, _______, _______, _______, RGB_TOG,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, __________________EMPTY_____________________,                           __________________NAV_R1____________________, _______,
+     _______, _______, _______, _______, _______, _______,                            KC_CAPS, PASTE,   COPY,    CUT,     UNDO,    _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, __________________NAV_L2____________________,                           __________________NAV_R2____________________, _______,
+     _______, _______, _______, _______, M_PASS3, M_PASS4,                            KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, __________________NAV_L3____________________, WINDOWS,         _______, __________________NAV_R3____________________, _______,
+     _______, _______, _______, _______, M_PASS2, M_PASS1, LINUX,            _______, SALL,    KC_HOME, KC_PGUP, KC_PGDN, KC_END, _______,
   //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    ___________THUMB_L3________,                 ___________THUMB_R3________
+                                    MUS_ESC, NAV_BKSP,MOUSE_TAB,                 SYM_ENTER,NUM_SPC,FUN_DEL
                                 // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
   ),
 
-  [_NUM] = LAYOUT_wrapper(
+  [_NUM] = LAYOUT(
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______, _______, _______, _______, _______, KC_LPAD,                            SPOTLI, _______, _______, _______, _______, _______,
+     _______, _______, _______, _______, _______, RGB_MODE_SWIRL,                     SPOTLI,  _______, _______, _______, _______, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, __________________NUM_L1____________________,                           _________________BOOT_R1____________________, _______,
+     _______, KC_LBRC, KC_7,    KC_8,    KC_9,    KC_RBRC,                            COLDH,   _______, _______, _______, QWERT, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, __________________NUM_L2____________________,                           __________________EMPTY_____________________, _______,
+     _______, KC_SCLN, KC_4,    KC_5,    KC_6,    KC_EQL,                             _______, _______, _______, _______, _______, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, __________________NUM_L3____________________, KC_LPRN,         _______, __________________EMPTY_____________________, _______,
+     _______, KC_DOT,  KC_1,    KC_2,    KC_3,    KC_BSLS, KC_LPRN,          _______, _______, _______, _______, _______, _______, _______,
   //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    _________NUM_TH_L3________,                 ___________THUMB_3__BLANK__
+                                    KC_DOT,  KC_0,    KC_MINUS,                 _______, _______, _______
                                 // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
   ),
 
-  [_SYM] = LAYOUT_wrapper(
+  [_SYM] = LAYOUT(
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______, _______, _______, _______, _______, KC_LPAD,                            SPOTLI, _______, _______, _______, _______, _______,
+     _______, _______, _______, _______, _______, RGB_MODE_SWIRL,                     SPOTLI, _______, _______, _______, _______, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, __________________SYM_L1____________________,                           __________________EMPTY_____________________, _______,
+     _______, KC_LCBR, KC_AMPR, KC_ASTR, KC_LPRN, KC_RCBR,                           _______, _______, _______, _______, _______, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, __________________SYM_L2____________________,                           __________________EMPTY_____________________, _______,
+     _______, KC_COLN, KC_DLR,  KC_PERC, KC_CIRC, KC_PLUS,                           _______, _______, _______, _______, _______, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, __________________SYM_L3____________________, _______,         _______, __________________EMPTY_____________________, _______,
+     _______, KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_PIPE, _______,         _______, _______, _______, _______, _______, _______, _______,
   //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    _________SYM_TH_L3________,                  ___________THUMB_3__BLANK__
+                                    KC_LPRN, KC_RPRN, KC_UNDS,                  _______, _______, _______
                                 // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
   ),
 
- [_FUN] = LAYOUT_wrapper(
+ [_FUN] = LAYOUT(
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______, _______, _______, _______, _______, KC_LPAD,                            SPOTLI, _______, _______, _______, _______, _______,
+     _______, _______, _______, _______, _______, RGB_M_SW,                           SPOTLI, _______, _______, _______, _______, QK_BOOT,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, __________________FUN_L1____________________,                            _________________BOOT_R1____________________, _______,
+     _______, KC_F12,  KC_F7,   KC_F8,   KC_F9,   KC_PSCR,                            RM_NEXT,RM_PREV,_______,_______,QWERT, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, __________________FUN_L2____________________,                            __________________EMPTY_____________________, _______,
+     _______, KC_F11,  KC_F4,   KC_F5,   KC_F6,   _______,                            RGB_M_X, _______, _______, _______, _______, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, __________________FUN_L3____________________, _______,         _______, __________________EMPTY_____________________, _______,
+     _______, KC_F10,  KC_F1,   KC_F2,   KC_F3,   _______, _______,         _______, _______, _______, _______, _______, _______, _______,
   //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    ___________THUMB_3__BLANK__,                 ___________THUMB_3__BLANK__
+                                    _______, _______, _______,                 _______, _______, _______
                                 // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
   ),
 
-  [_MUS] = LAYOUT_wrapper(
+  [_MUS] = LAYOUT(
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______, _______, _______, _______, _______, KC_LPAD,                            SPOTLI, _______, _______, _______, _______, _______,
+     QK_BOOT, _______, _______, _______, _______, RGB_MODE_SWIRL,                     SPOTLI, _______, _______, _______, _______, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _________________BOOT_L1____________________,                           __________________EMPTY_____________________, _______,
+     _______, _______,_______,_______,_______,QWERT,                           _______, _______, _______, _______, _______, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, __________________EMPTY_____________________,                           __________________MUS_R2____________________, _______,
+     _______, _______, _______, _______, _______, _______,                           _______, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, __________________EMPTY_____________________, _______,         _______, __________________MUS_R3____________________, _______,
+     _______, _______, _______, _______, _______, _______, _______,         _______, _______, KC_MSTP, KC_MPLY, KC_MUTE, _______, _______,
   //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    ___________THUMB_3__BLANK__,                 ___________THUMB_3__BLANK__
+                                    _______, _______, _______,                 _______, _______, _______
                                 // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
   ),
 
-  [_MOUSE] = LAYOUT_wrapper(
+  [_MOUSE] = LAYOUT(
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______, _______, _______, _______, _______, KC_LPAD,                            SPOTLI, _______, _______, _______, _______, _______,
+     _______, _______, _______, _______, _______, RGB_MODE_SWIRL,                     SPOTLI, _______, _______, _______, _______, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, __________________EMPTY_____________________,                           __________________MOU_R1____________________, _______,
+     _______, _______, _______, _______, _______, _______,                           _______, KC_PSTE, KC_COPY, KC_CUT,  KC_UNDO, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, __________________EMPTY_____________________,                           __________________MOU_R2____________________, _______,
+     _______, _______, _______, _______, _______, _______,                           KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, _______, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, __________________EMPTY_____________________, _______,         _______, __________________MOU_R3____________________, _______,
+     _______, _______, _______, _______, _______, _______, _______,         _______, KC_BTN2, KC_BTN1,  KC_WH_D, KC_WH_U, KC_BTN2, _______,
   //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                   ___________THUMB_3__BLANK__,                  ___________THUMB_3__BLANK__
+                                   _______, _______, _______,                  _______, _______, _______
                                 // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
   )
 };
 
 uint8_t mod_state;
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    static bool isWindows = false;
+    static bool isLinux = false;
     mod_state = get_mods();
     switch (keycode) {
-        case WINDOWS:
+
+        case LINUX:
             if (record->event.pressed) {
-                isWindows = !isWindows;
+                isLinux = !isLinux;
             }
             return false;
         case COPY:
             if (record->event.pressed) {
-                if (isWindows) {
+                if (isLinux) {
                     tap_code16(LCTL(KC_C));
                 } else {
                     tap_code16(LGUI(KC_C));
@@ -170,7 +235,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             }
         case PASTE:
             if (record->event.pressed) {
-                if (isWindows) {
+                if (isLinux) {
                     tap_code16(LCTL(KC_V));
                 } else {
                     tap_code16(LGUI(KC_V));
@@ -179,7 +244,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             }
         case CUT:
             if (record->event.pressed) {
-                if (isWindows) {
+                if (isLinux) {
                     tap_code16(LCTL(KC_X));
                 } else {
                     tap_code16(LGUI(KC_X));
@@ -188,7 +253,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             }
         case UNDO:
             if (record->event.pressed) {
-                if (isWindows) {
+                if (isLinux) {
                     tap_code16(LCTL(KC_Z));
                 } else {
                     tap_code16(LGUI(KC_Z));
@@ -197,7 +262,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             }
         case REDO:
             if (record->event.pressed) {
-                if (isWindows) {
+                if (isLinux) {
                     tap_code16(LCTL(KC_Y));
                 } else {
                     tap_code16(LSG(KC_Z));
@@ -206,7 +271,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             }
         case SALL:
             if (record->event.pressed) {
-                if (isWindows) {
+                if (isLinux) {
                     tap_code16(LCTL(KC_A));
                 } else {
                     tap_code16(LGUI(KC_A));
@@ -220,86 +285,39 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             return false;
         case M_PASS2:
             if (record->event.pressed) {
-               SEND_STRING("CindieVerano!2024");
+               SEND_STRING("CindieOtono!2024");
             }
             return false;
         case M_PASS3:
             if (record->event.pressed) {
-               SEND_STRING("1029");
+               SEND_STRING("1290");
             }
             return false;
         case M_PASS4:
             if (record->event.pressed) {
-               SEND_STRING("ThisisThel0ve0fchrist!");
+               SEND_STRING("Thel0ve0fchrist!");
             }
             return false;
         case SPOTLI:
             if (record->event.pressed) {
-               tap_code16(LGUI(KC_SPACE));              
+               tap_code16(LGUI(KC_SPACE));
             }
-            return false;      
+            return false;
   }
     return true;
 }
 
+
+#if defined(ENCODER_MAP_ENABLE)
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
-    [_QWERTY] = { ENCODER_CCW_CW(KC_PGUP, KC_PGDN), ENCODER_CCW_CW(KC_A, KC_A), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
-    [_NAV] = { ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(KC_A, KC_A), ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(RGB_MOD, RGB_RMOD) },
-    [_NUM] = { ENCODER_CCW_CW(C(KC_LEFT), C(KC_RIGHT)), ENCODER_CCW_CW(KC_A, KC_A), ENCODER_CCW_CW(RGB_SAD, RGB_SAI), ENCODER_CCW_CW(KC_B, KC_B) },
-    [_SYM] = { ENCODER_CCW_CW(C(KC_TAB), S(C(KC_TAB))), ENCODER_CCW_CW(KC_A, KC_A), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT), ENCODER_CCW_CW(KC_B, KC_B) },
-    [_MOUSE] = { ENCODER_CCW_CW(RGB_SPD, RGB_SPI), ENCODER_CCW_CW(KC_A, KC_A), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT), ENCODER_CCW_CW(KC_B, KC_B) },
-    [_FUN] = { ENCODER_CCW_CW(RGB_SPD, RGB_SPI), ENCODER_CCW_CW(KC_A, KC_A), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT), ENCODER_CCW_CW(KC_B, KC_B) },
-    [_MUS] = { ENCODER_CCW_CW(RGB_SPD, RGB_SPI), ENCODER_CCW_CW(KC_A, KC_A), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT), ENCODER_CCW_CW(KC_B, KC_B) },
-    [_COLEMAK_DH] = { ENCODER_CCW_CW(KC_PGUP, KC_PGDN), ENCODER_CCW_CW(KC_A, KC_A), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [_QWERTY] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT) },
+    [_COLEMAKDH] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT) },
+    [_NAV]    = { ENCODER_CCW_CW(C(KC_TAB), S(C(KC_TAB))), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT) },
+    [_NUM]    = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT) },
+    [_SYM]    = { ENCODER_CCW_CW(RGB_SPD, RGB_SPI), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT) },
+    [_MOUSE]  = { ENCODER_CCW_CW(A(KC_TAB), S(A(KC_TAB))), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT) },
+    [_FUN]    = { ENCODER_CCW_CW(RGB_VAI, RGB_VAD), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT) },
+    [_MUS]    = { ENCODER_CCW_CW(RM_NEXT, RM_PREV), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT) },
 };
-
-
-// Onboard LED
-#ifdef RGBLIGHT_ENABLE
-    // Configure LED
-    void keyboard_post_init_user(void) {
-        // Initialize RGB to static black
-        rgblight_enable_noeeprom();
-        rgblight_sethsv_noeeprom(HSV_BLACK);
-        rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
-    }
-
-    // Change LED
-    void housekeeping_task_user(void) {
-        // Caps lock status
-        if (host_keyboard_led_state().caps_lock) {
-            rgblight_setrgb_at(4, 4, 0, 0);
-        } else {
-            // Layers
-            switch (get_highest_layer(layer_state | default_layer_state)) {
-                case 0:
-                    rgblight_setrgb_at(4, 4, 4, 0);
-                    break;
-                case 1:
-                    rgblight_setrgb_at(4, 4, 4, 0);
-                    break;
-                case 2:
-                    rgblight_setrgb_at(4, 4, 4, 0);
-                    break;
-                case 3:
-                    rgblight_setrgb_at(4, 4, 4, 0);
-                    break;
-                case 4:
-                    rgblight_setrgb_at(0, 0, 4, 0);
-                    break;
-                case 5:
-                    rgblight_setrgb_at(0, 4, 0, 0);
-                    break;
-                case 6:
-                    rgblight_setrgb_at(0, 0, 4, 0);
-                    break;
-                case 7:
-                    rgblight_setrgb_at(0, 0, 4, 0);
-                    break;
-                case 8:
-                    rgblight_setrgb_at(0, 0, 4, 0);
-                    break;
-            }
-        }
-    }
 #endif
+

iris/rules.mk

@@ -1,5 +1,9 @@
-
+REPEAT_KEY_ENABLE = yes
 AUTO_SHIFT_ENABLE = yes
-
+CAPS_WORD_ENABLE = yes
+COMBO_ENABLE = yes
+TAP_DANCE_ENABLE = yes
 ENCODER_ENABLE = yes
 ENCODER_MAP_ENABLE = yes
+
+LTO_ENABLE = yes

q8/config.h

@@ -0,0 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#pragma once
+
+#define VIAL_KEYBOARD_UID {0x77, 0x4C, 0xB1, 0xD7, 0xDD, 0xBE, 0xF6, 0xD2}
+
+#define VIAL_UNLOCK_COMBO_ROWS { 0, 2 }
+#define VIAL_UNLOCK_COMBO_COLS { 0, 13 }

q8/keymap.c

@@ -15,149 +15,101 @@
  */
 
 #include QMK_KEYBOARD_H
+#include "keychron_common.h"
+#include "dgvigil.h"
 
-enum layer_number {
-  _BASE,
-  _COLDH,
-  _NAV,
-  _NUM,
-  _SYM,
-  _FUN,
-  _MUS,
-  _MOUSE
+// clang-format off
+
+enum layers{
+    QWERTY,
+    COLEDH,
+    _NAV,
+    _NUM,
+    _SYM,
+    _FUN,
+    _MUS,
+    _MOUSE
 };
 
-enum custom_keycodes {
-  M_PASS1 = SAFE_RANGE,
-  M_PASS2
-};
-
-// Tap Dance declarations
-enum {
-    TD_Q_ESC,
-    TD_W_GRV,
-};
-
-// Tap Dance definitions
-tap_dance_action_t tap_dance_actions[] = {
-    // Tap once for Q, twice for Escape
-    [TD_Q_ESC] = ACTION_TAP_DANCE_DOUBLE(KC_Q, KC_ESC),
-    [TD_W_GRV] = ACTION_TAP_DANCE_DOUBLE(KC_W, KC_GRAVE),
-};
-
-enum combos {
-  FA_GUI,
-  FS_ALT,
-  FD_CTL,
-  JQUOT_GUI,
-  JL_ALT,
-  JK_CTL
-};
-
-const uint16_t PROGMEM fa_combo[] = {KC_F, KC_A, COMBO_END};
-const uint16_t PROGMEM fs_combo[] = {KC_F, KC_S, COMBO_END};
-const uint16_t PROGMEM fd_combo[] = {KC_F, KC_D, COMBO_END};
-const uint16_t PROGMEM jquote_combo[] = {KC_J, KC_QUOT, COMBO_END};
-const uint16_t PROGMEM jl_combo[] = {KC_J, KC_L, COMBO_END};
-const uint16_t PROGMEM jk_combo[] = {KC_J, KC_K, COMBO_END};
-
-combo_t key_combos[] = {
-  [FA_GUI] = COMBO(fa_combo, KC_LGUI),
-  [FS_ALT] = COMBO(fs_combo, KC_LALT),
-  [FD_CTL] = COMBO(fd_combo, KC_LCTL),
-  [JQUOT_GUI] = COMBO(jquote_combo, KC_RGUI),
-  [JL_ALT] = COMBO(jl_combo, KC_RALT),
-  [JK_CTL] = COMBO(jk_combo, KC_RCTL),
-};
-
-// LEFT THUMB KEYS
-#define MUS_ESC LT(_MUS, KC_ESC)
-#define NAV_BKSP LT(_NAV, KC_BSPC)
-#define MOUSE_TAB LT(_MOUSE, KC_TAB)
-// RIGHT THUMB KEYS
-#define SYM_ENTER LT(_SYM, KC_ENTER)
-#define NUM_SPC LT(_NUM, KC_SPC)
-#define FUN_DEL LT(_FUN, KC_DEL)
-// TAP DANCE
-#define Q_ESC TD(TD_Q_ESC)
-#define W_GRV TD(TD_W_GRV)
-
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_BASE] = LAYOUT_ansi_69(
+    [QWERTY] = LAYOUT_ansi_69(
         KC_ESC,  KC_1,     KC_2,     KC_3,    KC_4,    KC_5,    KC_6,     KC_7,     KC_8,    KC_9,    KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,             KC_MUTE,
-        KC_LPAD, Q_ESC,   W_GRV,     KC_E,    KC_R,    KC_T,    KC_Y,     KC_U,     KC_I,    KC_O,    KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,             KC_DEL,
-        KC_CAPS, KC_A,     KC_S,     KC_D,    KC_F,    KC_G,              KC_H,     KC_J,    KC_K,    KC_L,     KC_SCLN,  KC_QUOT,  KC_ENT,              KC_HOME,
-        KC_LSFT,           KC_Z,     KC_X,    KC_C,    KC_V,    KC_B,     KC_B,     KC_N,    KC_M,    KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT, KC_UP,
-        KC_LCTL, KC_LOPT, MUS_ESC,          NAV_BKSP,          MOUSE_TAB,SYM_ENTER,         NUM_SPC,           FUN_DEL,           KC_LEFT, KC_DOWN,    KC_RGHT),
+        KC_TAB,  __________________BASE_L1____________________,    __________________BASE_R1____________________,     KC_LBRC,  KC_RBRC,  KC_BSLS,             KC_DEL,
+        KC_CAPS, __________________BASE_L2____________________,              __________________BASE_R2____________________,  KC_QUOT,  KC_ENT,              KC_HOME,
+        KC_LSFT,           __________________BASE_L3____________________,     KC_B,     __________________BASE_R3____________________,  KC_RSFT, KC_UP,
+        KC_LCTL, KC_LOPTN,        ___________THUMB_L3________,                                   ___________THUMB_R3________,          KC_LEFT, KC_DOWN,    KC_RGHT),
 
-    [_COLDH] = LAYOUT_ansi_69(
-        KC_ESC,  KC_1,     KC_2,     KC_3,    KC_4,    KC_5,    KC_6,     KC_7,     KC_8,    KC_9,    KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,             RGB_TOG,
-        KC_TAB,  KC_Q,     KC_W,     KC_F,    KC_P,    KC_B,    KC_J,     KC_L,     KC_U,    KC_Y,    KC_SCLN,  KC_LBRC,  KC_RBRC,  KC_BSLS,             KC_DEL,
-        KC_CAPS, KC_A,     KC_R,     KC_S,    KC_T,    KC_G,              KC_M,     KC_N,    KC_E,    KC_I,     KC_O,     KC_QUOT,  KC_ENT,              KC_HOME,
-        KC_LSFT,           KC_Z,     KC_X,    KC_C,    KC_D,    KC_V,     KC_GRV,   KC_K,    KC_H,    KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT, KC_UP,
-        KC_LCTL, KC_LOPT, MUS_ESC,          NAV_BKSP,          MOUSE_TAB,SYM_ENTER,         NUM_SPC,           FUN_DEL,           KC_LEFT, KC_DOWN,    KC_RGHT),
+    [COLEDH] = LAYOUT_ansi_69(
+        KC_ESC,  KC_1,     KC_2,     KC_3,    KC_4,    KC_5,    KC_6,     KC_7,     KC_8,    KC_9,    KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,             KC_MUTE,
+        KC_TAB,  __________________COLEML1____________________,    __________________COLEMR1____________________,     KC_LBRC,  KC_RBRC,  KC_BSLS,             KC_DEL,
+        KC_CAPS, __________________COLEML2____________________,              __________________COLEMR2____________________,  KC_QUOT,  KC_ENT,              KC_HOME,
+        KC_LSFT,           __________________COLEML3____________________,     KC_B,     __________________COLEMR3____________________,  KC_RSFT, KC_UP,
+        KC_LCTL, KC_LWIN,        ___________THUMB_L3________,                                   ___________THUMB_R3________,          KC_LEFT, KC_DOWN,    KC_RGHT),
 
     [_NAV] = LAYOUT_ansi_69(
-        QK_BOOT, KC_1,     KC_2,     KC_3,    KC_4,    KC_5,    KC_6,     _______,  _______, _______, _______,  _______,  _______,  _______,             KC_MUTE,
-        KC_TAB,  _______,  _______,  _______, _______, _______, _______,  _______,  KC_PSTE, KC_COPY, KC_CUT,   KC_UNDO,  KC_RBRC,  KC_BSLS,             KC_DEL,
-        KC_CAPS, _______,  _______,  _______, _______, _______,           KC_CAPS,  KC_LEFT, KC_DOWN, KC_UP,    KC_RGHT,  KC_QUOT,  KC_ENT,              KC_HOME,
-        KC_LSFT,           _______,  _______,  _______, _______, _______, _______,  KC_HOME, KC_PGUP,  KC_PGDN, KC_END,   KC_SLSH,  KC_RSFT, KC_UP,
-        KC_LCTL, KC_LOPT, MUS_ESC,          NAV_BKSP,          MOUSE_TAB,SYM_ENTER,         NUM_SPC,           FUN_DEL,           KC_LEFT, KC_DOWN,    KC_RGHT),
+        KC_ESC,  KC_1,     KC_2,     KC_3,    KC_4,    KC_5,    KC_6,     KC_7,     KC_8,    KC_9,    KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,             KC_MUTE,
+        KC_TAB,  __________________EMPTY_____________________,    __________________NAV_R1____________________,     KC_LBRC,  KC_RBRC,  KC_BSLS,             KC_DEL,
+        KC_CAPS, __________________NAV_L2____________________,              __________________NAV_R2____________________,  KC_QUOT,  KC_ENT,              KC_HOME,
+        KC_LSFT,           __________________NAV_L3____________________,     KC_B,     __________________NAV_R3____________________,  KC_RSFT, KC_UP,
+        KC_LCTL, KC_LWIN,        ___________THUMB_L3________,                                   ___________THUMB_R3________,          KC_LEFT, KC_DOWN,    KC_RGHT),
+
+    [_NUM] = LAYOUT_ansi_69(
+        KC_ESC,  KC_1,     KC_2,     KC_3,    KC_4,    KC_5,    KC_6,     KC_7,     KC_8,    KC_9,    KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,             KC_MUTE,
+        KC_TAB,  __________________COLEML1____________________,    __________________COLEMR1____________________,     KC_LBRC,  KC_RBRC,  KC_BSLS,             KC_DEL,
+        KC_CAPS, __________________COLEML2____________________,              __________________COLEMR2____________________,  KC_QUOT,  KC_ENT,              KC_HOME,
+        KC_LSFT,           __________________COLEML3____________________,     KC_B,     __________________COLEMR3____________________,  KC_RSFT, KC_UP,
+        KC_LCTL, KC_LWIN,        _________NUM_TH_L3________,                                   ___________THUMB_3__BLANK__,          KC_LEFT, KC_DOWN,    KC_RGHT),
 
     [_SYM] = LAYOUT_ansi_69(
-        KC_GRV,  KC_BRID,  KC_BRIU,  KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI,  KC_MPRV,  KC_MPLY, KC_MNXT, KC_MUTE,  KC_VOLD,  KC_VOLU,  _______,             RGB_TOG,
-        RGB_TOG, RGB_MOD,  RGB_VAI,  RGB_HUI, RGB_SAI, RGB_SPI, _______,  _______,  _______, _______, _______,  _______,  _______,  _______,             _______,
-        _______, RGB_RMOD, RGB_VAD,  RGB_HUD, RGB_SAD, RGB_SPD,           _______,  _______, _______, _______,  _______,  _______,  _______,             _______,
-        _______,           _______,  _______, _______, _______, _______,  _______,  NK_TOGG, _______, _______,  _______,  _______,  _______, _______,
-        _______, _______,  _______,           _______,          _______,  _______,           _______,           _______,            _______, _______,    _______),
+        KC_ESC,  KC_1,     KC_2,     KC_3,    KC_4,    KC_5,    KC_6,     KC_7,     KC_8,    KC_9,    KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,             KC_MUTE,
+        KC_TAB,  __________________SYM_L1____________________,    __________________COLEMR1____________________,     KC_LBRC,  KC_RBRC,  KC_BSLS,             KC_DEL,
+        KC_CAPS, __________________SYM_L2____________________,              __________________COLEMR2____________________,  KC_QUOT,  KC_ENT,              KC_HOME,
+        KC_LSFT,           __________________SYM_L3____________________,     KC_B,     __________________COLEMR3____________________,  KC_RSFT, KC_UP,
+        KC_LCTL, KC_LWIN,        _________SYM_TH_L3________,                                   ___________THUMB_3__BLANK__,          KC_LEFT, KC_DOWN,    KC_RGHT),
 
     [_FUN] = LAYOUT_ansi_69(
-        KC_GRV,  KC_BRID,  KC_BRIU,  KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI,  KC_MPRV,  KC_MPLY, KC_MNXT, KC_MUTE,  KC_VOLD,  KC_VOLU,  _______,             RGB_TOG,
-        RGB_TOG, RGB_MOD,  RGB_VAI,  RGB_HUI, RGB_SAI, RGB_SPI, _______,  _______,  _______, _______, _______,  _______,  _______,  _______,             _______,
-        _______, RGB_RMOD, RGB_VAD,  RGB_HUD, RGB_SAD, RGB_SPD,           _______,  _______, _______, _______,  _______,  _______,  _______,             _______,
-        _______,           _______,  _______, _______, _______, _______,  _______,  NK_TOGG, _______, _______,  _______,  _______,  _______, _______,
-        _______, _______,  _______,           _______,          _______,  _______,           _______,           _______,            _______, _______,    _______),
+        KC_ESC,  KC_1,     KC_2,     KC_3,    KC_4,    KC_5,    KC_6,     KC_7,     KC_8,    KC_9,    KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,             KC_MUTE,
+        KC_TAB,  __________________FUN_L1____________________,    _________________BOOT_R1____________________,     KC_LBRC,  KC_RBRC,  KC_BSLS,             KC_DEL,
+        KC_CAPS, __________________FUN_L2____________________,              __________________EMPTY_____________________,  KC_QUOT,  KC_ENT,              KC_HOME,
+        KC_LSFT,           __________________FUN_L3____________________,     KC_B,     __________________EMPTY_____________________,  KC_RSFT, KC_UP,
+        KC_LCTL, KC_LWIN,        ___________THUMB_3__BLANK__,                                   ___________THUMB_3__BLANK__,          KC_LEFT, KC_DOWN,    KC_RGHT),
 
     [_MUS] = LAYOUT_ansi_69(
-        KC_GRV,  KC_BRID,  KC_BRIU,  KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI,  KC_MPRV,  KC_MPLY, KC_MNXT, KC_MUTE,  KC_VOLD,  KC_VOLU,  _______,             RGB_TOG,
-        RGB_TOG, RGB_MOD,  RGB_VAI,  RGB_HUI, RGB_SAI, RGB_SPI, _______,  _______,  _______, _______, _______,  _______,  _______,  _______,             _______,
-        _______, RGB_RMOD, RGB_VAD,  RGB_HUD, RGB_SAD, RGB_SPD,           _______,  _______, _______, _______,  _______,  _______,  _______,             _______,
-        _______,           _______,  _______, _______, _______, _______,  _______,  NK_TOGG, _______, _______,  _______,  _______,  _______, _______,
-        _______, _______,  _______,           _______,          _______,  _______,           _______,           _______,            _______, _______,    _______),
+        KC_ESC,  KC_1,     KC_2,     KC_3,    KC_4,    KC_5,    KC_6,     KC_7,     KC_8,    KC_9,    KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,             KC_MUTE,
+        KC_TAB,  _________________BOOT_L1____________________,    __________________EMPTY_____________________,     KC_LBRC,  KC_RBRC,  KC_BSLS,             KC_DEL,
+        KC_CAPS, __________________EMPTY_____________________,              __________________MUS_R2____________________,  KC_QUOT,  KC_ENT,              KC_HOME,
+        KC_LSFT,           __________________EMPTY_____________________,     KC_B,     __________________MUS_R3____________________,  KC_RSFT, KC_UP,
+        KC_LCTL, KC_LWIN,        ___________THUMB_3__BLANK__,                                   ___________THUMB_3__BLANK__,          KC_LEFT, KC_DOWN,    KC_RGHT),
 
     [_MOUSE] = LAYOUT_ansi_69(
-        KC_TILD, KC_F1,    KC_F2,    KC_F3,   KC_F4,   KC_F5,   KC_F6,    KC_F7,    KC_F8,   KC_F9,   KC_F10,   KC_F11,   KC_F12,   _______,             _______,
-        RGB_TOG, RGB_MOD,  RGB_VAI,  RGB_HUI, RGB_SAI, RGB_SPI, _______,  _______,  _______, _______, _______,  _______,  _______,  _______,             _______,
-        _______, RGB_RMOD, RGB_VAD,  RGB_HUD, RGB_SAD, RGB_SPD,           _______,  _______, _______, _______,  _______,  _______,  _______,             _______,
-        _______,           _______,  _______, _______, _______, _______,  _______,  _______, _______, _______,  _______,  _______,  _______, _______,
-        _______, _______,  _______,           _______,          _______,  _______,           _______,           _______,            _______, _______,    _______)
+        KC_ESC,  KC_1,     KC_2,     KC_3,    KC_4,    KC_5,    KC_6,     KC_7,     KC_8,    KC_9,    KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,             KC_MUTE,
+        KC_TAB,  __________________EMPTY_____________________,    __________________MOU_R1____________________,     KC_LBRC,  KC_RBRC,  KC_BSLS,             KC_DEL,
+        KC_CAPS, __________________EMPTY_____________________,              __________________MOU_R2____________________,  KC_QUOT,  KC_ENT,              KC_HOME,
+        KC_LSFT,           __________________EMPTY_____________________,     KC_B,     __________________MOU_R3____________________,  KC_RSFT, KC_UP,
+        KC_LCTL, KC_LWIN,        ___________THUMB_3__BLANK__,                                   ___________THUMB_3__BLANK__,          KC_LEFT, KC_DOWN,    KC_RGHT)
 };
 
 #if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
-    [_BASE]  = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [QWERTY] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+    [COLEDH] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
     [_NAV]   = {ENCODER_CCW_CW(RGB_MOD, RGB_RMOD)},
-    [_SYM]   = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)},
-    [_FUN]   = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)},
+    [_NUM]   = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)},
+    [_FUN]   = {ENCODER_CCW_CW(RGB_HUI, RGB_HUD)},
     [_MUS]   = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)},
-    [_MOUSE] = {ENCODER_CCW_CW(_______, _______)}
+    [_MOUSE]   = {ENCODER_CCW_CW(_______, _______)}
 };
 #endif // ENCODER_MAP_ENABLE
 
+// clang-format on
+
+void housekeeping_task_user(void) {
+    housekeeping_task_keychron();
+}
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case M_PASS1:
-            if (record->event.pressed) {
-                SEND_STRING("P0plarLake!2023");
-            }
-            return false;
-        case M_PASS2:
-            if (record->event.pressed) {
-               SEND_STRING("C0pperfield!2023");
-            }
-            return false;
-  }
+    if (!process_record_keychron(keycode, record)) {
+        return false;
+    }
     return true;
-}
+}

q8/rules.mk

@@ -1,4 +1,8 @@
+VIA_ENABLE = yes
+VIAL_ENABLE = yes
+VIALRGB_ENABLE = yes
 ENCODER_MAP_ENABLE = yes
+COMBO_ENABLE = yes
 
 VPATH += keyboards/keychron/common
 SRC += keychron_common.c

q8/vial.json

@@ -0,0 +1,297 @@
+{
+  "name": "Keychron Q8",
+  "vendorId": "0x3434",
+  "productId": "0x0181",
+  "lighting": "vialrgb",
+  "customKeycodes": [
+    {"name": "Mission Control", "title": "Mission Control in macOS", "shortName": "MCtrl"},
+    {"name": "Launch Pad",      "title": "Launch Pad in macOS",      "shortName": "LPad"},
+    {"name": "Left Option",     "title": "Left Option in macOS",     "shortName": "LOpt"},
+    {"name": "Right Option",    "title": "Right Option in macOS",    "shortName": "ROpt"},
+    {"name": "Left Cmd",        "title": "Left Command in macOS",    "shortName": "LCmd"},
+    {"name": "Right Cmd",       "title": "Right Command in macOS",   "shortName": "RCmd"},
+    {"name": "Siri",            "title": "Siri in macOS",            "shortName": "Siri"},
+    {"name": "Task View",       "title": "Task View in windows",     "shortName": "Task"},
+    {"name": "File Explorer",   "title": "File Explorer in windows", "shortName": "File"},
+    {"name": "Screen Shot",     "title": "Screenshot in macOS",      "shortName": "SShot"},
+    {"name": "Cortana",         "title": "Cortana in windows",       "shortName": "Cortana"}
+  ],
+  "matrix": {"rows": 5, "cols": 15},
+  "layouts": {
+    "keymap": [
+      [
+        {
+          "x": 2.75
+        },
+        "0,2",
+        {
+          "x": 8.85
+        },
+        "0,11",
+        {
+          "x": 3.5000000000000018,
+          "c": "#aaaaaa"
+        },
+        "0,14"
+      ],
+      [
+        {
+          "y": -0.8500000000000001,
+          "x": 13.6,
+          "c": "#cccccc"
+        },
+        "0,12",
+        {
+          "c": "#aaaaaa",
+          "w": 2
+        },
+        "0,13"
+      ],
+      [
+        {
+          "y": -0.9999999999999999,
+          "x": 18.25
+        },
+        "0,0\n\n\n\n\n\n\n\n\ne"
+      ],
+      [
+        {
+          "y": -0.9999999999999999,
+          "x": 19.25
+        },
+        "0,1\n\n\n\n\n\n\n\n\ne",
+        {
+          "x": -19.5,
+          "c": "#777777"
+        },
+        "0,0\nESC",
+        {
+          "c": "#cccccc"
+        },
+        "0,1"
+      ],
+      [
+        {
+          "x": 0.5,
+          "c": "#aaaaaa",
+          "w": 1.5
+        },
+        "1,0",
+        {
+          "c": "#cccccc"
+        },
+        "1,1",
+        {
+          "x": 10.3
+        },
+        "1,11",
+        "1,12",
+        {
+          "w": 1.5
+        },
+        "1,13"
+      ],
+      [
+        {
+          "y": -0.8999999999999999,
+          "x": 17.3,
+          "c": "#aaaaaa"
+        },
+        "1,14"
+      ],
+      [
+        {
+          "y": -0.10000000000000009,
+          "x": 0.25,
+          "w": 1.75
+        },
+        "2,0",
+        {
+          "c": "#cccccc"
+        },
+        "2,1",
+        {
+          "x": 9.75
+        },
+        "2,11",
+        "2,12",
+        {
+          "c": "#777777",
+          "w": 2.25
+        },
+        "2,13"
+      ],
+      [
+        {
+          "y": -0.8999999999999999,
+          "x": 17.5,
+          "c": "#aaaaaa"
+        },
+        "2,14"
+      ],
+      [
+        {
+          "y": -0.10000000000000009,
+          "w": 2.25
+        },
+        "3,0",
+        {
+          "c": "#cccccc"
+        },
+        "3,2",
+        {
+          "x": 10.15
+        },
+        "3,12",
+        {
+          "c": "#aaaaaa",
+          "w": 1.75
+        },
+        "3,13"
+      ],
+      [
+        {
+          "y": -0.75,
+          "x": 16.4,
+          "c": "#777777"
+        },
+        "3,14"
+      ],
+      [
+        {
+          "y": -0.25,
+          "c": "#aaaaaa",
+          "w": 1.25
+        },
+        "4,0",
+        {
+          "w": 1.25
+        },
+        "4,1"
+      ],
+      [
+        {
+          "y": -0.75,
+          "x": 15.4,
+          "c": "#777777"
+        },
+        "4,12",
+        "4,13",
+        "4,14"
+      ],
+      [
+        {
+          "r": 6,
+          "y": -5.7,
+          "x": 3.85,
+          "c": "#cccccc"
+        },
+        "0,3",
+        "0,4",
+        "0,5",
+        "0,6"
+      ],
+      [
+        {
+          "x": 3.35
+        },
+        "1,2",
+        "1,3",
+        "1,4",
+        "1,5"
+      ],
+      [
+        {
+          "x": 3.55
+        },
+        "2,2",
+        "2,3",
+        "2,4",
+        "2,5"
+      ],
+      [
+        {
+          "x": 3.9
+        },
+        "3,3",
+        "3,4",
+        "3,5",
+        "3,6"
+      ],
+      [
+        {
+          "x": 4,
+          "c": "#aaaaaa",
+          "w": 1.25
+        },
+        "4,2",
+        {
+          "c": "#cccccc",
+          "w": 2.25
+        },
+        "4,3",
+        {
+          "c": "#aaaaaa"
+        },
+        "4,6"
+      ],
+      [
+        {
+          "r": -6,
+          "y": -3.2,
+          "x": 8.35,
+          "c": "#cccccc"
+        },
+        "0,7",
+        "0,8",
+        "0,9",
+        "0,10"
+      ],
+      [
+        {
+          "x": 7.9
+        },
+        "1,6",
+        "1,7",
+        "1,8",
+        "1,9",
+        "1,10"
+      ],
+      [
+        {
+          "x": 8.25
+        },
+        "2,7",
+        "2,8",
+        "2,9",
+        "2,10"
+      ],
+      [
+        {
+          "x": 7.8
+        },
+        "3,7",
+        "3,8",
+        "3,9",
+        "3,10",
+        "3,11"
+      ],
+      [
+        {
+          "x": 7.8,
+          "c": "#aaaaaa"
+        },
+        "4,7",
+        {
+          "c": "#cccccc",
+          "w": 2.75
+        },
+        "4,8",
+        {
+          "c": "#aaaaaa"
+        },
+        "4,9"
+      ]
+    ]
+  }
+}