From 7497afa5f3769dc1650f6d8b916511abb01546b4 Mon Sep 17 00:00:00 2001
From: Dave Vigil <dgvigil@gmail.com>
Date: Mon, 14 Jul 2025 11:45:46 -0500
Subject: [PATCH 01/41] Updating gitea runner

---
 .github/workflows/lint_and_compile.yml | 2 +-
 dgvigil/dgvigil.h                      | 4 +++-
 iris/rules.mk                          | 7 +++++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/lint_and_compile.yml b/.github/workflows/lint_and_compile.yml
index d548606..c6e5ca5 100644
--- a/.github/workflows/lint_and_compile.yml
+++ b/.github/workflows/lint_and_compile.yml
@@ -2,7 +2,7 @@ name: Compile my Keebs
 on: [push]
 jobs:
     lint-and-compile:
-        runs-on: ubuntu-latest
+        runs-on: local 
         steps:
           - name: Check out repository code
             uses: actions/checkout@v4
diff --git a/dgvigil/dgvigil.h b/dgvigil/dgvigil.h
index 7fa544f..f4464c1 100644
--- a/dgvigil/dgvigil.h
+++ b/dgvigil/dgvigil.h
@@ -3,7 +3,9 @@
 #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"
-#include "definitions/keymap_blocks.h"
\ No newline at end of file
+#include "definitions/keymap_blocks.h"
diff --git a/iris/rules.mk b/iris/rules.mk
index 96cc6de..853aab1 100644
--- a/iris/rules.mk
+++ b/iris/rules.mk
@@ -3,3 +3,10 @@ AUTO_SHIFT_ENABLE = yes
 
 ENCODER_ENABLE = yes
 ENCODER_MAP_ENABLE = yes
+
+COMBO_ENABLE = yes
+TAP_DANCE_ENABLE = yes
+
+VIA_ENABLE = no
+KEYMAP_INTROSPECTION_ENABLE := no
+COMMUNITY_LAYOUT = no
-- 
2.39.5


From 2c2a780b3da5ed50b73af2f7db4ddc646aa91f37 Mon Sep 17 00:00:00 2001
From: Dave Vigil <dgvigil@gmail.com>
Date: Mon, 14 Jul 2025 11:47:41 -0500
Subject: [PATCH 02/41] Updating gitea runner

---
 .github/workflows/lint_and_compile.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/lint_and_compile.yml b/.github/workflows/lint_and_compile.yml
index c6e5ca5..c57a7b7 100644
--- a/.github/workflows/lint_and_compile.yml
+++ b/.github/workflows/lint_and_compile.yml
@@ -17,6 +17,7 @@ jobs:
                   pwd
                   python3 -m pip install --break-system-package --user qmk
                   python3 -m pip install --break-system-package -r /workspace/dave/dgvigil-keebs/qmk_firmware/requirements.txt
+                  pip show --files qmk
                   qmk setup -y
                   cd /workspace/dave/dgvigil-keebs/qmk_firmware/
                   make git-submodules
-- 
2.39.5


From b04896b80d86bcc1f522a62e3561b33f475a2b64 Mon Sep 17 00:00:00 2001
From: Dave Vigil <dgvigil@gmail.com>
Date: Mon, 14 Jul 2025 11:50:43 -0500
Subject: [PATCH 03/41] Updating gitea runner

---
 .github/workflows/lint_and_compile.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/lint_and_compile.yml b/.github/workflows/lint_and_compile.yml
index c57a7b7..c4d3037 100644
--- a/.github/workflows/lint_and_compile.yml
+++ b/.github/workflows/lint_and_compile.yml
@@ -7,7 +7,7 @@ jobs:
           - name: Check out repository code
             uses: actions/checkout@v4
           - name: Clone supercharge docs repository
-            uses: actions/checkout@v2
+            uses: actions/checkout@v4
             with:
               repository: Homelab/qmk_firmware
               path: qmk_firmware
-- 
2.39.5


From 7bd2c756f0ae7fad012fc585fa08ae0d42202e88 Mon Sep 17 00:00:00 2001
From: Dave Vigil <dgvigil@gmail.com>
Date: Mon, 14 Jul 2025 11:54:50 -0500
Subject: [PATCH 04/41] Fixing gitea actions

---
 .github/workflows/lint_and_compile.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/lint_and_compile.yml b/.github/workflows/lint_and_compile.yml
index c4d3037..60f21ad 100644
--- a/.github/workflows/lint_and_compile.yml
+++ b/.github/workflows/lint_and_compile.yml
@@ -12,6 +12,7 @@ jobs:
               repository: Homelab/qmk_firmware
               path: qmk_firmware
               ref: master
+              node-version: 18
           - name: Setup
             run: |
                   pwd
-- 
2.39.5


From 53be43d0963472d258aca68f4d3c36904b454a74 Mon Sep 17 00:00:00 2001
From: dave <dgvigil@gmail.com>
Date: Mon, 14 Jul 2025 11:56:50 -0500
Subject: [PATCH 05/41] Update .github/workflows/lint_and_compile.yml

---
 .github/workflows/lint_and_compile.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/lint_and_compile.yml b/.github/workflows/lint_and_compile.yml
index 60f21ad..f08018e 100644
--- a/.github/workflows/lint_and_compile.yml
+++ b/.github/workflows/lint_and_compile.yml
@@ -6,6 +6,8 @@ jobs:
         steps:
           - name: Check out repository code
             uses: actions/checkout@v4
+            with:
+              node-version: 18
           - name: Clone supercharge docs repository
             uses: actions/checkout@v4
             with:
-- 
2.39.5


From e7cd5110e897fd71b68fcceec0a33625b3fdf0b1 Mon Sep 17 00:00:00 2001
From: dave <dgvigil@gmail.com>
Date: Mon, 14 Jul 2025 12:41:41 -0500
Subject: [PATCH 06/41] Update .github/workflows/lint_and_compile.yml

---
 .github/workflows/lint_and_compile.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/lint_and_compile.yml b/.github/workflows/lint_and_compile.yml
