Merge remote-tracking branch 'origin/master' into develop

161 files changed, 11 insertions, 1 deletions

diff --git a/keyboards/handwired/108key_trackpoint/.noci b/keyboards/akegata_denki/device_one/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/handwired/108key_trackpoint/.noci
+++ b/keyboards/akegata_denki/device_one/.noci
diff --git a/keyboards/handwired/2x5keypad/.noci b/keyboards/arabica37/rev1/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/handwired/2x5keypad/.noci
+++ b/keyboards/arabica37/rev1/.noci
diff --git a/keyboards/handwired/3dp660/.noci b/keyboards/bat43/rev2/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/handwired/3dp660/.noci
+++ b/keyboards/bat43/rev2/.noci
diff --git a/keyboards/handwired/412_64/.noci b/keyboards/boardsource/microdox/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/handwired/412_64/.noci
+++ b/keyboards/boardsource/microdox/.noci
diff --git a/keyboards/handwired/42/.noci b/keyboards/bthlabs/geekpad/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/handwired/42/.noci
+++ b/keyboards/bthlabs/geekpad/.noci
diff --git a/keyboards/handwired/6macro/.noci b/keyboards/chidori/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/handwired/6macro/.noci
+++ b/keyboards/chidori/.noci
diff --git a/keyboards/handwired/aek64/.noci b/keyboards/choco60/rev1/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/handwired/aek64/.noci
+++ b/keyboards/choco60/rev1/.noci
diff --git a/keyboards/handwired/aplx2/.noci b/keyboards/claw44/rev1/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/handwired/aplx2/.noci
+++ b/keyboards/claw44/rev1/.noci
diff --git a/keyboards/handwired/aranck/.noci b/keyboards/cocoa40/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/handwired/aranck/.noci
+++ b/keyboards/cocoa40/.noci
diff --git a/keyboards/handwired/arrow_pad/.noci b/keyboards/converter/ibm_5291/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/handwired/arrow_pad/.noci
+++ b/keyboards/converter/ibm_5291/.noci
diff --git a/keyboards/handwired/atreus50/.noci b/keyboards/converter/modelm101/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/handwired/atreus50/.noci
+++ b/keyboards/converter/modelm101/.noci
diff --git a/keyboards/handwired/bdn9_ble/.noci b/keyboards/cu75/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/handwired/bdn9_ble/.noci
+++ b/keyboards/cu75/.noci
diff --git a/keyboards/handwired/bento/.noci b/keyboards/dm9records/ergoinu/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/handwired/bento/.noci
+++ b/keyboards/dm9records/ergoinu/.noci
diff --git a/keyboards/handwired/bento/rev1/.noci b/keyboards/emptystring/NQG/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/handwired/bento/rev1/.noci
+++ b/keyboards/emptystring/NQG/.noci
diff --git a/keyboards/handwired/boss566y/redragon_vara/.noci b/keyboards/ergodash/mini/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/handwired/boss566y/redragon_vara/.noci
+++ b/keyboards/ergodash/mini/.noci
diff --git a/keyboards/handwired/brain/.noci b/keyboards/ergodash/rev1/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/handwired/brain/.noci
+++ b/keyboards/ergodash/rev1/.noci
diff --git a/keyboards/handwired/cans12er/.noci b/keyboards/evyd13/mx5160/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/handwired/cans12er/.noci
+++ b/keyboards/evyd13/mx5160/.noci
diff --git a/keyboards/handwired/chiron/.noci b/keyboards/fluorite/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/handwired/chiron/.noci
+++ b/keyboards/fluorite/.noci
diff --git a/keyboards/handwired/k8split/.noci b/keyboards/handwired/k8split/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/k8split/.noci
+++ /dev/null
diff --git a/keyboards/handwired/k_numpad17/.noci b/keyboards/handwired/k_numpad17/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/k_numpad17/.noci
+++ /dev/null
diff --git a/keyboards/handwired/kbod/.noci b/keyboards/handwired/kbod/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/kbod/.noci
+++ /dev/null
diff --git a/keyboards/handwired/ks63/.noci b/keyboards/handwired/ks63/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/ks63/.noci
+++ /dev/null
diff --git a/keyboards/handwired/leftynumpad/.noci b/keyboards/handwired/leftynumpad/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/leftynumpad/.noci
+++ /dev/null
diff --git a/keyboards/handwired/lovelive9/.noci b/keyboards/handwired/lovelive9/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/lovelive9/.noci
+++ /dev/null
diff --git a/keyboards/handwired/magicforce61/.noci b/keyboards/handwired/magicforce61/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/magicforce61/.noci
+++ /dev/null
diff --git a/keyboards/handwired/magicforce68/.noci b/keyboards/handwired/magicforce68/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/magicforce68/.noci
+++ /dev/null
diff --git a/keyboards/handwired/mechboards_micropad/.noci b/keyboards/handwired/mechboards_micropad/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/mechboards_micropad/.noci
+++ /dev/null
diff --git a/keyboards/handwired/minorca/.noci b/keyboards/handwired/minorca/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/minorca/.noci
+++ /dev/null
diff --git a/keyboards/handwired/ms_sculpt_mobile/.noci b/keyboards/handwired/ms_sculpt_mobile/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/ms_sculpt_mobile/.noci
+++ /dev/null
diff --git a/keyboards/handwired/myskeeb/.noci b/keyboards/handwired/myskeeb/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/myskeeb/.noci
+++ /dev/null
diff --git a/keyboards/handwired/nicekey/.noci b/keyboards/handwired/nicekey/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/nicekey/.noci
+++ /dev/null
diff --git a/keyboards/handwired/not_so_minidox/.noci b/keyboards/handwired/not_so_minidox/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/not_so_minidox/.noci
+++ /dev/null
diff --git a/keyboards/handwired/novem/.noci b/keyboards/handwired/novem/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/novem/.noci
+++ /dev/null
diff --git a/keyboards/handwired/numpad20/.noci b/keyboards/handwired/numpad20/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/numpad20/.noci
+++ /dev/null
diff --git a/keyboards/handwired/obuwunkunubi/spaget/.noci b/keyboards/handwired/obuwunkunubi/spaget/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/obuwunkunubi/spaget/.noci
+++ /dev/null
diff --git a/keyboards/handwired/onekey/.noci b/keyboards/handwired/onekey/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/onekey/.noci
+++ /dev/null
diff --git a/keyboards/handwired/onekey/blackpill_f401/.noci b/keyboards/handwired/onekey/blackpill_f401/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/onekey/blackpill_f401/.noci
+++ /dev/null
diff --git a/keyboards/handwired/onekey/blackpill_f411/.noci b/keyboards/handwired/onekey/blackpill_f411/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/onekey/blackpill_f411/.noci
+++ /dev/null
diff --git a/keyboards/handwired/onekey/bluepill/.noci b/keyboards/handwired/onekey/bluepill/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/onekey/bluepill/.noci
+++ /dev/null
diff --git a/keyboards/handwired/onekey/elite_c/.noci b/keyboards/handwired/onekey/elite_c/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/onekey/elite_c/.noci
+++ /dev/null
diff --git a/keyboards/handwired/onekey/promicro/.noci b/keyboards/handwired/onekey/promicro/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/onekey/promicro/.noci
+++ /dev/null
diff --git a/keyboards/handwired/onekey/proton_c/.noci b/keyboards/handwired/onekey/proton_c/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/onekey/proton_c/.noci
+++ /dev/null
diff --git a/keyboards/handwired/onekey/stm32f0_disco/.noci b/keyboards/handwired/onekey/stm32f0_disco/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/onekey/stm32f0_disco/.noci
+++ /dev/null
diff --git a/keyboards/handwired/onekey/teensy_2/.noci b/keyboards/handwired/onekey/teensy_2/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/onekey/teensy_2/.noci
+++ /dev/null
diff --git a/keyboards/handwired/onekey/teensy_2pp/.noci b/keyboards/handwired/onekey/teensy_2pp/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/onekey/teensy_2pp/.noci
+++ /dev/null
diff --git a/keyboards/handwired/onekey/teensy_32/.noci b/keyboards/handwired/onekey/teensy_32/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/onekey/teensy_32/.noci
+++ /dev/null
diff --git a/keyboards/handwired/onekey/teensy_lc/.noci b/keyboards/handwired/onekey/teensy_lc/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/onekey/teensy_lc/.noci
+++ /dev/null
diff --git a/keyboards/handwired/ortho5x13/.noci b/keyboards/handwired/ortho5x13/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/ortho5x13/.noci
+++ /dev/null
diff --git a/keyboards/handwired/owlet60/.noci b/keyboards/handwired/owlet60/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/owlet60/.noci
+++ /dev/null
diff --git a/keyboards/handwired/p1800fl/.noci b/keyboards/handwired/p1800fl/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/p1800fl/.noci
+++ /dev/null
diff --git a/keyboards/handwired/p65rgb/.noci b/keyboards/handwired/p65rgb/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/p65rgb/.noci
+++ /dev/null
diff --git a/keyboards/handwired/pilcrow/.noci b/keyboards/handwired/pilcrow/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/pilcrow/.noci
+++ /dev/null
diff --git a/keyboards/handwired/pill60/.noci b/keyboards/handwired/pill60/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/pill60/.noci
+++ /dev/null
diff --git a/keyboards/handwired/pill60/blackpill_f401/.noci b/keyboards/handwired/pill60/blackpill_f401/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/pill60/blackpill_f401/.noci
+++ /dev/null
diff --git a/keyboards/handwired/pill60/blackpill_f411/.noci b/keyboards/handwired/pill60/blackpill_f411/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/pill60/blackpill_f411/.noci
+++ /dev/null
diff --git a/keyboards/handwired/pill60/bluepill/.noci b/keyboards/handwired/pill60/bluepill/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/pill60/bluepill/.noci
+++ /dev/null
diff --git a/keyboards/handwired/postageboard/.noci b/keyboards/handwired/postageboard/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/postageboard/.noci
+++ /dev/null
diff --git a/keyboards/handwired/postageboard/mini/.noci b/keyboards/handwired/postageboard/mini/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/postageboard/mini/.noci
+++ /dev/null
diff --git a/keyboards/handwired/postageboard/r1/.noci b/keyboards/handwired/postageboard/r1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/postageboard/r1/.noci
+++ /dev/null
diff --git a/keyboards/handwired/prime_exl/.noci b/keyboards/handwired/prime_exl/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/prime_exl/.noci
+++ /dev/null
diff --git a/keyboards/handwired/prime_exl_plus/.noci b/keyboards/handwired/prime_exl_plus/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/prime_exl_plus/.noci
+++ /dev/null
diff --git a/keyboards/handwired/prkl30/feather/.noci b/keyboards/handwired/prkl30/feather/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/prkl30/feather/.noci
+++ /dev/null
diff --git a/keyboards/handwired/prkl30/promicro/.noci b/keyboards/handwired/prkl30/promicro/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/prkl30/promicro/.noci
+++ /dev/null
diff --git a/keyboards/handwired/promethium/.noci b/keyboards/handwired/promethium/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/promethium/.noci
+++ /dev/null
diff --git a/keyboards/handwired/pterodactyl/.noci b/keyboards/handwired/pterodactyl/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/pterodactyl/.noci
+++ /dev/null
diff --git a/keyboards/handwired/pteron/.noci b/keyboards/handwired/pteron/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/pteron/.noci
+++ /dev/null
diff --git a/keyboards/handwired/pteron38/.noci b/keyboards/handwired/pteron38/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/pteron38/.noci
+++ /dev/null
diff --git a/keyboards/handwired/pteron44/.noci b/keyboards/handwired/pteron44/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/pteron44/.noci
+++ /dev/null
diff --git a/keyboards/handwired/qc60/.noci b/keyboards/handwired/qc60/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/qc60/.noci
+++ /dev/null
diff --git a/keyboards/handwired/qc60/proto/.noci b/keyboards/handwired/qc60/proto/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/qc60/proto/.noci
+++ /dev/null
diff --git a/keyboards/handwired/reddot/.noci b/keyboards/handwired/reddot/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/reddot/.noci
+++ /dev/null
diff --git a/keyboards/handwired/retro_refit/.noci b/keyboards/handwired/retro_refit/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/retro_refit/.noci
+++ /dev/null
diff --git a/keyboards/handwired/riblee_f401/.noci b/keyboards/handwired/riblee_f401/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/riblee_f401/.noci
+++ /dev/null
diff --git a/keyboards/handwired/riblee_f411/.noci b/keyboards/handwired/riblee_f411/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/riblee_f411/.noci
+++ /dev/null
diff --git a/keyboards/handwired/rs60/.noci b/keyboards/handwired/rs60/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/rs60/.noci
+++ /dev/null
diff --git a/keyboards/handwired/selene/.noci b/keyboards/handwired/selene/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/selene/.noci
+++ /dev/null
diff --git a/keyboards/handwired/sick68/.noci b/keyboards/handwired/sick68/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/sick68/.noci
+++ /dev/null
diff --git a/keyboards/handwired/sick_pad/.noci b/keyboards/handwired/sick_pad/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/sick_pad/.noci
+++ /dev/null
diff --git a/keyboards/handwired/slash/.noci b/keyboards/handwired/slash/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/slash/.noci
+++ /dev/null
diff --git a/keyboards/handwired/space_oddity/.noci b/keyboards/handwired/space_oddity/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/space_oddity/.noci
+++ /dev/null
diff --git a/keyboards/handwired/splittest/.noci b/keyboards/handwired/splittest/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/splittest/.noci
+++ /dev/null
diff --git a/keyboards/handwired/splittest/promicro/.noci b/keyboards/handwired/splittest/promicro/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/splittest/promicro/.noci
+++ /dev/null
diff --git a/keyboards/handwired/splittest/teensy_2/.noci b/keyboards/handwired/splittest/teensy_2/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/splittest/teensy_2/.noci
+++ /dev/null
diff --git a/keyboards/handwired/steamvan/rev1/.noci b/keyboards/handwired/steamvan/rev1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/steamvan/rev1/.noci
+++ /dev/null
diff --git a/keyboards/handwired/sticc14/.noci b/keyboards/handwired/sticc14/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/sticc14/.noci
+++ /dev/null
diff --git a/keyboards/handwired/stream_cheap/2x3/.noci b/keyboards/handwired/stream_cheap/2x3/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/stream_cheap/2x3/.noci
+++ /dev/null
diff --git a/keyboards/handwired/stream_cheap/2x4/.noci b/keyboards/handwired/stream_cheap/2x4/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/stream_cheap/2x4/.noci
+++ /dev/null
diff --git a/keyboards/handwired/stream_cheap/2x5/.noci b/keyboards/handwired/stream_cheap/2x5/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/stream_cheap/2x5/.noci
+++ /dev/null
diff --git a/keyboards/handwired/swiftrax/astro65/.noci b/keyboards/handwired/swiftrax/astro65/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/swiftrax/astro65/.noci
+++ /dev/null
diff --git a/keyboards/handwired/swiftrax/bebol/.noci b/keyboards/handwired/swiftrax/bebol/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/swiftrax/bebol/.noci
+++ /dev/null
diff --git a/keyboards/handwired/swiftrax/beegboy/.noci b/keyboards/handwired/swiftrax/beegboy/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/swiftrax/beegboy/.noci
+++ /dev/null
diff --git a/keyboards/handwired/swiftrax/cowfish/.noci b/keyboards/handwired/swiftrax/cowfish/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/swiftrax/cowfish/.noci
+++ /dev/null
diff --git a/keyboards/handwired/swiftrax/pandamic/.noci b/keyboards/handwired/swiftrax/pandamic/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/swiftrax/pandamic/.noci
+++ /dev/null
diff --git a/keyboards/handwired/swiftrax/retropad/.noci b/keyboards/handwired/swiftrax/retropad/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/swiftrax/retropad/.noci
+++ /dev/null
diff --git a/keyboards/handwired/swiftrax/unsplit/.noci b/keyboards/handwired/swiftrax/unsplit/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/swiftrax/unsplit/.noci
+++ /dev/null
diff --git a/keyboards/handwired/symmetric70_proto/.noci b/keyboards/handwired/symmetric70_proto/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/symmetric70_proto/.noci
+++ /dev/null
diff --git a/keyboards/handwired/symmetry60/.noci b/keyboards/handwired/symmetry60/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/symmetry60/.noci
+++ /dev/null
diff --git a/keyboards/handwired/t111/.noci b/keyboards/handwired/t111/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/t111/.noci
+++ /dev/null
diff --git a/keyboards/handwired/tennie/.noci b/keyboards/handwired/tennie/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/tennie/.noci
+++ /dev/null
diff --git a/keyboards/handwired/terminus_mini/.noci b/keyboards/handwired/terminus_mini/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/terminus_mini/.noci
+++ /dev/null
diff --git a/keyboards/handwired/trackpoint/.noci b/keyboards/handwired/trackpoint/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/trackpoint/.noci
+++ /dev/null
diff --git a/keyboards/handwired/traveller/.noci b/keyboards/handwired/traveller/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/traveller/.noci
+++ /dev/null
diff --git a/keyboards/handwired/tritium_numpad/.noci b/keyboards/handwired/tritium_numpad/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/tritium_numpad/.noci
+++ /dev/null
diff --git a/keyboards/handwired/twadlee/tp69/.noci b/keyboards/handwired/twadlee/tp69/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/twadlee/tp69/.noci
+++ /dev/null
diff --git a/keyboards/handwired/unk/.noci b/keyboards/handwired/unk/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/unk/.noci
+++ /dev/null
diff --git a/keyboards/handwired/unk/rev1/.noci b/keyboards/handwired/unk/rev1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/unk/rev1/.noci
+++ /dev/null
diff --git a/keyboards/handwired/videowriter/.noci b/keyboards/handwired/videowriter/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/videowriter/.noci
+++ /dev/null
diff --git a/keyboards/handwired/wabi/.noci b/keyboards/handwired/wabi/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/wabi/.noci
+++ /dev/null
diff --git a/keyboards/handwired/woodpad/.noci b/keyboards/handwired/woodpad/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/woodpad/.noci
+++ /dev/null
diff --git a/keyboards/handwired/wulkan/.noci b/keyboards/handwired/wulkan/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/wulkan/.noci
+++ /dev/null
diff --git a/keyboards/handwired/xealous/.noci b/keyboards/handwired/xealous/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/xealous/.noci
+++ /dev/null
diff --git a/keyboards/handwired/xealous/rev1/.noci b/keyboards/handwired/xealous/rev1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/xealous/rev1/.noci
+++ /dev/null
diff --git a/keyboards/handwired/xealousbrown/.noci b/keyboards/handwired/xealousbrown/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/xealousbrown/.noci
+++ /dev/null
diff --git a/keyboards/handwired/z150/.noci b/keyboards/handwired/z150/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/z150/.noci
+++ /dev/null
diff --git a/keyboards/handwired/zergo/.noci b/keyboards/handwired/zergo/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/zergo/.noci
+++ /dev/null
diff --git a/keyboards/handwired/ck4x4/.noci b/keyboards/helix/pico/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/handwired/ck4x4/.noci
+++ b/keyboards/helix/pico/.noci
diff --git a/keyboards/handwired/cmd60/.noci b/keyboards/helix/pico/back/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/handwired/cmd60/.noci
+++ b/keyboards/helix/pico/back/.noci
diff --git a/keyboards/handwired/co60/rev1/.noci b/keyboards/helix/pico/sc/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/handwired/co60/rev1/.noci
+++ b/keyboards/helix/pico/sc/.noci
diff --git a/keyboards/handwired/co60/rev6/.noci b/keyboards/helix/pico/under/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/handwired/co60/rev6/.noci
+++ b/keyboards/helix/pico/under/.noci
diff --git a/keyboards/handwired/co60/rev7/.noci b/keyboards/hifumi/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/handwired/co60/rev7/.noci
+++ b/keyboards/hifumi/.noci
diff --git a/keyboards/handwired/colorlice/.noci b/keyboards/jiran/rev2/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/handwired/colorlice/.noci
+++ b/keyboards/jiran/rev2/.noci
diff --git a/keyboards/handwired/curiosity/.noci b/keyboards/just60/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/handwired/curiosity/.noci
+++ b/keyboards/just60/.noci
diff --git a/keyboards/handwired/d48/.noci b/keyboards/leeku/finger65/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/handwired/d48/.noci
+++ b/keyboards/leeku/finger65/.noci
diff --git a/keyboards/handwired/dactyl/.noci b/keyboards/lfkeyboards/lfk65_hs/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/handwired/dactyl/.noci
+++ b/keyboards/lfkeyboards/lfk65_hs/.noci
diff --git a/keyboards/handwired/dactyl_left/.noci b/keyboards/lfkeyboards/mini1800/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/handwired/dactyl_left/.noci
+++ b/keyboards/lfkeyboards/mini1800/.noci
diff --git a/keyboards/handwired/dactyl_manuform/.noci b/keyboards/lily58/rev1/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/handwired/dactyl_manuform/.noci
+++ b/keyboards/lily58/rev1/.noci
diff --git a/keyboards/handwired/dactyl_manuform/4x5/.noci b/keyboards/marksard/rhymestone/rev1/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/handwired/dactyl_manuform/4x5/.noci
+++ b/keyboards/marksard/rhymestone/rev1/.noci
diff --git a/keyboards/handwired/dactyl_manuform/4x6/.noci b/keyboards/miniaxe/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/handwired/dactyl_manuform/4x6/.noci
+++ b/keyboards/miniaxe/.noci
diff --git a/keyboards/handwired/dactyl_manuform/5x6/.noci b/keyboards/mint60/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/.noci
+++ b/keyboards/mint60/.noci
diff --git a/keyboards/handwired/dactyl_manuform/5x6_5/.noci b/keyboards/nomu30/rev2/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/handwired/dactyl_manuform/5x6_5/.noci
+++ b/keyboards/nomu30/rev2/.noci
diff --git a/keyboards/handwired/dactyl_manuform/5x7/.noci b/keyboards/ogre/ergo_single/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/handwired/dactyl_manuform/5x7/.noci
+++ b/keyboards/ogre/ergo_single/.noci
diff --git a/keyboards/handwired/dactyl_manuform/6x6/.noci b/keyboards/ogre/ergo_split/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/handwired/dactyl_manuform/6x6/.noci
+++ b/keyboards/ogre/ergo_split/.noci
diff --git a/keyboards/handwired/dactyl_manuform/dmote/62key/.noci b/keyboards/pinky/3/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/handwired/dactyl_manuform/dmote/62key/.noci
+++ b/keyboards/pinky/3/.noci
diff --git a/keyboards/handwired/dactyl_promicro/.noci b/keyboards/pinky/4/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/handwired/dactyl_promicro/.noci
+++ b/keyboards/pinky/4/.noci
diff --git a/keyboards/handwired/dactyl_rah/.noci b/keyboards/polilla/rev1/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/handwired/dactyl_rah/.noci
+++ b/keyboards/polilla/rev1/.noci
diff --git a/keyboards/handwired/daishi/.noci b/keyboards/puck/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/handwired/daishi/.noci
+++ b/keyboards/puck/.noci
diff --git a/keyboards/handwired/datahand/.noci b/keyboards/qwertyydox/rev1/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/handwired/datahand/.noci
+++ b/keyboards/qwertyydox/rev1/.noci
diff --git a/keyboards/handwired/ddg_56/.noci b/keyboards/reviung33/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/handwired/ddg_56/.noci
+++ b/keyboards/reviung33/.noci
diff --git a/keyboards/handwired/eagleii/.noci b/keyboards/reviung61/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/handwired/eagleii/.noci
+++ b/keyboards/reviung61/.noci
diff --git a/keyboards/handwired/fc200rt_qmk/.noci b/keyboards/runner3680/3x6/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/handwired/fc200rt_qmk/.noci
+++ b/keyboards/runner3680/3x6/.noci
diff --git a/keyboards/handwired/fivethirteen/.noci b/keyboards/runner3680/3x7/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/handwired/fivethirteen/.noci
+++ b/keyboards/runner3680/3x7/.noci
diff --git a/keyboards/handwired/floorboard/.noci b/keyboards/runner3680/3x8/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/handwired/floorboard/.noci
+++ b/keyboards/runner3680/3x8/.noci
diff --git a/keyboards/handwired/frenchdev/.noci b/keyboards/runner3680/4x6/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/handwired/frenchdev/.noci
+++ b/keyboards/runner3680/4x6/.noci
diff --git a/keyboards/handwired/freoduo/.noci b/keyboards/runner3680/4x7/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/handwired/freoduo/.noci
+++ b/keyboards/runner3680/4x7/.noci
diff --git a/keyboards/handwired/fruity60/.noci b/keyboards/runner3680/4x8/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/handwired/fruity60/.noci
+++ b/keyboards/runner3680/4x8/.noci
diff --git a/keyboards/handwired/gamenum/.noci b/keyboards/runner3680/5x6/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/handwired/gamenum/.noci
+++ b/keyboards/runner3680/5x6/.noci
diff --git a/keyboards/handwired/hacked_motospeed/.noci b/keyboards/runner3680/5x7/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/handwired/hacked_motospeed/.noci
+++ b/keyboards/runner3680/5x7/.noci
diff --git a/keyboards/handwired/heisenberg/.noci b/keyboards/runner3680/5x8/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/handwired/heisenberg/.noci
+++ b/keyboards/runner3680/5x8/.noci
diff --git a/keyboards/handwired/hexon38/.noci b/keyboards/setta21/rev1/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/handwired/hexon38/.noci
+++ b/keyboards/setta21/rev1/.noci
diff --git a/keyboards/handwired/hnah108/.noci b/keyboards/sixkeyboard/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/handwired/hnah108/.noci
+++ b/keyboards/sixkeyboard/.noci
diff --git a/keyboards/handwired/hnah40/.noci b/keyboards/squiggle/rev1/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/handwired/hnah40/.noci
+++ b/keyboards/squiggle/rev1/.noci
diff --git a/keyboards/handwired/hnah40rgb/.noci b/keyboards/treadstone32/lite/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/handwired/hnah40rgb/.noci
+++ b/keyboards/treadstone32/lite/.noci
diff --git a/keyboards/handwired/ibm122m/.noci b/keyboards/treadstone32/rev1/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/handwired/ibm122m/.noci
+++ b/keyboards/treadstone32/rev1/.noci
diff --git a/keyboards/handwired/jn68m/.noci b/keyboards/uzu42/rev1/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/handwired/jn68m/.noci
+++ b/keyboards/uzu42/rev1/.noci
diff --git a/keyboards/handwired/jopr/.noci b/keyboards/xd002/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/handwired/jopr/.noci
+++ b/keyboards/xd002/.noci
diff --git a/keyboards/handwired/jot50/.noci b/keyboards/xiaomi/mk02/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/handwired/jot50/.noci
+++ b/keyboards/xiaomi/mk02/.noci
diff --git a/keyboards/handwired/jotanck/.noci b/keyboards/yatara/drink_me/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/handwired/jotanck/.noci
+++ b/keyboards/yatara/drink_me/.noci
diff --git a/keyboards/handwired/jotpad16/.noci b/keyboards/yosino58/rev1/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/handwired/jotpad16/.noci
+++ b/keyboards/yosino58/rev1/.noci
diff --git a/keyboards/handwired/jtallbean/split_65/.noci b/keyboards/zinc/rev1/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/handwired/jtallbean/split_65/.noci
+++ b/keyboards/zinc/rev1/.noci
diff --git a/keyboards/handwired/juliet/.noci b/keyboards/zinc/reva/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/handwired/juliet/.noci
+++ b/keyboards/zinc/reva/.noci
diff --git a/util/list_keyboards.sh b/util/list_keyboards.sh
index 1c103e0f11..aa6ed1c6af 100755
--- a/util/list_keyboards.sh
+++ b/util/list_keyboards.sh
@@ -4,5 +4,15 @@
 # This allows us to exclude keyboards by including a .noci file.
 
 find -L keyboards -type f -name rules.mk | grep -v keymaps | sed 's!keyboards/\(.*\)/rules.mk!\1!' | while read keyboard; do
-	[ "$1" = "noci" -a -e "keyboards/${keyboard}/.noci" ] || echo "$keyboard"
+	if [ "$1" = "noci" ]; then
+		case "$keyboard" in
+			handwired/*)
+				;;
+			*)
+				test -e "keyboards/${keyboard}/.noci" || echo "$keyboard"
+				;;
+		esac
+	else
+		echo "$keyboard"
+	fi
 done