Sadly, I'm just adding a Vial file for the Iris

.github/workflows/lint_and_compile.yml

@@ -6,26 +6,47 @@ jobs:
         steps:
           - name: Check out repository code
             uses: actions/checkout@v4
+          - name: Clone qmk_firmware
+            uses: actions/checkout@v2
             with:
-                submodules: 'true'
+              repository: Homelab/qmk_firmware
+              path: qmk_firmware
+              ref: master
           - name: Setup
             run: |
-                  python3 -m pip install --user qmk
+                  pwd
-                  python3 -m pip install -r /home/runner/work/dgvigil-keebs/dgvigil-keebs/qmk_firmware/requirements.txt
+                  python3 -m pip install --break-system-package  qmk
+                  python3 -m pip install --break-system-package -r /workspace/dave/dgvigil-keebs/qmk_firmware/requirements.txt
                   qmk setup -y
-                  cd /home/runner/work/dgvigil-keebs/dgvigil-keebs/qmk_firmware/
+                  cd /workspace/dave/dgvigil-keebs/qmk_firmware/
                   make git-submodules
+                  apt install -y rsync 
           - name: Prep
             run: |
-                  cd /home/runner/work/dgvigil-keebs/dgvigil-keebs/
+                  cd /workspace/dave/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/
+                  cd /workspace/dave/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
                   qmk compile -kb keebio/iris/rev8 -km via
+                  # echo "Building QMK for bluebell/swoop"
+                  # qmk compile -kb bluebell/swoop -km dgvigil -e CONVERT_TO=promicro_rp2040
                   find -maxdepth 1 -name "*.hex"
                   find -maxdepth 1 -name "*.uf2"
                   mkdir -p ~/compiled/firmware

.gitmodules

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

dgvigil/definitions/keymap_blocks.h

@@ -17,7 +17,7 @@
 // EMPTY ROW
 #define __________________EMPTY_____________________ _______, _______, _______, _______, _______
 // BOOTLOADER
-#define _________________BOOT_R1____________________ COLDH, _______, _______, _______, QK_BOOTLOADER
+#define _________________BOOT_R1____________________ _______, _______, _______, _______, QK_BOOTLOADER
 #define _________________BOOT_L1____________________ QK_BOOTLOADER,_______,_______,_______,QWERT
 
 
@@ -72,11 +72,3 @@
 #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 __________________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 __________________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

@@ -2,11 +2,10 @@
 
 typedef enum {
   _QWERTY, // 0
-  _COLEMAKDH,
+  _NAV, // 1
-  _NAV, // 2
+  _NUM, //2
-  _NUM, //3
+  _SYM, // 3
-  _SYM, // 4
+  _FUN, // 4
-  _FUN, // 5
+  _MUS, // 5
-  _MUS, // 6
   _MOUSE // 7
 } layers_t;

dgvigil/features/macros.c

@@ -3,16 +3,94 @@
 #include "macros.h"
 
 