index f08018e..2539ccb 100644
--- a/.github/workflows/lint_and_compile.yml
+++ b/.github/workflows/lint_and_compile.yml
@@ -2,7 +2,9 @@ name: Compile my Keebs
 on: [push]
 jobs:
     lint-and-compile:
-        runs-on: local 
+        runs-on: local
+        container:
+          image: node:18-bullseye
         steps:
           - name: Check out repository code
             uses: actions/checkout@v4
-- 
2.39.5


From 321a564c7d972918dc8e87a1fbbfb1c29a48a296 Mon Sep 17 00:00:00 2001
From: dave <dgvigil@gmail.com>
Date: Mon, 14 Jul 2025 12:59:02 -0500
Subject: [PATCH 07/41] Update .github/workflows/lint_and_compile.yml

---
 .github/workflows/lint_and_compile.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/lint_and_compile.yml b/.github/workflows/lint_and_compile.yml
index 2539ccb..1f4bada 100644
--- a/.github/workflows/lint_and_compile.yml
+++ b/.github/workflows/lint_and_compile.yml
@@ -4,7 +4,7 @@ jobs:
     lint-and-compile:
         runs-on: local
         container:
-          image: node:18-bullseye
+          image: nikolaik/python-nodejs:python3.11-nodejs24-slim
         steps:
           - name: Check out repository code
             uses: actions/checkout@v4
-- 
2.39.5


From 5ff101d848227d21e3327a1afe1dbe91ce081492 Mon Sep 17 00:00:00 2001
From: dave <dgvigil@gmail.com>
Date: Mon, 14 Jul 2025 13:03:24 -0500
Subject: [PATCH 08/41] Update .github/workflows/lint_and_compile.yml

---
 .github/workflows/lint_and_compile.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/lint_and_compile.yml b/.github/workflows/lint_and_compile.yml
index 1f4bada..02ea9a2 100644
--- a/.github/workflows/lint_and_compile.yml
+++ b/.github/workflows/lint_and_compile.yml
@@ -4,7 +4,7 @@ jobs:
     lint-and-compile:
         runs-on: local
         container:
-          image: nikolaik/python-nodejs:python3.11-nodejs24-slim
+          image: ubuntu
         steps:
           - name: Check out repository code
             uses: actions/checkout@v4
-- 
2.39.5


From f80539e7e4384bb2f3ea26c1a07c3a57c5fa5e71 Mon Sep 17 00:00:00 2001
From: dave <dgvigil@gmail.com>
Date: Mon, 14 Jul 2025 13:06:17 -0500
Subject: [PATCH 09/41] Update .github/workflows/lint_and_compile.yml

---
 .github/workflows/lint_and_compile.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/lint_and_compile.yml b/.github/workflows/lint_and_compile.yml
index 02ea9a2..59e27b4 100644
--- a/.github/workflows/lint_and_compile.yml
+++ b/.github/workflows/lint_and_compile.yml
@@ -6,17 +6,16 @@ jobs:
         container:
           image: ubuntu
         steps:
+          - name: Install packages
+            run: sudo apt-get update && sudo apt-get install -y nodejs git python3
           - name: Check out repository code
             uses: actions/checkout@v4
-            with:
-              node-version: 18
           - name: Clone supercharge docs repository
             uses: actions/checkout@v4
             with:
               repository: Homelab/qmk_firmware
               path: qmk_firmware
               ref: master
-              node-version: 18
           - name: Setup
             run: |
                   pwd
-- 
2.39.5


From bb10445f715f6f2afff59030323dc7b676b988b5 Mon Sep 17 00:00:00 2001
From: dave <dgvigil@gmail.com>
Date: Mon, 14 Jul 2025 13:07:10 -0500
Subject: [PATCH 10/41] Update .github/workflows/lint_and_compile.yml

---
 .github/workflows/lint_and_compile.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/lint_and_compile.yml b/.github/workflows/lint_and_compile.yml
index 59e27b4..c827ce6 100644
--- a/.github/workflows/lint_and_compile.yml
+++ b/.github/workflows/lint_and_compile.yml
@@ -7,7 +7,7 @@ jobs:
           image: ubuntu
         steps:
           - name: Install packages
-            run: sudo apt-get update && sudo apt-get install -y nodejs git python3
+            run: apt-get update && apt-get install -y nodejs git python3
           - name: Check out repository code
             uses: actions/checkout@v4
           - name: Clone supercharge docs repository
-- 
2.39.5


From 07aed63dc873f29d4f76fbf41a6e44640dec20c6 Mon Sep 17 00:00:00 2001
From: dave <dgvigil@gmail.com>
Date: Mon, 14 Jul 2025 13:10:10 -0500
Subject: [PATCH 11/41] Update .github/workflows/lint_and_compile.yml

---
 .github/workflows/lint_and_compile.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/lint_and_compile.yml b/.github/workflows/lint_and_compile.yml
index c827ce6..14ec1bc 100644
--- a/.github/workflows/lint_and_compile.yml
+++ b/.github/workflows/lint_and_compile.yml
@@ -7,7 +7,7 @@ jobs:
           image: ubuntu
         steps:
           - name: Install packages
-            run: apt-get update && apt-get install -y nodejs git python3
+            run: apt-get update && apt-get install -y nodejs git python3 python3-pip
           - name: Check out repository code
             uses: actions/checkout@v4
           - name: Clone supercharge docs repository
-- 
2.39.5


From 82b94e08b6170d3bbb1ba14acc2219628cf4cbda Mon Sep 17 00:00:00 2001
From: dave <dgvigil@gmail.com>
Date: Mon, 14 Jul 2025 13:13:12 -0500
Subject: [PATCH 12/41] Update .github/workflows/lint_and_compile.yml

---
 .github/workflows/lint_and_compile.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/lint_and_compile.yml b/.github/workflows/lint_and_compile.yml
index 14ec1bc..ce9b4f6 100644
--- a/.github/workflows/lint_and_compile.yml
+++ b/.github/workflows/lint_and_compile.yml
@@ -22,7 +22,7 @@ jobs:
                   python3 -m pip install --break-system-package --user qmk
                   python3 -m pip install --break-system-package -r /workspace/dave/dgvigil-keebs/qmk_firmware/requirements.txt
                   pip show --files qmk
