Updated to work with Make

.github/workflows/docker-build.yml

@@ -1,26 +0,0 @@
-name: Build QMK Firmware with Docker
-on: [push, pull_request]
-
-jobs:
-  build:
-    runs-on: local
-    container:
-      image: ubuntu
-    steps:
-      - name: Install packages
-        run: |
-          apt-get update && apt-get install -y nodejs git python3 python3-pip rsync apt-transport-https ca-certificates curl software-properties-common
-          curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
-          echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
-          apt update
-          apt install -y docker-ce docker-ce-cli containerd.io
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
-      - name: Build Docker image
-        run: docker build --load -t qmk-builder .
-      - name: Tag Docker image
-        run: docker tag qmk-builder registry.home.dgvigil.dev/qmk-builder:v0.1
-      - name: Push Docker image
-        run: docker push registry.home.dgvigil.dev/qmk-builder:v0.1

.github/workflows/lint_and_compile.yml

@@ -1,44 +1,31 @@
 name: Compile my Keebs
-on: [pull_request]
+on: [push]
 jobs:
     lint-and-compile:
-        runs-on: local
+        runs-on: ubuntu-latest
-        container:
-          image: registry.home.dgvigil.dev/qmk-builder:v0.1
         steps:
           - name: Check out repository code
             uses: actions/checkout@v4
-          - name: Checkout submodules
+            with:
+                submodules: 'true'
+          - name: Setup
             run: |
-              git submodule update --init --recursive
+                  python3 -m pip install --user qmk
+                  python3 -m pip install -r /home/runner/work/dgvigil-keebs/dgvigil-keebs/qmk_firmware/requirements.txt
+                  qmk setup -y
+                  cd /home/runner/work/dgvigil-keebs/dgvigil-keebs/qmk_firmware/
+                  make git-submodules
           - name: Prep
             run: |
-                  pwd
+                  cd /home/runner/work/dgvigil-keebs/dgvigil-keebs/
-                  ls -la
+                  rsync -avP $(pwd)/dgvigil/ qmk_firmware/users/dgvigil/
-                  cd /workspace/dave/dgvigil-keebs/
+                  rsync -avP $(pwd)/iris/ qmk_firmware/keyboards/keebio/iris/keymaps/dgvigil/
-                  cp -a $(pwd)/dgvigil/ qmk_firmware/users/dgvigil/
-                  cp -a $(pwd)/draculad/ qmk_firmware/keyboards/draculad/keymaps/dgvigil/
-                  cp -a $(pwd)/iris/ qmk_firmware/keyboards/keebio/iris/keymaps/dgvigil/
-                  cp -a $(pwd)/sweep/ qmk_firmware/keyboards/ferris/keymaps/dgvigil/
-                  cp -a $(pwd)/scottogame/ qmk_firmware/keyboards/handwired/scottokeebs/scottogame/keymaps/dgvigil/
-                  cp -a $(pwd)/swoop/ qmk_firmware/keyboards/bluebell/swoop/keymaps/dgvigil/
-                  cp -a $(pwd)/q8/ qmk_firmware/keyboards/keychron/q8/ansi_encoder/keymaps/dgvigil/
           - name: Build
             run: |
-                  cd /workspace/dave/dgvigil-keebs/qmk_firmware/                  
+                  cd /home/runner/work/dgvigil-keebs/dgvigil-keebs/qmk_firmware/
-                  # echo "Building QMK for draculad"
-                  # /root/.local/bin/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
-                  # /root/.local/bin/qmk compile -kb keebio/iris/rev8 -km via
+                  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 +1,3 @@
 [submodule "qmk_firmware"]
 	path = qmk_firmware
-	url = https://git.home.dgvigil.dev/Homelab/qmk_firmware.git
+	url = https://github.com/qmk/qmk_firmware.git

DOCKER_README.md

