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

.github/workflows/lint_and_compile.yml

@@ -6,18 +6,24 @@ 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
-                  python3 -m pip install -r /home/runner/work/dgvigil-keebs/dgvigil-keebs/qmk_firmware/requirements.txt
+                  pwd
+                  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/
@@ -27,7 +33,7 @@ jobs:
                   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"
@@ -38,6 +44,7 @@ jobs:
                   # 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"

.gitmodules

@@ -1,6 +0,0 @@
-[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

dgvigil/definitions/keycodes.h

@@ -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   DF(_QWERTY)
-#define COLEMAK  DF(_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

@@ -17,8 +17,8 @@
 // EMPTY ROW
 #define __________________EMPTY_____________________ _______, _______, _______, _______, _______
 // BOOTLOADER
-#define _________________BOOT_R1____________________ _______, _______, QWERTY, _______, QK_BOOTLOADER    
-#define _________________BOOT_L1____________________ QK_BOOTLOADER,_______,COLEMAK,_______,_______    
+#define _________________BOOT_R1____________________ _______, _______, _______, _______, QK_BOOTLOADER
+#define _________________BOOT_L1____________________ QK_BOOTLOADER,_______,_______,_______,QWERT
 
 
 // _BASE
@@ -69,14 +69,6 @@
 
 // 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 __________________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

@@ -1,12 +1,11 @@
 #pragma once
 
 typedef enum {
-  _QWERTY,
-  _NAV,
-  _NUM,
-  _SYM,
-  _FUN,
-  _MUS,
-  _MOUSE,
-  _COLEMAK_DH
+  _QWERTY, // 0
+  _NAV, // 1
+  _NUM, //2
+  _SYM, // 3
+  _FUN, // 4
+  _MUS, // 5
+  _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;
   }

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,9 +1,5 @@
 #include QMK_KEYBOARD_H
 
-#ifdef OS_DETECTION_ENABLE
-  #include "os_detection.h"
-#endif
-
 #include "dgvigil.h"
 
 #define LAYOUT_wrapper(...) LAYOUT(__VA_ARGS__)
@@ -14,7 +10,13 @@ enum combos {
   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,14 +26,28 @@ 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),};
 
 
 
@@ -42,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
      KC_TAB,  __________________BASE_L1____________________,                          __________________BASE_R1____________________, KC_GRV,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_LCTL, __________________BASE_L2____________________,                          __________________BASE_R2____________________, _______,
+     KC_LCTL, __________________BASE_L2____________________,                          __________________BASE_R2____________________, KC_RCTL,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
      KC_LSFT, __________________BASE_L3____________________,SPOTLI,          _______, __________________BASE_R3____________________, KC_RSFT,
   //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
@@ -50,29 +66,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                 // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
   ),
 
-  [_COLEMAK_DH] = LAYOUT_wrapper(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______, _______, _______, _______, _______, KC_LPAD,                            SPOTLI, _______, _______, _______, _______, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, __________________COLEML1____________________,                           __________________COLEMR1____________________, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, __________________COLEML2____________________,                           __________________COLEMR2____________________, _______,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, __________________COLEML3____________________, SPOTLI,         _______, __________________COLEMR3____________________, _______,
-  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                   ___________THUMB_3__BLANK__,                  ___________THUMB_3__BLANK__
-                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
-  ),
-
   [_NAV] = LAYOUT_wrapper(
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______, _______, _______, _______, _______, KC_LPAD,                            SPOTLI, _______, _______, _______, _______, RGB_TOG,
+     _______, _______, _______, _______, _______, RGB_MODE_SWIRL,                     SPOTLI, _______, _______, _______, _______, RGB_TOG,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
      _______, __________________EMPTY_____________________,                           __________________NAV_R1____________________, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
      _______, __________________NAV_L2____________________,                           __________________NAV_R2____________________, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, __________________NAV_L3____________________, WINDOWS,         _______, __________________NAV_R3____________________, _______,
+     _______, __________________NAV_L3____________________, LINUX,         _______, __________________NAV_R3____________________, _______,
   //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
                                     ___________THUMB_L3________,                 ___________THUMB_R3________
                                 // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
@@ -80,7 +82,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_NUM] = LAYOUT_wrapper(
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______, _______, _______, _______, _______, KC_LPAD,                            SPOTLI, _______, _______, _______, _______, _______,
+     _______, _______, _______, _______, _______, RGB_MODE_SWIRL,                     SPOTLI, _______, _______, _______, _______, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
      _______, __________________NUM_L1____________________,                           _________________BOOT_R1____________________, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
@@ -94,7 +96,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_SYM] = LAYOUT_wrapper(
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______, _______, _______, _______, _______, KC_LPAD,                            SPOTLI, _______, _______, _______, _______, _______,
+     _______, _______, _______, _______, _______, RGB_MODE_SWIRL,                     SPOTLI, _______, _______, _______, _______, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
      _______, __________________SYM_L1____________________,                           __________________EMPTY_____________________, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
@@ -108,7 +110,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
  [_FUN] = LAYOUT_wrapper(
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______, _______, _______, _______, _______, KC_LPAD,                            SPOTLI, _______, _______, _______, _______, _______,
+     _______, _______, _______, _______, _______, RGB_MODE_SWIRL,                     SPOTLI, _______, _______, _______, _______, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
      _______, __________________FUN_L1____________________,                            _________________BOOT_R1____________________, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
@@ -122,7 +124,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_MUS] = LAYOUT_wrapper(
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______, _______, _______, _______, _______, KC_LPAD,                            SPOTLI, _______, _______, _______, _______, _______,
+     _______, _______, _______, _______, _______, RGB_MODE_SWIRL,                     SPOTLI, _______, _______, _______, _______, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
      _______, _________________BOOT_L1____________________,                           __________________EMPTY_____________________, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
@@ -136,7 +138,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_MOUSE] = LAYOUT_wrapper(
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______, _______, _______, _______, _______, KC_LPAD,                            SPOTLI, _______, _______, _______, _______, _______,
+     _______, _______, _______, _______, _______, RGB_MODE_SWIRL,                     SPOTLI, _______, _______, _______, _______, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
      _______, __________________EMPTY_____________________,                           __________________MOU_R1____________________, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
@@ -149,157 +151,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   )
 };
 