-                  qmk setup -y
+                  /root/.local/bin/qmk setup -y
                   cd /workspace/dave/dgvigil-keebs/qmk_firmware/
                   make git-submodules
           - name: Prep
-- 
2.39.5


From 992b5c2b212f4d0d4e95cdcf5676c8eff31a4291 Mon Sep 17 00:00:00 2001
From: dave <dgvigil@gmail.com>
Date: Mon, 14 Jul 2025 13:51:35 -0500
Subject: [PATCH 13/41] Update .github/workflows/lint_and_compile.yml

---
 .github/workflows/lint_and_compile.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/lint_and_compile.yml b/.github/workflows/lint_and_compile.yml
index ce9b4f6..0edc9fc 100644
--- a/.github/workflows/lint_and_compile.yml
+++ b/.github/workflows/lint_and_compile.yml
@@ -39,7 +39,7 @@ jobs:
             run: |
                   cd /home/runner/work/dgvigil-keebs/dgvigil-keebs/qmk_firmware/
                   echo "Building QMK for draculad"
-                  qmk compile -kb draculad -km dgvigil -e CONVERT_TO=promicro_rp2040
+                  /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"
@@ -47,8 +47,8 @@ jobs:
                   # echo "Building QMK for ferris/sweep"
                   # qmk compile -kb ferris/sweep -km dgvigil
                   echo "Building QMK for keebio/iris/rev8"
-                  qmk compile -kb keebio/iris/rev8 -km dgvigil
-                  qmk compile -kb keebio/iris/rev8 -km via
+                  /root/.local/bin/qmk compile -kb keebio/iris/rev8 -km dgvigil
+                  /root/.local/bin/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"
-- 
2.39.5


From 71a1868e32fa66a3480da46ce7f2f94a118fcec0 Mon Sep 17 00:00:00 2001
From: dave <dgvigil@gmail.com>
Date: Mon, 14 Jul 2025 13:57:10 -0500
Subject: [PATCH 14/41] Update .github/workflows/lint_and_compile.yml

---
 .github/workflows/lint_and_compile.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/lint_and_compile.yml b/.github/workflows/lint_and_compile.yml
index 0edc9fc..4def106 100644
--- a/.github/workflows/lint_and_compile.yml
+++ b/.github/workflows/lint_and_compile.yml
@@ -16,6 +16,8 @@ jobs:
               repository: Homelab/qmk_firmware
               path: qmk_firmware
               ref: master
+          - name: Set PATH
+            run: echo "export PATH=\$PATH:/usr/local/bin:/root/.local/bin" >> $GITHUB_ENV
           - name: Setup
             run: |
                   pwd
-- 
2.39.5


From 66d861086261151cb83bca9baac4edcb39df0dbc Mon Sep 17 00:00:00 2001
From: Dave Vigil <dgvigil@gmail.com>
Date: Mon, 14 Jul 2025 14:08:25 -0500
Subject: [PATCH 15/41] Updating gitea runner

---
 .github/workflows/lint_and_compile.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/lint_and_compile.yml b/.github/workflows/lint_and_compile.yml
index 4def106..6a1053d 100644
--- a/.github/workflows/lint_and_compile.yml
+++ b/.github/workflows/lint_and_compile.yml
@@ -23,10 +23,8 @@ jobs:
                   pwd
                   python3 -m pip install --break-system-package --user qmk
                   python3 -m pip install --break-system-package -r /workspace/dave/dgvigil-keebs/qmk_firmware/requirements.txt
-                  pip show --files qmk
                   /root/.local/bin/qmk setup -y
                   cd /workspace/dave/dgvigil-keebs/qmk_firmware/
-                  make git-submodules
           - name: Prep
             run: |
                   cd /workspace/dave/dgvigil-keebs/
-- 
2.39.5


From dfbcf5a0487b761f8c95aa790a72b33eaecbf1df Mon Sep 17 00:00:00 2001
From: dave <dgvigil@gmail.com>
Date: Mon, 14 Jul 2025 14:37:40 -0500
Subject: [PATCH 16/41] Update .github/workflows/lint_and_compile.yml

---
 .github/workflows/lint_and_compile.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/lint_and_compile.yml b/.github/workflows/lint_and_compile.yml
index 6a1053d..d0849a9 100644
--- a/.github/workflows/lint_and_compile.yml
+++ b/.github/workflows/lint_and_compile.yml
@@ -7,7 +7,7 @@ jobs:
           image: ubuntu
         steps:
           - name: Install packages
-            run: apt-get update && apt-get install -y nodejs git python3 python3-pip
+            run: apt-get update && apt-get install -y nodejs git python3 python3-pip rsync
           - name: Check out repository code
             uses: actions/checkout@v4
           - name: Clone supercharge docs repository
-- 
2.39.5


From 7700b536352a6c1e0fee00935b7438710e3ae864 Mon Sep 17 00:00:00 2001
From: dave <dgvigil@gmail.com>
Date: Mon, 14 Jul 2025 14:44:49 -0500
Subject: [PATCH 17/41] Update .github/workflows/lint_and_compile.yml

---
 .github/workflows/lint_and_compile.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/lint_and_compile.yml b/.github/workflows/lint_and_compile.yml
index d0849a9..a2e24ad 100644
--- a/.github/workflows/lint_and_compile.yml
+++ b/.github/workflows/lint_and_compile.yml
@@ -37,7 +37,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"
                   /root/.local/bin/qmk compile -kb draculad -km dgvigil -e CONVERT_TO=promicro_rp2040
                   # echo "Building QMK for handwired/scottokeebs/scottogame"
-- 
2.39.5


From e0a59f8761890530988bd8d27754509c455cda42 Mon Sep 17 00:00:00 2001
From: dave <dgvigil@gmail.com>
Date: Mon, 14 Jul 2025 14:51:33 -0500
Subject: [PATCH 18/41] Update .github/workflows/lint_and_compile.yml

---
 .github/workflows/lint_and_compile.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/lint_and_compile.yml b/.github/workflows/lint_and_compile.yml