-process_record_result_t process_macro_keycode(uint16_t keycode, keyrecord_t *record) {
+uint8_t mod_state;
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    static bool isLinux = false;
+    mod_state = get_mods();
     switch (keycode) {
+
+        case LINUX:
+            if (record->event.pressed) {
+                isLinux = !isLinux;
+            }
+            return false;
+        case COPY:
+            if (record->event.pressed) {
+                if (isLinux) {
+                    tap_code16(RCS(KC_C));
+                } else {
+                    tap_code16(LGUI(KC_C));
+                }
+                return false;
+            }
+        case PASTE:
+            if (record->event.pressed) {
+                if (isLinux) {
+                    tap_code16(RCS(KC_V));
+                } else {
+                    tap_code16(LGUI(KC_V));
+                }
+            return false;
+            }
+        case CUT:
+            if (record->event.pressed) {
+                if (isLinux) {
+                    tap_code16(RCS(KC_X));
+                } else {
+                    tap_code16(LGUI(KC_X));
+                }
+                return false;
+            }
+        case UNDO:
+            if (record->event.pressed) {
+                if (isLinux) {
+                    tap_code16(LCTL(KC_Z));
+                } else {
+                    tap_code16(LGUI(KC_Z));
+                }
+                return false;
+            }
+        case REDO:
+            if (record->event.pressed) {
+                if (isLinux) {
+                    tap_code16(LCTL(KC_Y));
+                } else {
+                    tap_code16(LSG(KC_Z));
+                }
+                return false;
+            }
+        case SALL:
+            if (record->event.pressed) {
+                if (isLinux) {
+                    tap_code16(LCTL(KC_A));
+                } else {
+                    tap_code16(LGUI(KC_A));
+                }
+                return false;
+            }
         case M_PASS1:
             if (record->event.pressed) {
-                SEND_STRING("T3lg3Ranch!2023");
+                SEND_STRING("P0plarLake!2023");
             }
             return false;
         case M_PASS2:
             if (record->event.pressed) {
-               SEND_STRING("P0plarLake!2023");
+               SEND_STRING("CindieOtono!2024");
+            }
+            return false;
+        case M_PASS3:
+            if (record->event.pressed) {
+               SEND_STRING("1290");
+            }
+            return false;
+        case M_PASS4:
+            if (record->event.pressed) {
+               SEND_STRING("Thel0ve0fchrist!");
+            }
+            return false;
+        case SPOTLI:
+            if (record->event.pressed) {
+               tap_code16(LGUI(KC_SPACE));
             }
             return false;
   }

iris/keymap.c

@@ -1,38 +1,9 @@
 #include QMK_KEYBOARD_H
-#include <stdint.h>
+
+#include "dgvigil.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,
@@ -76,248 +47,121 @@ combo_t key_combos[] = {
   [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),
+  [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(
+  [_QWERTY] = LAYOUT_wrapper(
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
      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,  Q_ESC,   KC_W,    KC_E,    KC_R,    KC_T,                               KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_GRV,
+     KC_TAB,  __________________BASE_L1____________________,                          __________________BASE_R1____________________, KC_GRV,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     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_LCTL, __________________BASE_L2____________________,                          __________________BASE_R2____________________, KC_RCTL,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     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,
+     KC_LSFT, __________________BASE_L3____________________,SPOTLI,          _______, __________________BASE_R3____________________, KC_RSFT,
   //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    MUS_ESC, NAV_BKSP,MOUSE_TAB,                 SYM_ENTER,NUM_SPC,FUN_DEL
+                                    ___________THUMB_L3________,                 ___________THUMB_R3________
                                 // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
   ),
 
-  [_COLEMAKDH] = LAYOUT(
+  [_NAV] = LAYOUT_wrapper(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     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,  Q_ESC,   KC_W,   KC_F,    KC_P,    KC_B,                                KC_J,   KC_L,    KC_U,    KC_Y,    KC_QUOT, KC_GRV,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_LCTL, KC_A,    KC_R,    KC_S,    KC_T,    KC_G,                               KC_M,   KC_N,    KC_E,    KC_I,    KC_O, KC_RCTL,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     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,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    MUS_ESC, NAV_BKSP,MOUSE_TAB,                 SYM_ENTER,NUM_SPC,FUN_DEL
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
-
-  [_NAV] = LAYOUT(
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
      _______, _______, _______, _______, _______, RGB_MODE_SWIRL,                     SPOTLI, _______, _______, _______, _______, RGB_TOG,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______, _______, _______, _______, _______,                            KC_CAPS, PASTE,   COPY,    CUT,     UNDO,    _______,
+     _______, __________________EMPTY_____________________,                           __________________NAV_R1____________________, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______, _______, _______, M_PASS3, M_PASS4,                            KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______,
+     _______, __________________NAV_L2____________________,                           __________________NAV_R2____________________, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______, _______, _______, M_PASS2, M_PASS1, LINUX,            _______, SALL,    KC_HOME, KC_PGUP, KC_PGDN, KC_END, _______,
+     _______, __________________NAV_L3____________________, LINUX,         _______, __________________NAV_R3____________________, _______,
   //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    MUS_ESC, NAV_BKSP,MOUSE_TAB,                 SYM_ENTER,NUM_SPC,FUN_DEL
+                                    ___________THUMB_L3________,                 ___________THUMB_R3________
                                 // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
   ),
 
-  [_NUM] = LAYOUT(
+  [_NUM] = LAYOUT_wrapper(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______, _______, _______, _______, _______, RGB_MODE_SWIRL,                     SPOTLI,  _______, _______, _______, _______, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, KC_LBRC, KC_7,    KC_8,    KC_9,    KC_RBRC,                            COLDH,   _______, _______, _______, QWERT, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, KC_SCLN, KC_4,    KC_5,    KC_6,    KC_EQL,                             _______, _______, _______, _______, _______, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, KC_DOT,  KC_1,    KC_2,    KC_3,    KC_BSLS, KC_LPRN,          _______, _______, _______, _______, _______, _______, _______,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    KC_DOT,  KC_0,    KC_MINUS,                 _______, _______, _______
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
-
-  [_SYM] = LAYOUT(
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
      _______, _______, _______, _______, _______, RGB_MODE_SWIRL,                     SPOTLI, _______, _______, _______, _______, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, KC_LCBR, KC_AMPR, KC_ASTR, KC_LPRN, KC_RCBR,                           _______, _______, _______, _______, _______, _______,
+     _______, __________________NUM_L1____________________,                           _________________BOOT_R1____________________, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, KC_COLN, KC_DLR,  KC_PERC, KC_CIRC, KC_PLUS,                           _______, _______, _______, _______, _______, _______,
+     _______, __________________NUM_L2____________________,                           __________________EMPTY_____________________, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_PIPE, _______,         _______, _______, _______, _______, _______, _______, _______,
+     _______, __________________NUM_L3____________________, KC_LPRN,         _______, __________________EMPTY_____________________, _______,
   //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    KC_LPRN, KC_RPRN, KC_UNDS,                  _______, _______, _______
+                                    _________NUM_TH_L3________,                 ___________THUMB_3__BLANK__
                                 // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
   ),
 
- [_FUN] = LAYOUT(
+  [_SYM] = LAYOUT_wrapper(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______, _______, _______, _______, _______, RGB_M_SW,                           SPOTLI, _______, _______, _______, _______, QK_BOOT,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, KC_F12,  KC_F7,   KC_F8,   KC_F9,   KC_PSCR,                            RM_NEXT,RM_PREV,_______,_______,QWERT, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, KC_F11,  KC_F4,   KC_F5,   KC_F6,   _______,                            RGB_M_X, _______, _______, _______, _______, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, KC_F10,  KC_F1,   KC_F2,   KC_F3,   _______, _______,         _______, _______, _______, _______, _______, _______, _______,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    _______, _______, _______,                 _______, _______, _______
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
-
-  [_MUS] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     QK_BOOT, _______, _______, _______, _______, RGB_MODE_SWIRL,                     SPOTLI, _______, _______, _______, _______, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______,_______,_______,_______,QWERT,                           _______, _______, _______, _______, _______, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______, _______, _______, _______, _______,                           _______, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______, _______, _______, _______, _______, _______,         _______, _______, KC_MSTP, KC_MPLY, KC_MUTE, _______, _______,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    _______, _______, _______,                 _______, _______, _______
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
-
-  [_MOUSE] = LAYOUT(
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
      _______, _______, _______, _______, _______, RGB_MODE_SWIRL,                     SPOTLI, _______, _______, _______, _______, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______, _______, _______, _______, _______,                           _______, KC_PSTE, KC_COPY, KC_CUT,  KC_UNDO, _______,
+     _______, __________________SYM_L1____________________,                           __________________EMPTY_____________________, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______, _______, _______, _______, _______,                           KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, _______, _______,
+     _______, __________________SYM_L2____________________,                           __________________EMPTY_____________________, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _______, _______, _______, _______, _______, _______,         _______, KC_BTN2, KC_BTN1,  KC_WH_D, KC_WH_U, KC_BTN2, _______,
+     _______, __________________SYM_L3____________________, _______,         _______, __________________EMPTY_____________________, _______,
   //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                   _______, _______, _______,                  _______, _______, _______
+                                    _________SYM_TH_L3________,                  ___________THUMB_3__BLANK__
+                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
+  ),
+
+ [_FUN] = LAYOUT_wrapper(
+  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
+     _______, _______, _______, _______, _______, RGB_MODE_SWIRL,                     SPOTLI, _______, _______, _______, _______, _______,
+  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
+     _______, __________________FUN_L1____________________,                            _________________BOOT_R1____________________, _______,
+  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
+     _______, __________________FUN_L2____________________,                            __________________EMPTY_____________________, _______,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     _______, __________________FUN_L3____________________, _______,         _______, __________________EMPTY_____________________, _______,
+  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
+                                    ___________THUMB_3__BLANK__,                 ___________THUMB_3__BLANK__
+                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
+  ),
+
+  [_MUS] = LAYOUT_wrapper(
+  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
+     _______, _______, _______, _______, _______, RGB_MODE_SWIRL,                     SPOTLI, _______, _______, _______, _______, _______,
+  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
+     _______, _________________BOOT_L1____________________,                           __________________EMPTY_____________________, _______,
+  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
+     _______, __________________EMPTY_____________________,                           __________________MUS_R2____________________, _______,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     _______, __________________EMPTY_____________________, _______,         _______, __________________MUS_R3____________________, _______,
+  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
+                                    ___________THUMB_3__BLANK__,                 ___________THUMB_3__BLANK__
+                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
+  ),
+
+  [_MOUSE] = LAYOUT_wrapper(
+  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
+     _______, _______, _______, _______, _______, RGB_MODE_SWIRL,                     SPOTLI, _______, _______, _______, _______, _______,
+  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
+     _______, __________________EMPTY_____________________,                           __________________MOU_R1____________________, _______,
+  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
+     _______, __________________EMPTY_____________________,                           __________________MOU_R2____________________, _______,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     _______, __________________EMPTY_____________________, _______,         _______, __________________MOU_R3____________________, _______,
+  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
+                                   ___________THUMB_3__BLANK__,                  ___________THUMB_3__BLANK__
                                 // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
   )
 };
 
-uint8_t mod_state;
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    static bool isLinux = false;
-    mod_state = get_mods();
-    switch (keycode) {
-
-        case LINUX:
-            if (record->event.pressed) {
-                isLinux = !isLinux;
-            }
-            return false;
-        case COPY:
-            if (record->event.pressed) {
-                if (isLinux) {
-                    tap_code16(LCTL(KC_C));
-                } else {
-                    tap_code16(LGUI(KC_C));
-                }
-                return false;
-            }
-        case PASTE:
-            if (record->event.pressed) {
-                if (isLinux) {
-                    tap_code16(LCTL(KC_V));
-                } else {
-                    tap_code16(LGUI(KC_V));
-                }
-            return false;
-            }
-        case CUT:
-            if (record->event.pressed) {
-                if (isLinux) {
-                    tap_code16(LCTL(KC_X));
-                } else {
-                    tap_code16(LGUI(KC_X));
-                }
-                return false;
-            }
-        case UNDO:
-            if (record->event.pressed) {
-                if (isLinux) {
-                    tap_code16(LCTL(KC_Z));
-                } else {
-                    tap_code16(LGUI(KC_Z));
-                }
-                return false;
-            }
-        case REDO:
-            if (record->event.pressed) {
-                if (isLinux) {
-                    tap_code16(LCTL(KC_Y));
-                } else {
-                    tap_code16(LSG(KC_Z));
-                }
-                return false;
-            }
-        case SALL:
-            if (record->event.pressed) {
-                if (isLinux) {
-                    tap_code16(LCTL(KC_A));
-                } else {
-                    tap_code16(LGUI(KC_A));
-                }
-                return false;
-            }
-        case M_PASS1:
-            if (record->event.pressed) {
-                SEND_STRING("P0plarLake!2023");
-            }
-            return false;
-        case M_PASS2:
-            if (record->event.pressed) {
-               SEND_STRING("CindieOtono!2024");
-            }
-            return false;
-        case M_PASS3:
-            if (record->event.pressed) {
-               SEND_STRING("1290");
-            }
-            return false;
-        case M_PASS4:
-            if (record->event.pressed) {
-               SEND_STRING("Thel0ve0fchrist!");
-            }
-            return false;
-        case SPOTLI:
-            if (record->event.pressed) {
-               tap_code16(LGUI(KC_SPACE));
-            }
-            return false;
-  }
-    return true;
-}
 
 
-#if defined(ENCODER_MAP_ENABLE)
+// #define ___________THUMB_L3________ MUS_ESC, NAV_BKSP,MOUSE_TAB
+// #define ___________THUMB_R3________ SYM_ENTER,NUM_SPC,FUN_DEL
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
-    [_QWERTY] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT) },
+    [_QWERTY] = { ENCODER_CCW_CW(KC_A, KC_A), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT), ENCODER_CCW_CW(KC_B, KC_B), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
-    [_COLEMAKDH] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT) },
+    [_NAV]    = { ENCODER_CCW_CW(KC_A, KC_A), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT), ENCODER_CCW_CW(KC_B, KC_B), ENCODER_CCW_CW(C(KC_TAB), S(C(KC_TAB))) },
-    [_NAV]    = { ENCODER_CCW_CW(C(KC_TAB), S(C(KC_TAB))), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT) },
+    [_NUM]    = { ENCODER_CCW_CW(KC_A, KC_A), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT), ENCODER_CCW_CW(KC_B, KC_B), ENCODER_CCW_CW(RGB_HUD, RGB_HUI) },
-    [_NUM]    = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT) },
+    [_SYM]    = { ENCODER_CCW_CW(KC_A, KC_A), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT), ENCODER_CCW_CW(KC_B, KC_B), ENCODER_CCW_CW(RGB_SPD, RGB_SPI) },
-    [_SYM]    = { ENCODER_CCW_CW(RGB_SPD, RGB_SPI), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT) },
+    [_MOUSE]  = { ENCODER_CCW_CW(KC_A, KC_A), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT), ENCODER_CCW_CW(KC_B, KC_B), ENCODER_CCW_CW(A(KC_TAB), S(A(KC_TAB))) },
-    [_MOUSE]  = { ENCODER_CCW_CW(A(KC_TAB), S(A(KC_TAB))), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT) },
+    [_FUN]    = { ENCODER_CCW_CW(KC_A, KC_A), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT), ENCODER_CCW_CW(KC_B, KC_B), ENCODER_CCW_CW(RGB_VAI, RGB_VAD)  },
-    [_FUN]    = { ENCODER_CCW_CW(RGB_VAI, RGB_VAD), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT) },
+    [_MUS]    = { ENCODER_CCW_CW(KC_A, KC_A), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT), ENCODER_CCW_CW(KC_B, KC_B), ENCODER_CCW_CW(RGB_MOD, RGB_RMOD) },
-    [_MUS]    = { ENCODER_CCW_CW(RM_NEXT, RM_PREV), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT) },
 };
