6 files changed, 13 insertions, 67 deletions
diff --git a/keyboards/ibnuda/squiggle/rev1/config.h b/keyboards/ibnuda/squiggle/rev1/config.h
index f943c2c053..10887bdf18 100644
--- a/keyboards/ibnuda/squiggle/rev1/config.h
+++ b/keyboards/ibnuda/squiggle/rev1/config.h
@@ -1,19 +1,3 @@
 #pragma once
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B1, B3, B2, B6 }
-#define MATRIX_COL_PINS { C6, D7, E6, B4, B5 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 #define MASTER_LEFT
diff --git a/keyboards/ibnuda/squiggle/rev1/info.json b/keyboards/ibnuda/squiggle/rev1/info.json
index 7f48b11c76..e2e2b4a3f7 100644
--- a/keyboards/ibnuda/squiggle/rev1/info.json
+++ b/keyboards/ibnuda/squiggle/rev1/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6969",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C6", "D7", "E6", "B4", "B5"],
+        "rows": ["B1", "B3", "B2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D0"
     },
@@ -145,15 +150,15 @@
                 {"label":".", "x":8, "y":2.2},
                 {"label":"/", "x":9, "y":2.9},
 
-                {"label":"bspc", "x":3, "y":3.6, "h":1},
-                {"label":"esc/sft", "x":4, "y":3.65, "h":1},
-                {"label":"ent/alt", "x":5, "y":3.65, "h":1},
-                {"label":"spc", "x":6, "y":3.6, "h":1},
+                {"label":"bspc", "x":3, "y":3.6},
+                {"label":"esc/sft", "x":4, "y":3.65},
+                {"label":"ent/alt", "x":5, "y":3.65},
+                {"label":"spc", "x":6, "y":3.6},
 
-                {"label":"lower", "x":3, "y":4.6, "h":1},
-                {"label":"gui", "x":4, "y":4.65, "h":1},
-                {"label":"tab", "x":5, "y":4.65, "h":1},
-                {"label":"raise", "x":6, "y":4.6, "h":1}
+                {"label":"lower", "x":3, "y":4.6},
+                {"label":"gui", "x":4, "y":4.65},
+                {"label":"tab", "x":5, "y":4.65},
+                {"label":"raise", "x":6, "y":4.6}
             ]
         }
     }
diff --git a/keyboards/ibnuda/squiggle/rev1/rev1.c b/keyboards/ibnuda/squiggle/rev1/rev1.c
deleted file mode 100644
index 520a869e57..0000000000
--- a/keyboards/ibnuda/squiggle/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "rev1.h"
diff --git a/keyboards/ibnuda/squiggle/rev1/rev1.h b/keyboards/ibnuda/squiggle/rev1/rev1.h
index 73cb7abd2f..7d2ce91cdd 100644
--- a/keyboards/ibnuda/squiggle/rev1/rev1.h
+++ b/keyboards/ibnuda/squiggle/rev1/rev1.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "squiggle.h"
-
 #include "quantum.h"
 
 #define ___ KC_NO
diff --git a/keyboards/ibnuda/squiggle/squiggle.c b/keyboards/ibnuda/squiggle/squiggle.c
deleted file mode 100644
index 7c73aabf51..0000000000
--- a/keyboards/ibnuda/squiggle/squiggle.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Ibnu D. Aji
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "squiggle.h"
diff --git a/keyboards/ibnuda/squiggle/squiggle.h b/keyboards/ibnuda/squiggle/squiggle.h
deleted file mode 100644
index 4ed95e707c..0000000000
--- a/keyboards/ibnuda/squiggle/squiggle.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2020 Ibnu D. Aji
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#ifdef KEYBOARD_ibnuda_squiggle_rev1
-    #include "rev1.h"
-#endif
-
-#include "quantum.h"