index a2e24ad..2a93cf9 100644
--- a/.github/workflows/lint_and_compile.yml
+++ b/.github/workflows/lint_and_compile.yml
@@ -38,8 +38,8 @@ jobs:
           - name: Build
             run: |
                   cd /workspace/dave/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 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"
@@ -48,7 +48,7 @@ jobs:
                   # qmk compile -kb ferris/sweep -km dgvigil
                   echo "Building QMK for keebio/iris/rev8"
                   /root/.local/bin/qmk compile -kb keebio/iris/rev8 -km dgvigil
-                  /root/.local/bin/qmk compile -kb keebio/iris/rev8 -km via
+                  # /root/.local/bin/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"
-- 
2.39.5


From 665fbd93f5c2e9f016843be9214702cc5dcbeef2 Mon Sep 17 00:00:00 2001
From: dave <dgvigil@gmail.com>
Date: Mon, 14 Jul 2025 15:18:32 -0500
Subject: [PATCH 19/41] Update .github/workflows/lint_and_compile.yml

---
 .github/workflows/lint_and_compile.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/lint_and_compile.yml b/.github/workflows/lint_and_compile.yml
index 2a93cf9..81ccd07 100644
--- a/.github/workflows/lint_and_compile.yml
+++ b/.github/workflows/lint_and_compile.yml
@@ -37,6 +37,7 @@ jobs:
                   rsync -avP $(pwd)/q8/ qmk_firmware/keyboards/keychron/q8/ansi_encoder/keymaps/dgvigil/
           - name: Build
             run: |
+                  export PATH=$PATH:/usr/local/bin:/root/.local/bin"
                   cd /workspace/dave/dgvigil-keebs/qmk_firmware/                  
                   # echo "Building QMK for draculad"
                   # /root/.local/bin/qmk compile -kb draculad -km dgvigil -e CONVERT_TO=promicro_rp2040
-- 
2.39.5


From 153ddc01523e08c13663eaa5d4b18a95b9c0aa7b Mon Sep 17 00:00:00 2001
From: dave <dgvigil@gmail.com>
Date: Mon, 14 Jul 2025 15:24:16 -0500
Subject: [PATCH 20/41] Update .github/workflows/lint_and_compile.yml

---
 .github/workflows/lint_and_compile.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/lint_and_compile.yml b/.github/workflows/lint_and_compile.yml
index 81ccd07..9405a65 100644
--- a/.github/workflows/lint_and_compile.yml
+++ b/.github/workflows/lint_and_compile.yml
@@ -37,7 +37,7 @@ jobs:
                   rsync -avP $(pwd)/q8/ qmk_firmware/keyboards/keychron/q8/ansi_encoder/keymaps/dgvigil/
           - name: Build
             run: |
-                  export PATH=$PATH:/usr/local/bin:/root/.local/bin"
+                  export PATH=$PATH:/usr/local/bin:/root/.local/bin
                   cd /workspace/dave/dgvigil-keebs/qmk_firmware/                  
                   # echo "Building QMK for draculad"
                   # /root/.local/bin/qmk compile -kb draculad -km dgvigil -e CONVERT_TO=promicro_rp2040
-- 
2.39.5


From 941f00a7843ad29697618c5b45fa90f3fa2b7a41 Mon Sep 17 00:00:00 2001
From: dave <dgvigil@gmail.com>
Date: Mon, 14 Jul 2025 15:41:59 -0500
Subject: [PATCH 21/41] Update .github/workflows/lint_and_compile.yml

---
 .github/workflows/lint_and_compile.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/lint_and_compile.yml b/.github/workflows/lint_and_compile.yml
index 9405a65..6801d9b 100644
--- a/.github/workflows/lint_and_compile.yml
+++ b/.github/workflows/lint_and_compile.yml
@@ -21,7 +21,7 @@ jobs:
           - name: Setup
             run: |
                   pwd
-                  python3 -m pip install --break-system-package --user qmk
+                  python3 -m pip install --break-system-package qmk
                   python3 -m pip install --break-system-package -r /workspace/dave/dgvigil-keebs/qmk_firmware/requirements.txt
                   /root/.local/bin/qmk setup -y
                   cd /workspace/dave/dgvigil-keebs/qmk_firmware/
-- 
2.39.5


From 5c761b3094b2d6eb5f49c9a3b08a8fb3689089ae Mon Sep 17 00:00:00 2001
From: dave <dgvigil@gmail.com>
Date: Mon, 14 Jul 2025 15:47:56 -0500
Subject: [PATCH 22/41] Update .github/workflows/lint_and_compile.yml

---
 .github/workflows/lint_and_compile.yml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/lint_and_compile.yml b/.github/workflows/lint_and_compile.yml
index 6801d9b..b2c301d 100644
--- a/.github/workflows/lint_and_compile.yml
+++ b/.github/workflows/lint_and_compile.yml
@@ -16,14 +16,12 @@ jobs:
               repository: Homelab/qmk_firmware
               path: qmk_firmware
               ref: master
-          - name: Set PATH
-            run: echo "export PATH=\$PATH:/usr/local/bin:/root/.local/bin" >> $GITHUB_ENV
           - name: Setup
             run: |
                   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
-                  /root/.local/bin/qmk setup -y
+                  qmk setup -y
                   cd /workspace/dave/dgvigil-keebs/qmk_firmware/
           - name: Prep
             run: |
@@ -37,7 +35,6 @@ jobs:
                   rsync -avP $(pwd)/q8/ qmk_firmware/keyboards/keychron/q8/ansi_encoder/keymaps/dgvigil/
           - name: Build
             run: |
-                  export PATH=$PATH:/usr/local/bin:/root/.local/bin
                   cd /workspace/dave/dgvigil-keebs/qmk_firmware/                  
                   # echo "Building QMK for draculad"
                   # /root/.local/bin/qmk compile -kb draculad -km dgvigil -e CONVERT_TO=promicro_rp2040
@@ -48,7 +45,7 @@ jobs:
                   # echo "Building QMK for ferris/sweep"
                   # qmk compile -kb ferris/sweep -km dgvigil
                   echo "Building QMK for keebio/iris/rev8"