@@ -1,101 +0,0 @@
-# QMK Firmware Docker Build Environment
-
-This repository includes a custom Docker setup for building QMK firmware in CI/CD environments.
-
-## Files
-
-- `Dockerfile` - Custom Docker image for QMK firmware builds
-- `.dockerignore` - Excludes unnecessary files from Docker build context
-- `build.sh` - Convenience script for building firmware locally
-- `.github/workflows/docker-build.yml` - GitHub Actions workflow using the custom Docker image
-
-## Features
-
-- Based on Ubuntu 22.04 for stability
-- Includes ARM and AVR toolchains
-- Pre-installed QMK CLI and dependencies
-- Automatic symlink setup for your keymaps
-- Optimized for your specific keyboard configurations
-
-## Local Usage
-
-### Building the Docker Image
-
-```bash
-docker build --load -t qmk-builder .
-```
-
-**Note:** The `--load` flag is required to make the image available locally with newer Docker versions.
-
-### Building Firmware
-
-#### Using the build script:
-```bash
-# Build all keyboards
-./build.sh
-
-# Build specific keyboard
-./build.sh iris
-
-# Build with custom user
-./build.sh iris myuser
-```
-
-#### Using Docker directly:
-```bash
-# Build all keyboards
-docker run --rm \
-  -v "$(pwd):/workspace" \
-  -w /workspace \
-  -e USER=dgvigil \
-  qmk-builder \
-  bash -c "cd /qmk_firmware && qmk compile -kb keebio/iris/rev8 -km dgvigil"
-```
-
-## CI/CD Usage
-
-The `.github/workflows/docker-build.yml` workflow demonstrates how to use this Docker setup in GitHub Actions:
-
-1. Builds the Docker image
-2. Builds each keyboard in parallel
-3. Uploads firmware artifacts
-4. Creates releases on main branch pushes
-
-## Supported Keyboards
-
-- `draculad` → `draculad`
-- `iris` → `keebio/iris/rev8`
-- `scottogame` → `handwired/scottokeebs/scottogame`
-- `sweep` → `ferris/sweep`
-- `swoop` → `bluebell/swoop`
-
-## Environment Variables
-
-- `USER` - The QMK user name (defaults to `dgvigil`)
-- `QMK_HOME` - Path to QMK firmware (set to `/qmk_firmware`)
-
-## Differences from qmkfm/qmk_cli
-
-This custom Dockerfile provides:
-
-1. **Faster builds** - Pre-installed toolchains and dependencies
-2. **Better integration** - Automatic symlink setup for your keymaps
-3. **Consistent environment** - Same setup across local and CI builds
-4. **Optimized for your workflow** - Tailored to your specific keyboard configurations
-
-## Troubleshooting
-
-### Build fails with toolchain errors
-Make sure the Docker image is built with the latest QMK firmware:
-```bash
-docker build --no-cache -t qmk-builder .
-```
-
-### Symlinks not working
-The entrypoint script automatically sets up symlinks, but you can verify they exist:
-```bash
-docker run --rm -v "$(pwd):/workspace" qmk-builder ls -la /qmk_firmware/keyboards/keebio/iris/keymaps/
-```
-
-### Missing firmware files
-Check that the build completed successfully and look for `.hex` and `.uf2` files in the QMK firmware directory. 

Dockerfile