-uint8_t mod_state;
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    static bool isWindows = false;
-    mod_state = get_mods();
-    switch (keycode) {
-        case WINDOWS:
-            if (record->event.pressed) {
-                isWindows = !isWindows;
-            }
-            return false;
-        case COPY:
-            if (record->event.pressed) {
-                if (isWindows) {
-                    tap_code16(LCTL(KC_C));
-                } else {
-                    tap_code16(LGUI(KC_C));
-                }
-                return false;
-            }
-        case PASTE:
-            if (record->event.pressed) {
-                if (isWindows) {
-                    tap_code16(LCTL(KC_V));
-                } else {
-                    tap_code16(LGUI(KC_V));
-                }
-            return false;
-            }
-        case CUT:
-            if (record->event.pressed) {
-                if (isWindows) {
-                    tap_code16(LCTL(KC_X));
-                } else {
-                    tap_code16(LGUI(KC_X));
-                }
-                return false;
-            }
-        case UNDO:
-            if (record->event.pressed) {
-                if (isWindows) {
-                    tap_code16(LCTL(KC_Z));
-                } else {
-                    tap_code16(LGUI(KC_Z));
-                }
-                return false;
-            }
-        case REDO:
-            if (record->event.pressed) {
-                if (isWindows) {
-                    tap_code16(LCTL(KC_Y));
-                } else {
-                    tap_code16(LSG(KC_Z));
-                }
-                return false;
-            }
-        case SALL:
-            if (record->event.pressed) {
-                if (isWindows) {
-                    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("CindieSummer!2024");
-            }
-            return false;
-        case M_PASS3:
-            if (record->event.pressed) {
-               SEND_STRING("1029");
-            }
-            return false;
-        case M_PASS4:
-            if (record->event.pressed) {
-               SEND_STRING("ThisisThel0ve0fchrist!");
-            }
-            return false;
-        case SPOTLI:
-            if (record->event.pressed) {
-               tap_code16(LGUI(KC_SPACE));              
-            }
-            return false;      
-  }
-    return true;
-}
 
+
+// #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_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_A, KC_A), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT), ENCODER_CCW_CW(KC_B, KC_B), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [_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))) },
+    [_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) },
+    [_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) },
+    [_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))) },
+    [_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)  },
+    [_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) },
 };
 
-
-// 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

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/keymap.c

@@ -15,35 +15,10 @@
  */
 
 #include QMK_KEYBOARD_H
+#include "keychron_common.h"
+#include "dgvigil.h"
 
-enum layer_number {
-  _BASE,
-  _COLDH,
-  _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),
-};
+// clang-format off
 
 enum combos {
   FA_GUI,
@@ -51,7 +26,13 @@ enum combos {
   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};
@@ -61,102 +42,108 @@ 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),
-};
-
-// 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)
+// 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] = {
-    [_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),
+    [_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,
+        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)},
+    [_COLEMAKDH] = {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(_______, _______)}
 };
 #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");
-            }
+    if (!process_record_keychron(keycode, record)) {
         return false;
     }
     return true;