-                  /root/.local/bin/qmk compile -kb keebio/iris/rev8 -km dgvigil
+                  qmk compile -kb keebio/iris/rev8 -km dgvigil
                   # /root/.local/bin/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
-- 
2.39.5


From 9dfc107f475a117c8d9c8dd5555d105ae61696ea Mon Sep 17 00:00:00 2001
From: dave <dgvigil@gmail.com>
Date: Mon, 14 Jul 2025 16:12:17 -0500
Subject: [PATCH 23/41] Update .github/workflows/lint_and_compile.yml

---
 .github/workflows/lint_and_compile.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/lint_and_compile.yml b/.github/workflows/lint_and_compile.yml
index b2c301d..43c739f 100644
--- a/.github/workflows/lint_and_compile.yml
+++ b/.github/workflows/lint_and_compile.yml
@@ -7,7 +7,7 @@ jobs:
           image: ubuntu
         steps:
           - name: Install packages
-            run: apt-get update && apt-get install -y nodejs git python3 python3-pip rsync
+            run: apt-get update && apt-get install -y nodejs git python3 python3-pip rsync gcc-arm-none-eabi
           - name: Check out repository code
             uses: actions/checkout@v4
           - name: Clone supercharge docs repository
-- 
2.39.5


From e36aa6fe9c34885a6ec2777167005649a087f437 Mon Sep 17 00:00:00 2001
From: dave <dgvigil@gmail.com>
Date: Mon, 14 Jul 2025 16:19:58 -0500
Subject: [PATCH 24/41] Update .github/workflows/lint_and_compile.yml

---
 .github/workflows/lint_and_compile.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/lint_and_compile.yml b/.github/workflows/lint_and_compile.yml
index 43c739f..70c95ce 100644
--- a/.github/workflows/lint_and_compile.yml
+++ b/.github/workflows/lint_and_compile.yml
@@ -23,6 +23,7 @@ jobs:
                   python3 -m pip install --break-system-package -r /workspace/dave/dgvigil-keebs/qmk_firmware/requirements.txt
                   qmk setup -y
                   cd /workspace/dave/dgvigil-keebs/qmk_firmware/
+                  make git-submodule
           - name: Prep
             run: |
                   cd /workspace/dave/dgvigil-keebs/
-- 
2.39.5


From 4d9b9e63b9663cefbc68e2a286ff4e8d55b8f557 Mon Sep 17 00:00:00 2001
From: Dave Vigil <dgvigil@gmail.com>
Date: Mon, 14 Jul 2025 16:35:01 -0500
Subject: [PATCH 25/41] switching container to qmkfm/qmk_cli

---
 .github/workflows/lint_and_compile.yml | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/.github/workflows/lint_and_compile.yml b/.github/workflows/lint_and_compile.yml
index 70c95ce..57b26b2 100644
--- a/.github/workflows/lint_and_compile.yml
+++ b/.github/workflows/lint_and_compile.yml
@@ -4,10 +4,8 @@ jobs:
     lint-and-compile:
         runs-on: local
         container:
-          image: ubuntu
+          image: qmkfm/qmk_cli
         steps:
-          - name: Install packages
-            run: apt-get update && apt-get install -y nodejs git python3 python3-pip rsync gcc-arm-none-eabi
           - name: Check out repository code
             uses: actions/checkout@v4
           - name: Clone supercharge docs repository
@@ -16,14 +14,6 @@ jobs:
               repository: Homelab/qmk_firmware
               path: qmk_firmware
               ref: master
-          - name: Setup
-            run: |
-                  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 /workspace/dave/dgvigil-keebs/qmk_firmware/
-                  make git-submodule
           - name: Prep
             run: |
                   cd /workspace/dave/dgvigil-keebs/
-- 
2.39.5


From 728fb14a0be805c8d65b1b2631c26d315da9d3c6 Mon Sep 17 00:00:00 2001
From: Dave Vigil <dgvigil@gmail.com>
Date: Mon, 14 Jul 2025 16:41:21 -0500
Subject: [PATCH 26/41] Fixing git workflow build

---
 .github/workflows/lint_and_compile.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/lint_and_compile.yml b/.github/workflows/lint_and_compile.yml
index 57b26b2..90a7f6e 100644
--- a/.github/workflows/lint_and_compile.yml
+++ b/.github/workflows/lint_and_compile.yml
@@ -6,6 +6,8 @@ jobs:
         container:
           image: qmkfm/qmk_cli
         steps:
+          - name: Install packages
+            run: apt-get update && apt-get install -y nodejs git python3 python3-pip rsync gcc-arm-none-eabi
           - name: Check out repository code
             uses: actions/checkout@v4
           - name: Clone supercharge docs repository
-- 
2.39.5


From 28c3ebd46db2a0a4912234223e343a7d1cbe0795 Mon Sep 17 00:00:00 2001
From: Dave Vigil <dgvigil@gmail.com>
Date: Mon, 14 Jul 2025 16:43:39 -0500
Subject: [PATCH 27/41] Fixing git workflow build

---
 .github/workflows/lint_and_compile.yml | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/.github/workflows/lint_and_compile.yml b/.github/workflows/lint_and_compile.yml
index 90a7f6e..b40b9a6 100644
--- a/.github/workflows/lint_and_compile.yml
+++ b/.github/workflows/lint_and_compile.yml
@@ -6,18 +6,9 @@ jobs:
         container:
           image: qmkfm/qmk_cli
         steps:
-          - name: Install packages
-            run: apt-get update && apt-get install -y nodejs git python3 python3-pip rsync gcc-arm-none-eabi
-          - name: Check out repository code
-            uses: actions/checkout@v4
-          - name: Clone supercharge docs repository
-            uses: actions/checkout@v4
-            with:
-              repository: Homelab/qmk_firmware
-              path: qmk_firmware
-              ref: master
           - name: Prep
             run: |
+                  pwd
                   cd /workspace/dave/dgvigil-keebs/
                   rsync -avP $(pwd)/dgvigil/ qmk_firmware/users/dgvigil/
                   rsync -avP $(pwd)/draculad/ qmk_firmware/keyboards/draculad/keymaps/dgvigil/
-- 
2.39.5