-#endif
 

iris/rules.mk

@@ -1,9 +1,5 @@
-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

macropad/keyboard.json

@@ -0,0 +1,48 @@
+{
+    "manufacturer": "dgvigil",
+    "keyboard_name": "chicanopad",
+    "maintainer": "dgvigil",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["GP6", "GP7", "GP8", "GP9"],
+        "rows": ["GP10", "GP11", "GP12", "GP13"]
+    },
+    "processor": "RP2040",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0000",
+        "vid": "0xFEED"
+    },
+    "layouts": {
+        "LAYOUT_ortho_4x4": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3}
+            ]
+        }
+    }
+}

macropad/keymaps/default/keymap.c

@@ -0,0 +1,25 @@
+#include QMK_KEYBOARD_H
+
+// Layout definitions
+#define _MACOS 0
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌─--──┬─--──┬─--──┬─--──┐
+     * │COPY │PSTE │SALL │TO(_LINUX)│
+     * ├─--──┼─--──┼─--──┼─--──┤
+     * │SPOT │UP   │ ~/` │TO(_NUMPAD)│
+     * ├─--──┼─--──┼─--──┼─--──┤
+     * │LEFT │DOWN │RGHT │OSL(_OTHER)│
+     * ├─--──┼─--──┼─--──┼─--──┤
+     * │HOME │ENTR │END  │ESC  │
+     * └─--──┴─--──┴─--──┴─--──┘
+     */
+    [_MACOS] = LAYOUT_ortho_4x4(
+        LGUI(KC_C),     LGUI(KC_V), LGUI(KC_A), KC_GRV,
+        LGUI(KC_SPACE), KC_UP,      KC_GRV,     KC_GRV,
+        KC_LEFT,        KC_DOWN,    KC_RGHT,    KC_GRV,
+        KC_HOME,        KC_ENT,     KC_END,     KC_ESC
+    )
+};

macropad/keymaps/default/map.txt

@@ -0,0 +1,121 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum {
+    CUSTOM_KEYCODE_START = SAFE_RANGE,
+    M_PASS1,
+    M_PASS2,
+    M_PASS3,
+    M_PASS4,
+    CUSTOM_KEYCODE_END
+};
+
+// Layout definitions
+#define _MACOS 0
+#define _LINUX 1
+#define _NUMPAD 2
+#define _OTHER 3
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌─--──┬─--──┬─--──┬─--──┐
+     * │COPY │PSTE │SALL │TO(_LINUX)│
+     * ├─--──┼─--──┼─--──┼─--──┤
+     * │SPOT │UP   │ ~/` │TO(_NUMPAD)│
+     * ├─--──┼─--──┼─--──┼─--──┤
+     * │LEFT │DOWN │RGHT │OSL(_OTHER)│
+     * ├─--──┼─--──┼─--──┼─--──┤
+     * │HOME │ENTR │END  │ESC  │
+     * └─--──┴─--──┴─--──┴─--──┘
+     */
+    [_MACOS] = LAYOUT_ortho_4x4(
+        LGUI(KC_C),     LGUI(KC_V), LGUI(KC_A), TO(_LINUX),
+        LGUI(KC_SPACE), KC_UP,      KC_GRV,     TO(_NUMPAD),
+        KC_LEFT,        KC_DOWN,    KC_RGHT,    OSL(_OTHER),
+        KC_HOME,        KC_ENT,     KC_END,     KC_ESC
+    ),
+
+    /*
+     * ┌─--──┬─--──┬─--──┬─--──┐
+     * │COPY │PSTE │SALL │TO(_LINUX)│
+     * ├─--──┼─--──┼─--──┼─--──┤
+     * │SPOT │UP   │ ~/` │TO(_NUMPAD)│
+     * ├─--──┼─--──┼─--──┼─--──┤
+     * │LEFT │DOWN │RGHT │OSL(_OTHER)│
+     * ├─--──┼─--──┼─--──┼─--──┤
+     * │HOME │ENTR │END  │ESC  │
+     * └─--──┴─--──┴─--──┴─--──┘
+     */
+    [_LINUX] = LAYOUT_ortho_4x4(
+        LCTL(KC_C), LCTL(KC_V), LCTL(KC_A),  TO(_LINUX),
+        LGUI(KC_SPACE), KC_UP,      KC_GRV,  TO(_NUMPAD),
+        KC_LEFT,        KC_DOWN,    KC_RGHT, OSL(_OTHER),
+        KC_HOME,        KC_ENT,     KC_END,  TO(_MACOS)
+    ),
+
+
+    /*
+     * ┌─--──┬─--──┬─--──┬─--──┐
+     * │7    │8    │9    │=/+  │
+     * ├─--──┼─--──┼─--──┼─--──┤
+     * │4    │5    │6    │*    │
+     * ├─--──┼─--──┼─--──┼─--──┤
+     * │1    │2    │3    │/    │
+     * ├─--──┼─--──┼─--──┼─--──┤
+     * │0    │.    │ENTR │TO(_MACOS)│
+     * └─--──┴─--──┴─--──┴─--──┘
+     */
+    [_NUMPAD] = LAYOUT_ortho_4x4(
+        KC_7, KC_8, KC_9, KC_EQL,
+        KC_4, KC_5, KC_6, KC_PAST,
+        KC_1, KC_2, KC_3, KC_PSLS,
+        KC_0, KC_DOT, KC_ENT, TO(_MACOS)
+    ),
+
+
+    /*
+     * ┌─--──┬─--──┬─--──┬─--──┐
+     * │COPY │PSTE │SALL │BOOT │
+     * ├─--──┼─--──┼─--──┼─--──┤
+     * │SPOT │UP   │ ~/` │TO(_NUMPAD)   │
+     * ├─--──┼─--──┼─--──┼─--──┤
+     * │LEFT │DOWN │RGHT │OSL(_OTHER)   │
+     * ├─--──┼─--──┼─--──┼─--──┤
+     * │HOME │ENTR │END  │TO(_MACOS)│
+     * └─--──┴─--──┴─--──┴─--──┘
+     */
+    [_OTHER] = LAYOUT_ortho_4x4(
+        _______, _______, _______,  QK_BOOT,
+        _______, _______, _______, _______,
+        _______, _______, _______, _______,
+        _______, _______, _______, TO(_MACOS)
+    )
+};
+
+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("CindieOtono!2024");
+            }
+            return false;
+        case M_PASS3:
+            if (record->event.pressed) {
+               SEND_STRING("1290");
+            }
+            return false;
+        case M_PASS4:
+            if (record->event.pressed) {
+               SEND_STRING("Thel0ve0fchrist!");
+            }
+            return false;
+  }
+    return true;
+}

