From e1e6c6c02b6bcf972275a523b1116a5097a9dd6a Mon Sep 17 00:00:00 2001
From: Peter Johanson <peter@peterjohanson.com>
Date: Tue, 13 Jan 2026 19:06:26 -0700
Subject: [PATCH] refactor(boards): Move nice!60 to ZMK variant by default

Make the standard nice!60 board ID be `nice60/nrf52840/zmk` or
`nice60//zmk` by shorthand.
---
 app/boards/nicekeyboards/nice60/README.md                       | 2 +-
 app/boards/nicekeyboards/nice60/board.yml                       | 2 ++
 app/boards/nicekeyboards/nice60/nice60.zmk.yml                  | 2 +-
 .../nice60/{nice60.dts => nice60_nrf52840_zmk.dts}              | 0
 .../nice60/{nice60_defconfig => nice60_nrf52840_zmk_defconfig}  | 0
 app/core-coverage.yml                                           | 2 +-
 6 files changed, 5 insertions(+), 3 deletions(-)
 rename app/boards/nicekeyboards/nice60/{nice60.dts => nice60_nrf52840_zmk.dts} (100%)
 rename app/boards/nicekeyboards/nice60/{nice60_defconfig => nice60_nrf52840_zmk_defconfig} (100%)

diff --git a/app/boards/nicekeyboards/nice60/README.md b/app/boards/nicekeyboards/nice60/README.md
index dce230ae7..4b3fa09a9 100644
--- a/app/boards/nicekeyboards/nice60/README.md
+++ b/app/boards/nicekeyboards/nice60/README.md
@@ -7,5 +7,5 @@ The nice!60 is a hotswap 60% made by Nice Keyboards. https://nicekeyboards.com/n
 ## Building nice!60 ZMK firmware
 
 ```
-west build -p -b nice60
+west build -p -b nice60//zmk
 ```
diff --git a/app/boards/nicekeyboards/nice60/board.yml b/app/boards/nicekeyboards/nice60/board.yml
index fdbe7cef1..e945cbf04 100644
--- a/app/boards/nicekeyboards/nice60/board.yml
+++ b/app/boards/nicekeyboards/nice60/board.yml
@@ -3,3 +3,5 @@ board:
   vendor: nicekeyboards
   socs:
     - name: nrf52840
+      variants:
+        - name: zmk
diff --git a/app/boards/nicekeyboards/nice60/nice60.zmk.yml b/app/boards/nicekeyboards/nice60/nice60.zmk.yml
index 2847260f8..b6d2a2b13 100644
--- a/app/boards/nicekeyboards/nice60/nice60.zmk.yml
+++ b/app/boards/nicekeyboards/nice60/nice60.zmk.yml
@@ -1,5 +1,5 @@
 file_format: "1"
-id: nice60
+id: nice60//zmk
 name: nice!60
 type: board
 arch: arm
diff --git a/app/boards/nicekeyboards/nice60/nice60.dts b/app/boards/nicekeyboards/nice60/nice60_nrf52840_zmk.dts
similarity index 100%
rename from app/boards/nicekeyboards/nice60/nice60.dts
rename to app/boards/nicekeyboards/nice60/nice60_nrf52840_zmk.dts
diff --git a/app/boards/nicekeyboards/nice60/nice60_defconfig b/app/boards/nicekeyboards/nice60/nice60_nrf52840_zmk_defconfig
similarity index 100%
rename from app/boards/nicekeyboards/nice60/nice60_defconfig
rename to app/boards/nicekeyboards/nice60/nice60_nrf52840_zmk_defconfig
diff --git a/app/core-coverage.yml b/app/core-coverage.yml
index db2780656..bc68ffc67 100644
--- a/app/core-coverage.yml
+++ b/app/core-coverage.yml
@@ -10,7 +10,7 @@ shield:
   - tidbit
 include:
   - board: bdn9//zmk
-  - board: nice60
+  - board: nice60//zmk
   - board: xiao_ble//zmk
     shield: hummingbird
   - board: nrf52840_m2//zmk