From d9fd523b0d0aebebf8c18e9b79208dab25ae8b75 Mon Sep 17 00:00:00 2001
From: Dave Vigil <dgvigil@gmail.com>
Date: Mon, 14 Jul 2025 16:45:36 -0500
Subject: [PATCH 28/41] Fixing git workflow build

---
 .github/workflows/lint_and_compile.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/lint_and_compile.yml b/.github/workflows/lint_and_compile.yml
index b40b9a6..f7321b7 100644
--- a/.github/workflows/lint_and_compile.yml
+++ b/.github/workflows/lint_and_compile.yml
@@ -10,13 +10,13 @@ jobs:
             run: |
                   pwd
                   cd /workspace/dave/dgvigil-keebs/
-                  rsync -avP $(pwd)/dgvigil/ qmk_firmware/users/dgvigil/
-                  rsync -avP $(pwd)/draculad/ qmk_firmware/keyboards/draculad/keymaps/dgvigil/
-                  rsync -avP $(pwd)/iris/ qmk_firmware/keyboards/keebio/iris/keymaps/dgvigil/
-                  rsync -avP $(pwd)/sweep/ qmk_firmware/keyboards/ferris/keymaps/dgvigil/
-                  rsync -avP $(pwd)/scottogame/ qmk_firmware/keyboards/handwired/scottokeebs/scottogame/keymaps/dgvigil/
-                  rsync -avP $(pwd)/swoop/ qmk_firmware/keyboards/bluebell/swoop/keymaps/dgvigil/
-                  rsync -avP $(pwd)/q8/ qmk_firmware/keyboards/keychron/q8/ansi_encoder/keymaps/dgvigil/
+                  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/                  
-- 
2.39.5


From 3c57a48fa6fc8f2115a5b34318bb14587b9ff8d1 Mon Sep 17 00:00:00 2001
From: Dave Vigil <dgvigil@gmail.com>
Date: Mon, 14 Jul 2025 16:46:34 -0500
Subject: [PATCH 29/41] Fixing git workflow build

---
 .github/workflows/lint_and_compile.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/lint_and_compile.yml b/.github/workflows/lint_and_compile.yml
index f7321b7..4c55c88 100644
--- a/.github/workflows/lint_and_compile.yml
+++ b/.github/workflows/lint_and_compile.yml
@@ -9,6 +9,7 @@ jobs:
           - name: Prep
             run: |
                   pwd
+                  ls -la
                   cd /workspace/dave/dgvigil-keebs/
                   cp -a $(pwd)/dgvigil/ qmk_firmware/users/dgvigil/
                   cp -a $(pwd)/draculad/ qmk_firmware/keyboards/draculad/keymaps/dgvigil/
-- 
2.39.5


From 650cdea7528d301b795996ddd85c87e9fbedc40e Mon Sep 17 00:00:00 2001
From: Dave Vigil <dgvigil@gmail.com>
Date: Mon, 14 Jul 2025 16:56:24 -0500
Subject: [PATCH 30/41] Fixing git workflow build

---
 .github/workflows/lint_and_compile.yml | 5 +++++
 .gitmodules                            | 3 +++
 qmk_firmware                           | 1 +
 3 files changed, 9 insertions(+)
 create mode 160000 qmk_firmware

diff --git a/.github/workflows/lint_and_compile.yml b/.github/workflows/lint_and_compile.yml
index 4c55c88..3df5ff8 100644
--- a/.github/workflows/lint_and_compile.yml
+++ b/.github/workflows/lint_and_compile.yml
@@ -6,6 +6,11 @@ jobs:
         container:
           image: qmkfm/qmk_cli
         steps:
+          - name: Check out repository code
+            uses: actions/checkout@v4
+          - name: Checkout submodules
+            run: |
+              git submodule update --init --recursive
           - name: Prep
             run: |
                   pwd
diff --git a/.gitmodules b/.gitmodules
index e69de29..75318a4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "qmk_firmware"]
+	path = qmk_firmware
+	url = gitea@10.24.10.185:Homelab/qmk_firmware.git
diff --git a/qmk_firmware b/qmk_firmware
new file mode 160000
index 0000000..86badb3
--- /dev/null
+++ b/qmk_firmware
@@ -0,0 +1 @@
+Subproject commit 86badb394e338aa2def4d1caf77089ce0acf03e9
-- 
2.39.5


From d6d33e5f3e3b3de19b2c36c0e575bd3b94058a65 Mon Sep 17 00:00:00 2001
From: Dave Vigil <dgvigil@gmail.com>
Date: Mon, 14 Jul 2025 23:54:16 -0500
Subject: [PATCH 31/41] Added dockerfilE/container