macropad/keymaps/default/rules.mk

@@ -0,0 +1,2 @@
+COMBO_ENABLE = yes
+TAP_DANCE_ENABLE = yes

macropad/keymaps/vial/config.h

@@ -0,0 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#pragma once
+
+
+#define VIAL_KEYBOARD_UID {0xCB, 0xA5, 0x09, 0xFB, 0xC9, 0x6A, 0xE7, 0xF9}

macropad/keymaps/vial/keymap.c

@@ -0,0 +1,24 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┬───┬───┬───┐
+     * │ 7 │ 8 │ 9 │ / │
+     * ├───┼───┼───┼───┤
+     * │ 4 │ 5 │ 6 │ * │
+     * ├───┼───┼───┼───┤
+     * │ 1 │ 2 │ 3 │ - │
+     * ├───┼───┼───┼───┤
+     * │ 0 │ . │Ent│ + │
+     * └───┴───┴───┴───┘
+     */
+    [0] = LAYOUT_ortho_4x4(
+        KC_PSLS,   KC_P8,   KC_P9,   KC_P7,
+        KC_P4,   KC_P5,   KC_P6,   KC_PAST,
+        KC_P1,   KC_P2,   KC_P3,   KC_PMNS,
+        KC_P0,   KC_PDOT, KC_PENT, KC_PPLS
+    )
+};