@@ -1,109 +0,0 @@
-# QMK Firmware Build Environment
-# Based on Ubuntu 22.04 for stability and compatibility
-
-FROM ubuntu:22.04
-
-# Set environment variables
-ENV DEBIAN_FRONTEND=noninteractive
-ENV QMK_HOME=/qmk_firmware
-ENV PATH="/root/.local/bin:$PATH"
-
-# Install system dependencies
-RUN apt-get update && apt-get install -y \
-    build-essential \
-    clang-format \
-    dfu-programmer \
-    dfu-util \
-    git \
-    libnewlib-arm-none-eabi \
-    nodejs \
-    python3 \
-    python3-pip \
-    python3-setuptools \
-    python3-wheel \
-    wget \
-    unzip \
-    && rm -rf /var/lib/apt/lists/*
-
-# Install ARM toolchain
-RUN wget -qO- https://developer.arm.com/-/media/Files/downloads/gnu-rm/10.3-2021.10/gcc-arm-none-eabi-10.3-2021.10-x86_64-linux.tar.bz2 | tar xj -C /opt \
-    && ln -s /opt/gcc-arm-none-eabi-10.3-2021.10/bin/* /usr/local/bin/
-
-# Install AVR toolchain
-RUN wget -qO- https://downloads.arduino.cc/arduino-1.8.19-linux64.tar.xz | tar xJ -C /opt \
-    && ln -s /opt/arduino-1.8.19/hardware/tools/avr/bin/* /usr/local/bin/
-
-# Set up QMK environment
-WORKDIR /workspace
-RUN git clone --depth 1 https://github.com/qmk/qmk_firmware.git $QMK_HOME
-
-# Install QMK CLI and Python dependencies
-RUN pip3 install --user qmk
-RUN pip3 install --user -r $QMK_HOME/requirements.txt
-
-# Set up QMK
-RUN qmk setup --yes
-
-# Create build directory
-RUN mkdir -p /workspace/build
-
-# Set working directory
-WORKDIR /workspace
-
-# Copy entrypoint script
-COPY <<EOF /usr/local/bin/entrypoint.sh
-#!/bin/bash
-set -e
-
-# Initialize git submodules if they exist
-if [ -f ".gitmodules" ]; then
-    git submodule update --init --recursive
-fi
-
-# Set up user keymaps
-USER=\${USER:-dgvigil}
-
-# Clean up old symlinks
-rm -rf $QMK_HOME/keyboards/draculad/keymaps/\$USER 2>/dev/null || true
-rm -rf $QMK_HOME/keyboards/keebio/iris/keymaps/\$USER 2>/dev/null || true
-rm -rf $QMK_HOME/keyboards/handwired/scottokeebs/scottogame/keymaps/\$USER 2>/dev/null || true
-rm -rf $QMK_HOME/keyboards/bluebell/swoop/keymaps/\$USER 2>/dev/null || true
-rm -rf $QMK_HOME/keyboards/ferris/keymaps/\$USER 2>/dev/null || true
-rm -rf $QMK_HOME/users/\$USER 2>/dev/null || true
-
-# Create symlinks for keymaps
-if [ -d "draculad" ]; then
-    ln -s /workspace/draculad/ $QMK_HOME/keyboards/draculad/keymaps/\$USER
-fi
-
-if [ -d "iris" ]; then
-    ln -s /workspace/iris/ $QMK_HOME/keyboards/keebio/iris/keymaps/\$USER
-fi
-
-if [ -d "sweep" ]; then
-    ln -s /workspace/sweep/ $QMK_HOME/keyboards/ferris/keymaps/\$USER
-fi
-
-if [ -d "scottogame" ]; then
-    ln -s /workspace/scottogame/ $QMK_HOME/keyboards/handwired/scottokeebs/scottogame/keymaps/\$USER
-fi
-
-if [ -d "swoop" ]; then
-    ln -s /workspace/swoop/ $QMK_HOME/keyboards/bluebell/swoop/keymaps/\$USER
-fi
-
-if [ -d "user" ]; then
-    ln -s /workspace/user/ $QMK_HOME/users/\$USER
-fi
-
-# Execute the command passed to the container
-exec "\$@"
-EOF
-
-RUN chmod +x /usr/local/bin/entrypoint.sh
-
-# Set entrypoint
-ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
-
-# Default command
-CMD ["bash"] 

build.sh

@@ -1,71 +0,0 @@
-#!/bin/bash
-set -e
-
-# Build script for QMK firmware using Docker
-# Usage: ./build.sh [keyboard] [user]
-
-KEYBOARD=${1:-all}
-USER=${2:-dgvigil}
-
-echo "Building QMK firmware for user: $USER"
-
-# Build the Docker image if it doesn't exist
-if [[ "$(docker images -q qmk-builder 2> /dev/null)" == "" ]]; then
-    echo "Building Docker image..."
-    docker build --load -t qmk-builder .
-fi
-
-# Function to build a specific keyboard
-build_keyboard() {
-    local kb=$1
-    local user=$2
-    
-    echo "Building $kb for user $user..."
-    
-    # Map keyboard names to QMK paths
-    case $kb in
-        "draculad")
-            qmk_path="draculad"
-            ;;
-        "iris")
-            qmk_path="keebio/iris/rev8"
-            ;;
-        "scottogame")
-            qmk_path="handwired/scottokeebs/scottogame"
-            ;;
-        "sweep")
-            qmk_path="ferris/sweep"
-            ;;
-        "swoop")
-            qmk_path="bluebell/swoop"
-            ;;
-        *)
-            echo "Unknown keyboard: $kb"
-            exit 1
-            ;;
-    esac
-    
-    # Run the build in Docker
-    docker run --rm \
-        -v "$(pwd):/workspace" \
-        -w /workspace \
-        -e USER=$user \
-        qmk-builder \
-        bash -c "
-            cd $QMK_HOME
-            qmk compile -kb $qmk_path -km $user
-        "
-}
-
-# Build all keyboards or specific one
-if [ "$KEYBOARD" = "all" ]; then
-    echo "Building all keyboards..."
-    for kb in draculad iris scottogame sweep swoop; do
-        build_keyboard $kb $USER
-    done
-else
-    build_keyboard $KEYBOARD $USER
-fi
-
-echo "Build complete!"
-echo "Firmware files should be in the qmk_firmware directory" 

dgvigil/dgvigil.h

@@ -3,8 +3,6 @@
 #include "features/taphold.h"
 #include "features/tapdance.h"
 #include "features/macros.h"
-#include "features/combo.h"
-#include "features/tap_dance.h"
 #include "definitions/layers.h"
 #include "definitions/process_record.h"
 #include "definitions/keycodes.h"

dgvigil/features/macros.c

@@ -3,94 +3,16 @@
 #include "macros.h"
 
 
-uint8_t mod_state;
+process_record_result_t process_macro_keycode(uint16_t keycode, keyrecord_t *record) {
-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("P0plarLake!2023");
+                SEND_STRING("T3lg3Ranch!2023");
             }
             return false;
         case M_PASS2:
             if (record->event.pressed) {
-               SEND_STRING("CindieOtono!2024");
+               SEND_STRING("P0plarLake!2023");
-            }
-            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,9 +1,38 @@
 #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,
@@ -47,136 +76,248 @@ 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_wrapper(
+  [_QWERTY] = LAYOUT(
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
      KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                               KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MUTE,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_TAB,  __________________BASE_L1____________________,                          __________________BASE_R1____________________, KC_GRV,
+     KC_TAB,  Q_ESC,   KC_W,    KC_E,    KC_R,    KC_T,                               KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_GRV,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_LCTL, __________________BASE_L2____________________,                          __________________BASE_R2____________________, KC_RCTL,
+     KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                               KC_H,    KC_J,    KC_K,    KC_L,    KC_QUOT, KC_RCTL,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_LSFT, __________________BASE_L3____________________,SPOTLI,          _______, __________________BASE_R3____________________, KC_RSFT,
+     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,     SPOTLI,          _______, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
   //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    ___________THUMB_L3________,                 ___________THUMB_R3________
+                                    MUS_ESC, NAV_BKSP,MOUSE_TAB,                 SYM_ENTER,NUM_SPC,FUN_DEL
                                 // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
   ),
 
-  [_COLEMAKDH] = LAYOUT_wrapper(
+  [_COLEMAKDH] = LAYOUT(
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
      KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                               KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MUTE,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_TAB,  __________________COLEML1____________________,                          __________________COLEMR1____________________, KC_GRV,
+     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, __________________COLEML2____________________,                          __________________COLEMR2____________________, KC_RCTL,
+     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, __________________COLEML3____________________,SPOTLI,          _______, __________________COLEMR3____________________, KC_RSFT,
+     KC_LSFT, KC_Z,   KC_X,    KC_C,    KC_D,    KC_V ,     SPOTLI,          _______, KC_K,   KC_H,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
   //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    ___________THUMB_L3________,                 ___________THUMB_R3________
+                                    MUS_ESC, NAV_BKSP,MOUSE_TAB,                 SYM_ENTER,NUM_SPC,FUN_DEL
                                 // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
   ),
 
-  [_NAV] = LAYOUT_wrapper(
+  [_NAV] = LAYOUT(
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
      _______, _______, _______, _______, _______, RGB_MODE_SWIRL,                     SPOTLI, _______, _______, _______, _______, RGB_TOG,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, __________________EMPTY_____________________,                           __________________NAV_R1____________________, _______,
+     _______, _______, _______, _______, _______, _______,                            KC_CAPS, PASTE,   COPY,    CUT,     UNDO,    _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, __________________NAV_L2____________________,                           __________________NAV_R2____________________, _______,
+     _______, _______, _______, _______, M_PASS3, M_PASS4,                            KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, __________________NAV_L3____________________, LINUX,         _______, __________________NAV_R3____________________, _______,
+     _______, _______, _______, _______, M_PASS2, M_PASS1, LINUX,            _______, SALL,    KC_HOME, KC_PGUP, KC_PGDN, KC_END, _______,
   //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    ___________THUMB_L3________,                 ___________THUMB_R3________
+                                    MUS_ESC, NAV_BKSP,MOUSE_TAB,                 SYM_ENTER,NUM_SPC,FUN_DEL
                                 // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
   ),
 
-  [_NUM] = LAYOUT_wrapper(
+  [_NUM] = LAYOUT(
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______, _______, _______, _______, _______, RGB_MODE_SWIRL,                     SPOTLI, _______, _______, _______, _______, _______,
+     _______, _______, _______, _______, _______, RGB_MODE_SWIRL,                     SPOTLI,  _______, _______, _______, _______, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, __________________NUM_L1____________________,                           _________________BOOT_R1____________________, _______,
+     _______, KC_LBRC, KC_7,    KC_8,    KC_9,    KC_RBRC,                            COLDH,   _______, _______, _______, QWERT, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, __________________NUM_L2____________________,                           __________________EMPTY_____________________, _______,
+     _______, KC_SCLN, KC_4,    KC_5,    KC_6,    KC_EQL,                             _______, _______, _______, _______, _______, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, __________________NUM_L3____________________, KC_LPRN,         _______, __________________EMPTY_____________________, _______,
+     _______, KC_DOT,  KC_1,    KC_2,    KC_3,    KC_BSLS, KC_LPRN,          _______, _______, _______, _______, _______, _______, _______,
   //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    _________NUM_TH_L3________,                 ___________THUMB_3__BLANK__
+                                    KC_DOT,  KC_0,    KC_MINUS,                 _______, _______, _______
                                 // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
   ),
 
-  [_SYM] = LAYOUT_wrapper(
+  [_SYM] = LAYOUT(
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
      _______, _______, _______, _______, _______, RGB_MODE_SWIRL,                     SPOTLI, _______, _______, _______, _______, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, __________________SYM_L1____________________,                           __________________EMPTY_____________________, _______,
+     _______, KC_LCBR, KC_AMPR, KC_ASTR, KC_LPRN, KC_RCBR,                           _______, _______, _______, _______, _______, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, __________________SYM_L2____________________,                           __________________EMPTY_____________________, _______,
+     _______, KC_COLN, KC_DLR,  KC_PERC, KC_CIRC, KC_PLUS,                           _______, _______, _______, _______, _______, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, __________________SYM_L3____________________, _______,         _______, __________________EMPTY_____________________, _______,
+     _______, KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_PIPE, _______,         _______, _______, _______, _______, _______, _______, _______,
   //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    _________SYM_TH_L3________,                  ___________THUMB_3__BLANK__
+                                    KC_LPRN, KC_RPRN, KC_UNDS,                  _______, _______, _______
                                 // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
   ),
 
- [_FUN] = LAYOUT_wrapper(
+ [_FUN] = LAYOUT(
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______, _______, _______, _______, _______, RGB_MODE_SWIRL,                     SPOTLI, _______, _______, _______, _______, _______,
+     _______, _______, _______, _______, _______, RGB_M_SW,                           SPOTLI, _______, _______, _______, _______, QK_BOOT,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, __________________FUN_L1____________________,                            _________________BOOT_R1____________________, _______,
+     _______, KC_F12,  KC_F7,   KC_F8,   KC_F9,   KC_PSCR,                            RM_NEXT,RM_PREV,_______,_______,QWERT, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, __________________FUN_L2____________________,                            __________________EMPTY_____________________, _______,
+     _______, KC_F11,  KC_F4,   KC_F5,   KC_F6,   _______,                            RGB_M_X, _______, _______, _______, _______, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, __________________FUN_L3____________________, _______,         _______, __________________EMPTY_____________________, _______,
+     _______, KC_F10,  KC_F1,   KC_F2,   KC_F3,   _______, _______,         _______, _______, _______, _______, _______, _______, _______,
   //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    ___________THUMB_3__BLANK__,                 ___________THUMB_3__BLANK__
+                                    _______, _______, _______,                 _______, _______, _______
                                 // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
   ),
 
-  [_MUS] = LAYOUT_wrapper(
+  [_MUS] = LAYOUT(
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     _______, _______, _______, _______, _______, RGB_MODE_SWIRL,                     SPOTLI, _______, _______, _______, _______, _______,
+     QK_BOOT, _______, _______, _______, _______, RGB_MODE_SWIRL,                     SPOTLI, _______, _______, _______, _______, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, _________________BOOT_L1____________________,                           __________________EMPTY_____________________, _______,
+     _______, _______,_______,_______,_______,QWERT,                           _______, _______, _______, _______, _______, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, __________________EMPTY_____________________,                           __________________MUS_R2____________________, _______,
+     _______, _______, _______, _______, _______, _______,                           _______, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, __________________EMPTY_____________________, _______,         _______, __________________MUS_R3____________________, _______,
+     _______, _______, _______, _______, _______, _______, _______,         _______, _______, KC_MSTP, KC_MPLY, KC_MUTE, _______, _______,
   //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                    ___________THUMB_3__BLANK__,                 ___________THUMB_3__BLANK__
+                                    _______, _______, _______,                 _______, _______, _______
                                 // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
   ),
 
-  [_MOUSE] = LAYOUT_wrapper(
+  [_MOUSE] = LAYOUT(
   //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐
      _______, _______, _______, _______, _______, RGB_MODE_SWIRL,                     SPOTLI, _______, _______, _______, _______, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, __________________EMPTY_____________________,                           __________________MOU_R1____________________, _______,
+     _______, _______, _______, _______, _______, _______,                           _______, KC_PSTE, KC_COPY, KC_CUT,  KC_UNDO, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, __________________EMPTY_____________________,                           __________________MOU_R2____________________, _______,
+     _______, _______, _______, _______, _______, _______,                           KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, _______, _______,
   //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______, __________________EMPTY_____________________, _______,         _______, __________________MOU_R3____________________, _______,
+     _______, _______, _______, _______, _______, _______, _______,         _______, KC_BTN2, KC_BTN1,  KC_WH_D, KC_WH_U, KC_BTN2, _______,
   //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
-                                   ___________THUMB_3__BLANK__,                  ___________THUMB_3__BLANK__
+                                   _______, _______, _______,                  _______, _______, _______
                                 // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
   )
 };
 
+uint8_t mod_state;
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    static bool 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;
+}
 
 
-// #define ___________THUMB_L3________ MUS_ESC, NAV_BKSP,MOUSE_TAB
+#if defined(ENCODER_MAP_ENABLE)
-// #define ___________THUMB_R3________ SYM_ENTER,NUM_SPC,FUN_DEL
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
-    [_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) },
+    [_QWERTY] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT) },
-    [_COLEMAKDH] = { 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,12 +1,9 @@
-
+REPEAT_KEY_ENABLE = yes
 AUTO_SHIFT_ENABLE = yes
-
+CAPS_WORD_ENABLE = yes
+COMBO_ENABLE = yes
+TAP_DANCE_ENABLE = yes
 ENCODER_ENABLE = yes
 ENCODER_MAP_ENABLE = yes
 
-COMBO_ENABLE = yes
+LTO_ENABLE = yes
-TAP_DANCE_ENABLE = yes
-
-VIA_ENABLE = no
-KEYMAP_INTROSPECTION_ENABLE := no
-COMMUNITY_LAYOUT = no

macropad/keyboard.json

@@ -1,48 +0,0 @@
-{
-    "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

@@ -1,25 +0,0 @@
-#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

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

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

macropad/keymaps/vial/config.h

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

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

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

macropad/keymaps/vial/vial.json

@@ -1,39 +0,0 @@
-{
-  "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

@@ -1,27 +0,0 @@
-# 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

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

q8/keymap.c

@@ -20,61 +20,26 @@
 
 // clang-format off
 
-enum combos {
+enum layers{
-  FA_GUI,
+    QWERTY,
-  FS_ALT,
+    COLEDH,
-  FD_CTL,
+    _NAV,
-  JQUOT_GUI,
+    _NUM,
-  JL_ALT,
+    _SYM,
-  JK_CTL,
+    _FUN,
-  TA_GUI,
+    _MUS,
-  TR_ALT,
+    _MOUSE
-  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),
 
-    [_COLEMAKDH] = LAYOUT_ansi_69(
+    [COLEDH] = LAYOUT_ansi_69(
         KC_ESC,  KC_1,     KC_2,     KC_3,    KC_4,    KC_5,    KC_6,     KC_7,     KC_8,    KC_9,    KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,             KC_MUTE,
         KC_TAB,  __________________COLEML1____________________,    __________________COLEMR1____________________,     KC_LBRC,  KC_RBRC,  KC_BSLS,             KC_DEL,
         KC_CAPS, __________________COLEML2____________________,              __________________COLEMR2____________________,  KC_QUOT,  KC_ENT,              KC_HOME,
@@ -126,8 +91,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)},
-    [_COLEMAKDH] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+    [COLEDH] = {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,4 +1,8 @@
+VIA_ENABLE = yes
+VIAL_ENABLE = yes
+VIALRGB_ENABLE = yes
 ENCODER_MAP_ENABLE = yes
+COMBO_ENABLE = yes
 
 VPATH += keyboards/keychron/common
 SRC += keychron_common.c

q8/vial.json

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