---
 .github/workflows/docker-build.yml     |  80 ++++++++++++++++++
 .github/workflows/lint_and_compile.yml |   2 +-
 DOCKER_README.md                       |  99 ++++++++++++++++++++++
 Dockerfile                             | 109 +++++++++++++++++++++++++
 build.sh                               |  71 ++++++++++++++++
 5 files changed, 360 insertions(+), 1 deletion(-)
 create mode 100644 .github/workflows/docker-build.yml
 create mode 100644 DOCKER_README.md
 create mode 100644 Dockerfile
 create mode 100755 build.sh

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
new file mode 100644
index 0000000..e45ed64
--- /dev/null
+++ b/.github/workflows/docker-build.yml
@@ -0,0 +1,80 @@
+name: Build QMK Firmware with Docker
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        keyboard: [draculad, iris, scottogame, sweep, swoop]
+        include:
+          - keyboard: draculad
+            qmk_path: draculad
+          - keyboard: iris
+            qmk_path: keebio/iris/rev8
+          - keyboard: scottogame
+            qmk_path: handwired/scottokeebs/scottogame
+          - keyboard: sweep
+            qmk_path: ferris/sweep
+          - keyboard: swoop
+            qmk_path: bluebell/swoop
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Build Docker image
+        run: docker build -t qmk-builder .
+
+      - name: Build firmware
+        run: |
+          docker run --rm \
+            -v "${{ github.workspace }}:/workspace" \
+            -w /workspace \
+            -e USER=dgvigil \
+            qmk-builder \
+            bash -c "
+              cd /qmk_firmware
+              qmk compile -kb ${{ matrix.qmk_path }} -km dgvigil
+            "
+
+      - name: Upload firmware artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: firmware-${{ matrix.keyboard }}
+          path: qmk_firmware/*.hex
+          retention-days: 30
+
+      - name: Upload UF2 files
+        uses: actions/upload-artifact@v4
+        with:
+          name: firmware-${{ matrix.keyboard }}-uf2
+          path: qmk_firmware/*.uf2
+          retention-days: 30
+
+  release:
+    needs: build
+    runs-on: ubuntu-latest
+    if: github.event_name == 'push' && github.ref == 'refs/heads/main'
+    
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Download all artifacts
+        uses: actions/download-artifact@v4
+        with:
+          path: artifacts
+
+      - name: Create release
+        uses: marvinpinto/action-automatic-releases@latest
+        with:
+          repo_token: "${{ secrets.GITHUB_TOKEN }}"
+          automatic_release_tag: "${{ github.sha }}"
+          title: "QMK Firmware Build - ${{ github.sha }}"
+          prerelease: false
+          files: |
+            artifacts/**/*.hex
+            artifacts/**/*.uf2 
\ No newline at end of file
diff --git a/.github/workflows/lint_and_compile.yml b/.github/workflows/lint_and_compile.yml
index 3df5ff8..a9b24ae 100644
--- a/.github/workflows/lint_and_compile.yml
+++ b/.github/workflows/lint_and_compile.yml
@@ -4,7 +4,7 @@ jobs:
     lint-and-compile:
         runs-on: local
         container:
-          image: qmkfm/qmk_cli
+          image: registry.home.dgvigil.dev/qmk-builder:latest
         steps:
           - name: Check out repository code
             uses: actions/checkout@v4
diff --git a/DOCKER_README.md b/DOCKER_README.md
new file mode 100644
index 0000000..d2078b8
--- /dev/null
+++ b/DOCKER_README.md
@@ -0,0 +1,99 @@
+# 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 -t qmk-builder .
+```
+
+### 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. 
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..d68f057
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,109 @@
+# 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"] 
\ No newline at end of file
diff --git a/build.sh b/build.sh
new file mode 100755
index 0000000..fbddf3a
--- /dev/null
+++ b/build.sh
@@ -0,0 +1,71 @@
+#!/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 -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" 
\ No newline at end of file
-- 
2.39.5


From 11e12ea8d5c367dac64fecf46393a61a7af2414d Mon Sep 17 00:00:00 2001
From: Dave Vigil <dgvigil@gmail.com>
Date: Tue, 15 Jul 2025 00:19:21 -0500
Subject: [PATCH 32/41] Fixing git workflow build

---
 .github/workflows/docker-build.yml     | 2 +-
 .github/workflows/lint_and_compile.yml | 2 +-
 DOCKER_README.md                       | 4 +++-
 build.sh                               | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index e45ed64..6352423 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -26,7 +26,7 @@ jobs:
           submodules: recursive
 
       - name: Build Docker image
-        run: docker build -t qmk-builder .
+        run: docker build --load -t qmk-builder .
 
       - name: Build firmware
         run: |
diff --git a/.github/workflows/lint_and_compile.yml b/.github/workflows/lint_and_compile.yml
index a9b24ae..07d32de 100644
--- a/.github/workflows/lint_and_compile.yml
+++ b/.github/workflows/lint_and_compile.yml
@@ -4,7 +4,7 @@ jobs:
     lint-and-compile:
         runs-on: local
         container:
-          image: registry.home.dgvigil.dev/qmk-builder:latest
+          image: registry.home.dgvigil.dev/qmk-builder:v0.1
         steps:
           - name: Check out repository code
             uses: actions/checkout@v4
diff --git a/DOCKER_README.md b/DOCKER_README.md
index d2078b8..38807fe 100644
--- a/DOCKER_README.md
+++ b/DOCKER_README.md
@@ -22,9 +22,11 @@ This repository includes a custom Docker setup for building QMK firmware in CI/C
 ### Building the Docker Image
 
 ```bash
-docker build -t qmk-builder .
+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:
diff --git a/build.sh b/build.sh
index fbddf3a..a6d6ced 100755
--- a/build.sh
+++ b/build.sh
@@ -12,7 +12,7 @@ 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 -t qmk-builder .
+    docker build --load -t qmk-builder .
 fi
 
 # Function to build a specific keyboard
-- 
2.39.5


From 4ed65f497367caca7b8053ee7b5666f033e40e1f Mon Sep 17 00:00:00 2001
From: Dave Vigil <dgvigil@gmail.com>
Date: Tue, 15 Jul 2025 00:22:52 -0500
Subject: [PATCH 33/41] Fixing git workflow build

---
 .github/workflows/docker-build.yml     | 4 ++++
 .github/workflows/lint_and_compile.yml | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 6352423..00351b3 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -27,6 +27,10 @@ jobs:
 
       - 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
 
       - name: Build firmware
         run: |
diff --git a/.github/workflows/lint_and_compile.yml b/.github/workflows/lint_and_compile.yml
index 07d32de..bc46c28 100644
--- a/.github/workflows/lint_and_compile.yml
+++ b/.github/workflows/lint_and_compile.yml
@@ -1,5 +1,5 @@
 name: Compile my Keebs
-on: [push]
+on: [pull_request]
 jobs:
     lint-and-compile:
         runs-on: local
-- 
2.39.5


From 103a31736b08f5c298a2b970ad30fe922ec213ef Mon Sep 17 00:00:00 2001
From: Dave Vigil <dgvigil@gmail.com>
Date: Tue, 15 Jul 2025 00:27:50 -0500
Subject: [PATCH 34/41] Fixing git workflow build

---
 .github/workflows/docker-build.yml | 53 ++----------------------------
 1 file changed, 2 insertions(+), 51 deletions(-)

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 00351b3..aede46d 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -4,6 +4,8 @@ on: [push, pull_request]
 jobs:
   build:
     runs-on: ubuntu-latest
+    container:
+      image: ubuntu
     strategy:
       matrix:
         keyboard: [draculad, iris, scottogame, sweep, swoop]