macropad/keymaps/vial/rules.mk

@@ -0,0 +1,3 @@
+VIA_ENABLE = yes
+VIAL_ENABLE = yes
+VIAL_INSECURE = yes

macropad/keymaps/vial/vial.json

@@ -0,0 +1,39 @@
+{
+  "name": "chicanopad",
+  "vendorId": "0x7983",
+  "productId": "0x5050",
+  "lighting": "none",
+  "matrix": {
+      "rows": 4,
+      "cols": 4
+  },
+  "layouts": {
+    "keymap":
+              [
+                [
+                  "0,0",
+                  "0,1",
+                  "0,2",
+                  "0,3"
+                ],
+                [
+                  "1,0",
+                  "1,1",
+                  "1,2",
+                  "1,3"
+                ],
+                [
+                  "2,0",
+                  "2,1",
+                  "2,2",
+                  "2,3"
+                ],
+                [
+                  "3,0",
+                  "3,1",
+                  "3,2",
+                  "3,3"
+                ]
+              ]
+ }
+}

macropad/readme.md

@@ -0,0 +1,27 @@
+# chicanopad
+
+![chicanopad](imgur.com image replace me!)
+
+*A short description of the keyboard/project*
+
+* Keyboard Maintainer: [dgvigil](https://github.com/dgvigil)
+* Hardware Supported: *The PCBs, controllers supported*
+* Hardware Availability: *Links to where you can find this hardware*
+
+Make example for this keyboard (after setting up your build environment):
+
+    make chicanopad:default
+
+Flashing example for this keyboard:
+
+    make chicanopad:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available

q8/config.h

@@ -1,8 +0,0 @@
-/* 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

@@ -20,26 +20,61 @@
 
 // clang-format off
 
-enum layers{
+enum combos {
-    QWERTY,
+  FA_GUI,
-    COLEDH,
+  FS_ALT,
-    _NAV,
+  FD_CTL,
-    _NUM,
+  JQUOT_GUI,
-    _SYM,
+  JL_ALT,
-    _FUN,
+  JK_CTL,
-    _MUS,
+  TA_GUI,
-    _MOUSE
+  TR_ALT,
+  TS_CTL,
+  NO_GUI,
+  NI_ALT,
+  NE_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};
+
+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),};
+
+
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [QWERTY] = 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_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),
 
-    [COLEDH] = LAYOUT_ansi_69(
+    [_COLEMAKDH] = 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,
@@ -91,8 +126,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 #if defined(ENCODER_MAP_ENABLE)
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
-    [QWERTY] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+    [_QWERTY] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
-    [COLEDH] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+    [_COLEMAKDH] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
     [_NAV]   = {ENCODER_CCW_CW(RGB_MOD, RGB_RMOD)},
     [_NUM]   = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)},
     [_FUN]   = {ENCODER_CCW_CW(RGB_HUI, RGB_HUD)},

q8/rules.mk

@@ -1,8 +1,4 @@
-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

@@ -1,297 +0,0 @@
-{
-  "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"
-      ]
-    ]
-  }
-}