@@ -31,54 +33,3 @@ jobs:
         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
-
-      - name: Build firmware
-        run: |
-          docker run --rm \
-            -v "${{ github.workspace }}:/workspace" \
-            -w /workspace \
-            -e USER=dgvigil \
-            qmk-builder \
-            bash -c "
-              cd /qmk_firmware
-              qmk compile -kb ${{ matrix.qmk_path }} -km dgvigil
-            "
-
-      - name: Upload firmware artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: firmware-${{ matrix.keyboard }}
-          path: qmk_firmware/*.hex
-          retention-days: 30
-
-      - name: Upload UF2 files
-        uses: actions/upload-artifact@v4
-        with:
-          name: firmware-${{ matrix.keyboard }}-uf2
-          path: qmk_firmware/*.uf2
-          retention-days: 30
-
-  release:
-    needs: build
-    runs-on: ubuntu-latest
-    if: github.event_name == 'push' && github.ref == 'refs/heads/main'
-    
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Download all artifacts
-        uses: actions/download-artifact@v4
-        with:
-          path: artifacts
-
-      - name: Create release
-        uses: marvinpinto/action-automatic-releases@latest
-        with:
-          repo_token: "${{ secrets.GITHUB_TOKEN }}"
-          automatic_release_tag: "${{ github.sha }}"
-          title: "QMK Firmware Build - ${{ github.sha }}"
-          prerelease: false
-          files: |
-            artifacts/**/*.hex
-            artifacts/**/*.uf2 
\ No newline at end of file
-- 
2.39.5


From 2db409ff5350d2c265bc456a15cb4203617955f0 Mon Sep 17 00:00:00 2001
From: Dave Vigil <dgvigil@gmail.com>
Date: Tue, 15 Jul 2025 00:29:17 -0500
Subject: [PATCH 35/41] Fixing git workflow build

---
 .github/workflows/docker-build.yml | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index aede46d..4b0752b 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -6,27 +6,11 @@ jobs:
     runs-on: ubuntu-latest
     container:
       image: ubuntu
-    strategy:
-      matrix:
-        keyboard: [draculad, iris, scottogame, sweep, swoop]
-        include:
-          - keyboard: draculad
-            qmk_path: draculad
-          - keyboard: iris
-            qmk_path: keebio/iris/rev8
-          - keyboard: scottogame
-            qmk_path: handwired/scottokeebs/scottogame
-          - keyboard: sweep
-            qmk_path: ferris/sweep
-          - keyboard: swoop
-            qmk_path: bluebell/swoop
-
     steps:
       - 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
-- 
2.39.5


From 35d6b2763493dbef526a0870fe01e02fbf197192 Mon Sep 17 00:00:00 2001
From: Dave Vigil <dgvigil@gmail.com>
Date: Tue, 15 Jul 2025 00:30:18 -0500
Subject: [PATCH 36/41] Fixing git workflow build

---
 .github/workflows/docker-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 4b0752b..8bda047 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -3,7 +3,7 @@ on: [push, pull_request]
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: local
     container:
       image: ubuntu
     steps:
-- 
2.39.5


From 690fa584788af06eb59133ab3d0dc08e0a57da81 Mon Sep 17 00:00:00 2001
From: Dave Vigil <dgvigil@gmail.com>
Date: Tue, 15 Jul 2025 00:32:12 -0500
Subject: [PATCH 37/41] Fixing git workflow build

---
 .github/workflows/docker-build.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 8bda047..a1c3a14 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -7,6 +7,8 @@ jobs:
     container:
       image: ubuntu
     steps:
+      - name: Install packages
+        run: apt-get update && apt-get install -y nodejs git python3 python3-pip rsync
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
-- 
2.39.5


From 8f6024cd6d53ccfd4e319bfcc5594c4544847f75 Mon Sep 17 00:00:00 2001
From: Dave Vigil <dgvigil@gmail.com>
Date: Tue, 15 Jul 2025 00:37:46 -0500
Subject: [PATCH 38/41] Fixing git workflow build

---
 .gitmodules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitmodules b/.gitmodules
index 75318a4..05f3dd9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "qmk_firmware"]
 	path = qmk_firmware
-	url = gitea@10.24.10.185:Homelab/qmk_firmware.git
+	url = https://git.home.dgvigil.dev/Homelab/qmk_firmware.git
-- 
2.39.5


From ee38e1f27aa244b234bcd5f1dd5bd30e5d2aca7f Mon Sep 17 00:00:00 2001
From: Dave Vigil <dgvigil@gmail.com>
Date: Tue, 15 Jul 2025 00:44:47 -0500
Subject: [PATCH 39/41] Fixing git workflow build

---
 .github/workflows/docker-build.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index a1c3a14..f362ea1 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -8,7 +8,12 @@ jobs:
       image: ubuntu
     steps:
       - name: Install packages
-        run: apt-get update && apt-get install -y nodejs git python3 python3-pip rsync
+        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 | sudo 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 docker-ce docker-ce-cli containerd.io
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
-- 
2.39.5


From dc9f1b4776f8d61e16fe8bcd30d8916796c0eb4f Mon Sep 17 00:00:00 2001
From: Dave Vigil <dgvigil@gmail.com>
Date: Tue, 15 Jul 2025 00:50:22 -0500
Subject: [PATCH 40/41] Fixing git workflow build

---
 .github/workflows/docker-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index f362ea1..29654b1 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -10,7 +10,7 @@ jobs:
       - 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 | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
+          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 docker-ce docker-ce-cli containerd.io
-- 
2.39.5


From 85970528a47126ea2e046b752df5409892a786cf Mon Sep 17 00:00:00 2001
From: Dave Vigil <dgvigil@gmail.com>
Date: Tue, 15 Jul 2025 14:28:30 -0500
Subject: [PATCH 41/41] Fixing git workflow build

---
 .github/workflows/docker-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 29654b1..3d0a754 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -13,7 +13,7 @@ jobs:
           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 docker-ce docker-ce-cli containerd.io
+          apt install -y docker-ce docker-ce-cli containerd.io
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
-- 
2.39.5