24 files changed, 847 insertions, 132 deletions
diff --git a/flake.nix b/flake.nix
index a51f8f7..5d793c3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -13,8 +13,12 @@
 
     flake.overlays.default = import ./overlays;
 
+    # flake.flakeModules.default = ./modules;
+
     imports = [
       inputs.treefmt-nix.flakeModule
+      ./modules
+      # ./keyboards
     ];
 
     perSystem = { pkgs, config, system, ... }: {
diff --git a/keyboards/default.nix b/keyboards/default.nix
new file mode 100644
index 0000000..ea5ceec
--- /dev/null
+++ b/keyboards/default.nix
@@ -0,0 +1,18 @@
+{ lib, ... }:
+let 
+  inherit (lib) mkOption types;
+in {
+  perSystem.firmware = mkOption {
+    type = types.submodule [
+      # ./f62
+      # ./f77
+      ./nk65b
+      # ./nk87
+      # ./nk_classic_tkl
+      # ./steezy60
+      # ./xd60
+      # ./xd84pro
+      # ./xd87
+    ];
+  };
+}
diff --git a/keyboards/f62/default.nix b/keyboards/f62/default.nix
index b3586ea..c15b8eb 100644
--- a/keyboards/f62/default.nix
+++ b/keyboards/f62/default.nix
@@ -7,7 +7,7 @@
     qmk.keyboard.name = "model_f_labs/f62";
   };
 in {
-  kbs = {
+  devices = {
     "f62:default" = base;
 
     "f62:me" = base // {
diff --git a/keyboards/f62/keymap.c b/keyboards/f62/keymap.c
new file mode 100644
index 0000000..971b66a
--- /dev/null
+++ b/keyboards/f62/keymap.c
@@ -0,0 +1,45 @@
+#include QMK_KEYBOARD_H
+
+enum layers {
+    qty,
+    wrk,
+    fnc,
+    qmk
+};
+
+#define TAB_fn LT(fnc,KC_TAB)
+#define UPPER RSFT_T(KC_UP)
+#define DOWNER RALT_T(KC_DOWN)
+#define RIGHTER RCTL_T(KC_RGHT)
+#define LEFTER RGUI_T(KC_LEFT)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [qty] = LAYOUT_all(
+            KC_GRV,           KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
+            TAB_fn,           KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+            CTL_ESC,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  KC_ENT,
+            KC_LSFT, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, UPPER,   MO(fnc),
+            KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,           KC_SPC,                    LEFTER,  DOWNER,  RIGHTER
+            ),
+    [wrk] = LAYOUT_all(
+            KC_GRV,           KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
+            TAB_fn,           KC_Q,    KC_D,    KC_R,    KC_W,    KC_B,    KC_J,    KC_F,    KC_U,    KC_P,    KC_SCLN, KC_LBRC, KC_RBRC, KC_BSLS,
+            CTL_ESC,          KC_A,    KC_S,    KC_H,    KC_T,    KC_G,    KC_Y,    KC_N,    KC_E,    KC_O,    KC_I,    KC_QUOT, KC_ENT,  KC_ENT,
+            KC_LSFT, KC_LSFT, KC_Z,    KC_X,    KC_M,    KC_C,    KC_V,    KC_K,    KC_L,    KC_COMM, KC_DOT,  KC_SLSH, UPPER,   MO(fnc),
+            KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,           KC_SPC,                    LEFTER,  DOWNER,  RIGHTER
+            ),
+    [fnc] = LAYOUT_all(
+            KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_DEL,
+            _______,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_HOME, KC_COPY, KC_PGUP, XXXXXXX, XXXXXXX, KC_PSTE, KC_VOLD, KC_VOLU, MO(qmk),
+            KC_ESC,           XXXXXXX, KC_PSCR, KC_PGDN, XXXXXXX, KC_END,  KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, XXXXXXX, XXXXXXX, _______, _______,
+            KC_CAPS, KC_CAPS, XXXXXXX, XXXXXXX, KC_MSEL, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE, KC_MPRV, KC_MNXT, KC_FIND, KC_UP,   _______,
+            _______, _______, _______,                   KC_MPLY,          KC_MPLY,                   KC_LEFT, KC_DOWN, KC_RGHT
+            ),
+    [qmk] = LAYOUT_all(
+            XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+            _______,          TO(qty), TO(wrk), XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
+            XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
+            XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX,          XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX
+            )
+};
diff --git a/keyboards/f77/default.nix b/keyboards/f77/default.nix
index 33f8a07..4331637 100644
--- a/keyboards/f77/default.nix
+++ b/keyboards/f77/default.nix
@@ -7,7 +7,7 @@
     qmk.keyboard.name = "model_f_labs/f77";
   };
 in {
-  kbds = {
+  devices = {
     "f77:default" = base;
 
     "f77:me" = base // {
diff --git a/keyboards/f77/keymap.c b/keyboards/f77/keymap.c
new file mode 100644
index 0000000..ace1f5e
--- /dev/null
+++ b/keyboards/f77/keymap.c
@@ -0,0 +1,50 @@
+#include QMK_KEYBOARD_H
+
+enum layers {
+    qty,
+    wrk,
+    sym,
+    fnc,
+    qmk
+};
+
+#define TAB_fn LT(fnc,KC_TAB)
+#define GRV_fn LT(sym,KC_GRV)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [qty] = LAYOUT_all(
+            GRV_fn,           KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,      KC_INS,  KC_HOME, KC_PGUP,
+            TAB_fn,           KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,               KC_DEL,  KC_END,  KC_PGDN,
+            CTL_ESC,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  KC_ENT,                KC_VOLD, KC_MUTE, KC_VOLU,
+            KC_LSFT, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, TT(fnc),                        KC_MPRV, KC_UP,   KC_MNXT,
+            KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,           KC_SPC,                    KC_RGUI, KC_RALT, KC_RCTL,                                 KC_LEFT, KC_DOWN, KC_RGHT
+            ),
+    [wrk] = LAYOUT_all(
+            GRV_fn,           KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,      KC_INS,  KC_HOME, KC_PGUP,
+            TAB_fn,           KC_Q,    KC_D,    KC_R,    KC_W,    KC_B,    KC_J,    KC_F,    KC_U,    KC_P,    KC_SCLN, KC_LBRC, KC_RBRC, KC_BSLS,               KC_DEL,  KC_END,  KC_PGDN,
+            CTL_ESC,          KC_A,    KC_S,    KC_H,    KC_T,    KC_G,    KC_Y,    KC_N,    KC_E,    KC_O,    KC_I,    KC_QUOT, KC_ENT,  KC_ENT,                KC_VOLD, KC_MUTE, KC_VOLU,
+            KC_LSFT, KC_LSFT, KC_Z,    KC_X,    KC_M,    KC_C,    KC_V,    KC_K,    KC_L,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, TT(fnc),                        KC_MPRV, KC_UP,   KC_MNXT,
+            KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,           KC_SPC,                    KC_RGUI, KC_RALT, KC_RCTL,                                 KC_LEFT, KC_DOWN, KC_RGHT
+            ),
+    [sym] = LAYOUT_all(
+            _______,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_ASTR, XXXXXXX, KC_0,    KC_MINS, KC_PLUS, KC_BSPC, KC_BSPC,      KC_PAST, KC_PMNS, KC_PPLS,
+            KC_TAB,           XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_7,    KC_8,    KC_9,    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,               KC_P7,   KC_P8,   KC_P9,
+            XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_4,    KC_5,    KC_6,    XXXXXXX, XXXXXXX, _______, _______,               KC_P4,   KC_P5,   KC_P6,
+            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_1,    KC_2,    KC_3,    KC_SLSH, XXXXXXX, _______,                        KC_P1,   KC_P2,   KC_P3,
+            _______, _______, _______,                   KC_0,             KC_0,                      _______, _______, _______,                                 KC_P0,   KC_PDOT, KC_PENT
+            ),
+    [fnc] = LAYOUT_all(
+            KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_DEL,       KC_PAST, KC_PMNS, KC_PPLS,
+            _______,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_HOME, KC_COPY, KC_PGUP, XXXXXXX, XXXXXXX, KC_PSTE, KC_VOLD, KC_VOLU, MO(qmk),               KC_P7,   KC_P8,   KC_P9,
+            KC_ESC,           XXXXXXX, KC_PSCR, KC_PGDN, XXXXXXX, KC_END,  KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, XXXXXXX, XXXXXXX, _______, _______,               KC_P4,   KC_P5,   KC_P6,
+            KC_CAPS, KC_CAPS, XXXXXXX, XXXXXXX, KC_MSEL, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE, KC_MPRV, KC_MNXT, KC_FIND, KC_CAPS, _______,                        KC_P1,   KC_P2,   KC_P3,
+            _______, _______, _______,                   KC_MPLY,          KC_MPLY,                   _______, _______, _______,                                 KC_P0,   KC_PDOT, KC_PENT
+            ),
+    [qmk] = LAYOUT_all(
+            XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,      XXXXXXX, XXXXXXX, XXXXXXX,
+            _______,          TO(qty), TO(wrk), XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,               XXXXXXX, XXXXXXX, XXXXXXX,
+            XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,               XXXXXXX, XXXXXXX, XXXXXXX,
+            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,                        XXXXXXX, XXXXXXX, XXXXXXX,
+            XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX,          XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX,                                 XXXXXXX, XXXXXXX, XXXXXXX
+            )
+};
diff --git a/keyboards/nk65b/default.nix b/keyboards/nk65b/default.nix
new file mode 100644
index 0000000..7176ebf
--- /dev/null
+++ b/keyboards/nk65b/default.nix
@@ -0,0 +1,28 @@
+{ pkgs, ... }: let
+  base = {
+    firmware.type = "qmk";
+    qmk = {
+      keyboard.name = "novelkeys/nk65b";
+      flash = pkgs.writeShellApplication {
+        name = "flash";
+        runtimeDependencies = with pkgs; [ dfu-util ];
+        text = ''
+          dfu-util "''${1:-}"
+        '';
+      };
+    };
+  };
+in {
+  devices = {
+    "nk65b:default" = base;
+    "nk65b:me" = base // {
+      qmk.keymap = rec {
+        name = "me";
+        src = builtins.path {
+          inherit name;
+          path = ./.;
+        };
+      };
+    };
+  };
+}
diff --git a/keyboards/nk65b/keymap.c b/keyboards/nk65b/keymap.c
new file mode 100644
index 0000000..993493b
--- /dev/null
+++ b/keyboards/nk65b/keymap.c
@@ -0,0 +1,59 @@
+/* Copyright 2019 Yiancar
+ *
+ * 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 QMK_KEYBOARD_H
+
+enum layers {
+    qty,
+    wrk,
+    fnc,
+    qmk
+};
+
+#define TAB_fn LT(fnc, KC_TAB)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [qty] = LAYOUT_65_ansi(
+            KC_GRV,  KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,
+            TAB_fn,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
+            CTL_ESC, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGUP,
+            KC_LSFT, KC_Z,    KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_PGDN,
+            KC_LCTL, KC_LGUI, KC_LALT,                KC_SPC,                          KC_RGUI, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+            ),
+
+    [wrk] = LAYOUT_65_ansi(
+            KC_GRV,  KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,
+            TAB_fn,  KC_Q,    KC_D,   KC_R,   KC_W,   KC_B,   KC_J,   KC_F,   KC_U,    KC_P,    KC_SCLN, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
+            CTL_ESC, KC_A,    KC_S,   KC_H,   KC_T,   KC_G,   KC_Y,   KC_N,   KC_E,    KC_O,    KC_I,    KC_QUOT,          KC_ENT,  KC_PGUP,
+            KC_LSFT, KC_Z,    KC_X,   KC_M,   KC_C,   KC_V,   KC_K,   KC_L,   KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_PGDN,
+            KC_LCTL, KC_LGUI, KC_LALT,                KC_SPC,                          KC_RGUI, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+            ),
+
+    [fnc] = LAYOUT_65_ansi(
+            KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  _______,
+            _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_HOME, KC_COPY, KC_PGUP, XXXXXXX, XXXXXXX, KC_PSTE, XXXXXXX, XXXXXXX, MO(qmk), KC_MUTE,
+            KC_ESC,  XXXXXXX, KC_PSCR, KC_PGDN, XXXXXXX, KC_END,  KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, XXXXXXX, XXXXXXX,          XXXXXXX, KC_VOLU,
+            KC_CAPS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE, KC_MPRV, KC_MNXT, KC_FIND, KC_CAPS,          _______, KC_VOLD,
+            _______, _______, _______,                   KC_MPLY,                            XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______
+            ),
+
+    [qmk] = LAYOUT_65_ansi(
+            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+            _______, TO(qty), TO(wrk), XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX,
+            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX,
+            XXXXXXX, XXXXXXX, RGB_TOG, XXXXXXX, XXXXXXX, QK_BOOT, RGB_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          RGB_VAI, XXXXXXX,
+            _______, _______, _______,                   XXXXXXX,                            _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI
+            ),
+};
diff --git a/keyboards/nk87/default.nix b/keyboards/nk87/default.nix
index 82e163d..9ad3ba0 100644
--- a/keyboards/nk87/default.nix
+++ b/keyboards/nk87/default.nix
@@ -4,7 +4,7 @@
     qmk.keyboard.name = "novelkeys/nk87";
   };
 in {
-  kbds = {
+  devices = {
     "nk87:default" = base;
     "nk87:me" = base // {
       qmk.keymap = rec {
diff --git a/keyboards/nk87/keymap.c b/keyboards/nk87/keymap.c
new file mode 100644
index 0000000..72a7aea
--- /dev/null
+++ b/keyboards/nk87/keymap.c
@@ -0,0 +1,63 @@
+/* Copyright 2022 Yiancar
+ *
+ * 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 QMK_KEYBOARD_H
+
+enum layers {
+    qty,
+    wrk,
+    fnc,
+    qmk
+};
+
+#define TAB_fn LT(fnc, KC_TAB)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [qty] = LAYOUT_tkl_f13_ansi_tsangan(
+            KC_ESC,  KC_F1,   KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SCRL, KC_PAUS,
+            KC_GRV,  KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
+            TAB_fn,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
+            CTL_ESC, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+            KC_LSFT, KC_Z,    KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,                   KC_UP,
+            KC_LCTL, KC_LGUI, KC_LALT,                KC_SPC,                                            KC_RGUI, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+            ),
+
+    [wrk] = LAYOUT_tkl_f13_ansi_tsangan(
+            KC_ESC,  KC_F1,   KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SCRL, KC_PAUS,
+            KC_GRV,  KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
+            TAB_fn,  KC_Q,    KC_D,   KC_R,   KC_W,   KC_B,   KC_J,   KC_F,   KC_U,    KC_P,    KC_SCLN, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
+            CTL_ESC, KC_A,    KC_S,   KC_H,   KC_T,   KC_G,   KC_Y,   KC_N,   KC_E,    KC_O,    KC_I,    KC_QUOT,          KC_ENT,
+            KC_LSFT, KC_Z,    KC_X,   KC_M,   KC_C,   KC_V,   KC_K,   KC_L,   KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,                   KC_UP,
+            KC_LCTL, KC_LGUI, KC_LALT,                KC_SPC,                                            KC_RGUI, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+            ),
+
+    [fnc] = LAYOUT_tkl_f13_ansi_tsangan(
+            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, KC_MUTE, KC_VOLU,
+            KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  XXXXXXX, XXXXXXX, KC_VOLU,
+            _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_HOME, KC_COPY, KC_PGUP, XXXXXXX, XXXXXXX, KC_PSTE, XXXXXXX, XXXXXXX, MO(qmk), XXXXXXX, XXXXXXX, KC_VOLD,
+            KC_ESC,  XXXXXXX, KC_PSCR, KC_PGDN, XXXXXXX, KC_END,  KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, XXXXXXX, XXXXXXX,          XXXXXXX,
+            KC_CAPS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, KC_MUTE, KC_MPRV, KC_MNXT, KC_FIND,          KC_CAPS,                   _______,
+            _______, _______, _______,                   KC_MPLY,                                              KC_TRNS, KC_TRNS, KC_TRNS, _______, _______, _______
+            ),
+
+    [qmk] = LAYOUT_tkl_f13_ansi_tsangan(
+            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, RGB_SAI,
+            _______, TO(qty), TO(wrk), XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, RGB_HUD, RGB_SAD,
+            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,
+            XXXXXXX, XXXXXXX, RGB_TOG, XXXXXXX, XXXXXXX, QK_BOOT, RGB_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,                   RGB_VAI,
+            _______, _______, _______,                   XXXXXXX,                                              _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI
+            ),
+};
diff --git a/keyboards/nk_classic_tkl/default.nix b/keyboards/nk_classic_tkl/default.nix
index 5da4e9b..ffb4bf7 100644
--- a/keyboards/nk_classic_tkl/default.nix
+++ b/keyboards/nk_classic_tkl/default.nix
@@ -4,7 +4,7 @@
     qmk.keyboard.name = "novelkeys/nk_classic_tkl";
   };
 in {
-  kbds = {
+  devices = {
     "nk_classic:default" = base;
     "nk_classic:me" = base // {
       qmk.keymap = rec {
diff --git a/keyboards/shared/config.h b/keyboards/shared/config.h
new file mode 100644
index 0000000..140922d
--- /dev/null
+++ b/keyboards/shared/config.h
@@ -0,0 +1,6 @@
+#define CTL_ESC LCTL_T(KC_ESC)
+#define TAPPING_TOGGLE 2
+
+#define LEADER_NO_TIMEOUT
+#define LEADER_TIMEOUT 250
+#define LEADER_PER_KEY_TIMING
diff --git a/keyboards/shared/leader.c b/keyboards/shared/leader.c
new file mode 100644
index 0000000..fd8ae82
--- /dev/null
+++ b/keyboards/shared/leader.c
@@ -0,0 +1,38 @@
+LEADER_EXTERNS();
+
+void matrix_scan_user(void) {
+    LEADER_DICTIONARY() {
+        leading = false;
+        leader_end();
+
+        // G
+        SEQ_ONE_KEY(LSFT(KC_G)) {
+            tap_code(KC_END);
+        }
+
+        // G
+        SEQ_ONE_KEY(RSFT(KC_G)) {
+            tap_code(KC_END);
+        }
+
+        // gg
+        SEQ_TWO_KEYS(KC_G, KC_G) {
+            tap_code(KC_HOME);
+        }
+
+        // d
+        SEQ_ONE_KEY(KC_D) {
+            tap_code(KC_PGDN);
+        }
+
+        // u
+        SEQ_ONE_KEY(KC_U) {
+            tap_code(KC_PGUP);
+        }
+
+        // reset
+        SEQ_FIVE_KEYS(KC_R, KC_E, KC_S, KC_E, KC_T) {
+            reset_keyboard();
+        }
+    }
+}
diff --git a/keyboards/shared/rules.mk b/keyboards/shared/rules.mk
new file mode 100644
index 0000000..1636b99
--- /dev/null
+++ b/keyboards/shared/rules.mk
@@ -0,0 +1,12 @@
+# SRC += leader.c
+
+CONSOLE_ENABLE = no
+COMMAND_ENABLE = yes
+EXTRAKEY_ENABLE = yes
+BACKLIGHT_ENABLE = no
+RGBLIGHT_ENABLE = no
+SLEEP_LED_ENABLE = no
+NKRO_ENABLE = no
+BLUETOOTH_ENABLE = no
+AUDIO_ENABLE = no
+LEADER_ENABLE = yes
diff --git a/keyboards/steezy60/default.nix b/keyboards/steezy60/default.nix
index 7226430..b043a8a 100644
--- a/keyboards/steezy60/default.nix
+++ b/keyboards/steezy60/default.nix
@@ -6,7 +6,7 @@
     };
   };
 in {
-  kbds = {
+  devices = {
     "steezy:default" = base;
     "steezy:me" = base // {
       qmk.keymap = rec {
diff --git a/keyboards/steezy60/keymap.c b/keyboards/steezy60/keymap.c
new file mode 100644
index 0000000..f5a6c81
--- /dev/null
+++ b/keyboards/steezy60/keymap.c
@@ -0,0 +1,54 @@
+#include QMK_KEYBOARD_H
+
+enum layers {
+    qty,
+    wrk,
+    sym,
+    fnc,
+    qmk,
+};
+
+#define TAB_fn LT(fnc,KC_TAB)
+#define GRV_fn LT(sym,KC_GRV)
+#define UPPER RSFT_T(KC_UP)
+#define DOWNER LT(fnc,KC_DOWN)
+#define LEFTER RGUI_T(KC_LEFT)
+#define RIGHTER RCTL_T(KC_RGHT)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [qty] = LAYOUT_all(
+            GRV_fn,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
+            TAB_fn,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+            CTL_ESC, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  KC_ENT,
+            KC_LSFT, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, UPPER,   UPPER,   UPPER,
+            KC_LCTL, KC_LGUI, KC_LGUI, KC_LALT,          KC_SPC,  KC_SPC,  KC_SPC,           LEFTER,  LEFTER,  DOWNER,  DOWNER,  RIGHTER
+            ),
+    [wrk] = LAYOUT_all(
+            GRV_fn,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
+            TAB_fn,  KC_Q,    KC_D,    KC_R,    KC_W,    KC_B,    KC_J,    KC_F,    KC_U,    KC_P,    KC_SCLN, KC_LBRC, KC_RBRC, KC_BSLS,
+            CTL_ESC, KC_A,    KC_S,    KC_H,    KC_T,    KC_G,    KC_Y,    KC_N,    KC_E,    KC_O,    KC_I,    KC_QUOT, KC_ENT,  KC_ENT,
+            KC_LSFT, KC_LSFT, KC_Z,    KC_X,    KC_M,    KC_C,    KC_V,    KC_K,    KC_L,    KC_COMM, KC_DOT,  KC_SLSH, UPPER,   UPPER,   UPPER,
+            KC_LCTL, KC_LGUI, KC_LGUI, KC_LALT,          KC_SPC,  KC_SPC,  KC_SPC,           LEFTER,  LEFTER,  DOWNER,  DOWNER,  RIGHTER
+            ),
+    [sym] = LAYOUT_all(
+            _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_ASTR, XXXXXXX, KC_0,    KC_MINS, KC_PLUS, KC_BSPC, KC_BSPC,
+            KC_TAB,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_7,    KC_8,    KC_9,    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_4,    KC_5,    KC_6,    XXXXXXX, XXXXXXX, _______, _______,
+            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_1,    KC_2,    KC_3,    KC_SLSH, XXXXXXX, XXXXXXX, XXXXXXX,
+            _______, _______, _______, _______,          KC_0,    KC_0,    KC_0,             _______, _______, _______, _______, _______
+            ),
+    [fnc] = LAYOUT_all(
+            KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_DEL,
+            _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_HOME, KC_COPY, KC_PGUP, XXXXXXX, XXXXXXX, KC_PSTE, KC_VOLD, KC_VOLU, MO(qmk),
+            KC_ESC,  XXXXXXX, KC_PSCR, KC_PGDN, XXXXXXX, KC_END,  KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, XXXXXXX, XXXXXXX, _______, _______,
+            KC_CAPS, KC_CAPS, XXXXXXX, XXXXXXX, KC_MSEL, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE, KC_MPRV, KC_MNXT, KC_FIND, KC_CAPS, KC_CAPS, KC_CAPS,
+            _______, _______, _______, _______,          KC_MPLY, KC_MPLY, KC_MPLY,          _______, _______, _______, _______, _______
+            ),
+    [qmk] = LAYOUT_all(
+            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+            _______, TO(qty), TO(wrk), XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
+            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, _______, _______, _______, XXXXXXX
+            ),
+};
diff --git a/keyboards/xd60/default.nix b/keyboards/xd60/default.nix
index e8320ff..8cef0de 100644
--- a/keyboards/xd60/default.nix
+++ b/keyboards/xd60/default.nix
@@ -4,7 +4,7 @@
     qmk.keyboard.name = "kprepublic/xd60";
   };
 in {
-  kbds = {
+  devices = {
     "xd60:default" = base;
     "xd60:me" = base // {
       qmk.keymap = rec {
diff --git a/keyboards/xd60/keymap.c b/keyboards/xd60/keymap.c
new file mode 100644
index 0000000..a211d1c
--- /dev/null
+++ b/keyboards/xd60/keymap.c
@@ -0,0 +1,46 @@
+#include QMK_KEYBOARD_H
+
+enum layers {
+    qty,
+    wrk,
+    fnc,
+    qmk,
+};
+
+#define TAB_fn LT(fnc,KC_TAB)
+#define UPPER RSFT_T(KC_UP)
+#define DOWNER LT(fnc,KC_DOWN)
+#define LEFTER RALT_T(KC_LEFT)
+#define RIGHTER RCTL_T(KC_RGHT)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [qty] = LAYOUT_all(
+            KC_GRV,           KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
+            TAB_fn,           KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+            CTL_ESC,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  KC_ENT,
+            KC_LSFT, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, UPPER,   UPPER,   MO(fnc),
+            KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RGUI, LEFTER,  DOWNER,  DOWNER,  RIGHTER
+            ),
+    [wrk] = LAYOUT_all(
+            KC_GRV,           KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
+            TAB_fn,           KC_Q,    KC_D,    KC_R,    KC_W,    KC_B,    KC_J,    KC_F,    KC_U,    KC_P,    KC_SCLN, KC_LBRC, KC_RBRC, KC_BSLS,
+            CTL_ESC,          KC_A,    KC_S,    KC_H,    KC_T,    KC_G,    KC_Y,    KC_N,    KC_E,    KC_O,    KC_I,    KC_QUOT, KC_ENT,  KC_ENT,
+            KC_LSFT, KC_LSFT, KC_Z,    KC_X,    KC_M,    KC_C,    KC_V,    KC_K,    KC_L,    KC_COMM, KC_DOT,  KC_SLSH, UPPER,   UPPER,   MO(fnc),
+            KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RGUI, LEFTER,  DOWNER,  DOWNER,  RIGHTER
+            ),
+    [fnc] = LAYOUT_all(
+            KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_DEL,
+            _______,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_HOME, KC_COPY, KC_PGUP, XXXXXXX, XXXXXXX, KC_PSTE, KC_VOLD, KC_VOLU, MO(qmk),
+            KC_ESC,           XXXXXXX, KC_PSCR, KC_PGDN, XXXXXXX, KC_END,  KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, XXXXXXX, XXXXXXX, _______, _______,
+            KC_CAPS, KC_CAPS, XXXXXXX, XXXXXXX, KC_MSEL, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE, KC_MPRV, KC_MNXT, KC_FIND, KC_CAPS, KC_CAPS, _______,
+            _______, _______, _______,                            KC_MPLY,                            _______, _______, _______, _______, _______
+            ),
+    [qmk] = LAYOUT_all(
+            XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+            _______,          TO(qty), TO(wrk), XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
+            XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
+            XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX,                            XXXXXXX, XXXXXXX, _______, _______, _______
+            ),
+
+};
diff --git a/keyboards/xd84pro/default.nix b/keyboards/xd84pro/default.nix
index cfd4408..54b62c2 100644
--- a/keyboards/xd84pro/default.nix
+++ b/keyboards/xd84pro/default.nix
@@ -4,7 +4,7 @@
     qmk.keyboard.name = "xiudi/xd84pro";
   };
 in {
-  kbds = {
+  devices = {
     "xd87:default" = base;
     "xd87:me" = base // {
       qmk.keymap = rec {
diff --git a/keyboards/xd84pro/keymap.c b/keyboards/xd84pro/keymap.c
new file mode 100644
index 0000000..304eca1
--- /dev/null
+++ b/keyboards/xd84pro/keymap.c
@@ -0,0 +1,45 @@
+#include QMK_KEYBOARD_H
+
+enum layers {
+    qty,
+    wrk,
+    fnc,
+    qmk,
+}
+
+#define TAB_fn LT(fnc,KC_TAB)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [qty] = LAYOUT_all(
+            KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_VOLD, KC_MUTE, KC_VOLU,
+            KC_GRV,           KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_INS,
+            TAB_fn,           KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL,
+            CTL_ESC,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  KC_ENT,           KC_PGUP,
+            KC_LSFT, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,            KC_PGDN,
+            KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RGUI, MO(fnc), KC_RCTL,          KC_LEFT, KC_DOWN,          KC_RGHT
+            ),
+    [wrk] = LAYOUT_all(
+            KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_VOLD, KC_MUTE, KC_VOLU,
+            KC_GRV,           KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_INS,
+            TAB_fn,           KC_Q,    KC_D,    KC_R,    KC_W,    KC_B,    KC_J,    KC_F,    KC_U,    KC_P,    KC_SCLN, KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL,
+            CTL_ESC,          KC_A,    KC_S,    KC_H,    KC_T,    KC_G,    KC_Y,    KC_N,    KC_E,    KC_O,    KC_I,    KC_QUOT, KC_ENT,  KC_ENT,           KC_PGUP,
+            KC_LSFT, KC_LSFT, KC_Z,    KC_X,    KC_M,    KC_C,    KC_V,    KC_K,    KC_L,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,            KC_PGDN,
+            KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RGUI, MO(fnc), KC_RCTL,          KC_LEFT, KC_DOWN,          KC_RGHT
+            ),
+    [fnc] = LAYOUT_all(
+            _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+            _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,  KC_DEL,  _______,
+            _______,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_HOME, KC_COPY, KC_PGUP, XXXXXXX, XXXXXXX, KC_PSTE, KC_VOLD, KC_VOLU, MO(qmk),          _______,
+            KC_ESC,           XXXXXXX, KC_PSCR, KC_PGDN, XXXXXXX, KC_END,  KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, XXXXXXX, XXXXXXX, _______, _______,          KC_HOME,
+            KC_CAPS, KC_CAPS, XXXXXXX, XXXXXXX, KC_MSEL, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE, KC_MPRV, KC_MNXT, KC_FIND,          KC_CAPS, _______,          KC_END,
+            _______, _______, _______,                   KC_MPLY,                            _______, _______, _______,          _______, _______,          _______
+            ),
+    [qmk] = LAYOUT_all(
+            XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+            XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+            _______,          TO(qty), TO(wrk), XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,          XXXXXXX,
+            XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,
+            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX,          XXXXXXX,
+            XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,                            XXXXXXX, _______, XXXXXXX,                   XXXXXXX, XXXXXXX,          XXXXXXX
+            )
+};
diff --git a/keyboards/xd87/default.nix b/keyboards/xd87/default.nix
index cfd4408..54b62c2 100644
--- a/keyboards/xd87/default.nix
+++ b/keyboards/xd87/default.nix
@@ -4,7 +4,7 @@
     qmk.keyboard.name = "xiudi/xd84pro";
   };
 in {
-  kbds = {
+  devices = {
     "xd87:default" = base;
     "xd87:me" = base // {
       qmk.keymap = rec {
diff --git a/keyboards/xd87/keymap.c b/keyboards/xd87/keymap.c
new file mode 100644
index 0000000..c806df5
--- /dev/null
+++ b/keyboards/xd87/keymap.c
@@ -0,0 +1,56 @@
+#include QMK_KEYBOARD_H
+/* #include "leader.c" */
+
+enum layers {
+    qty,
+    wrk,
+    sym,
+    fnc,
+    qmk,
+};
+
+#define TAB_fn LT(fnc,KC_TAB)
+#define GRV_fn LT(sym,KC_GRV)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [qty] = LAYOUT_all(
+            KC_ESC,           XXXXXXX, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,               KC_VOLD, KC_MUTE, KC_VOLU,
+            GRV_fn,           KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,
+            TAB_fn,           KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,              KC_DEL,  KC_END,  KC_PGDN,
+            CTL_ESC,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  KC_ENT,
+            KC_LSFT, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, TT(fnc),              XXXXXXX, KC_UP,   XXXXXXX,
+            KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,           KC_SPC,                    KC_RGUI, KC_RALT, TT(fnc), KC_RCTL,                       KC_LEFT, KC_DOWN, KC_RGHT
+            ),
+    [wrk] = LAYOUT_all(
+            KC_ESC,           XXXXXXX, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,               KC_VOLD, KC_MUTE, KC_VOLU,
+            GRV_fn,           KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,
+            TAB_fn,           KC_Q,    KC_D,    KC_R,    KC_W,    KC_B,    KC_J,    KC_F,    KC_U,    KC_P,    KC_SCLN, KC_LBRC, KC_RBRC, KC_BSLS,              KC_DEL,  KC_END,  KC_PGDN,
+            CTL_ESC,          KC_A,    KC_S,    KC_H,    KC_T,    KC_G,    KC_Y,    KC_N,    KC_E,    KC_O,    KC_I,    KC_QUOT, KC_ENT,  KC_ENT,
+            KC_LSFT, KC_LSFT, KC_Z,    KC_X,    KC_M,    KC_C,    KC_V,    KC_K,    KC_L,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, TT(fnc),              XXXXXXX, KC_UP,   XXXXXXX,
+            KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,           KC_SPC,                    KC_RGUI, KC_RALT, TT(fnc), KC_RCTL,                       KC_LEFT, KC_DOWN, KC_RGHT
+            ),
+    [sym] = LAYOUT_all(
+            _______,          XXXXXXX, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,              _______, _______, _______,
+            _______,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_ASTR, XXXXXXX, KC_0,    KC_MINS, KC_PLUS, KC_BSPC, KC_BSPC,     XXXXXXX, XXXXXXX, XXXXXXX,
+            KC_TAB,           XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_7,    KC_8,    KC_9,    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,              XXXXXXX, XXXXXXX, XXXXXXX,
+            XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_4,    KC_5,    KC_6,    XXXXXXX, XXXXXXX, _______, _______,
+            _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_1,    KC_2,    KC_3,    KC_SLSH,          _______, _______,              XXXXXXX, _______, XXXXXXX,
+            _______, _______, _______,                   KC_0,             KC_0,                      _______, _______, _______, _______,                       _______, _______, _______
+            ),
+    [fnc] = LAYOUT_all(
+            _______,          XXXXXXX, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,              _______, _______, _______,
+            KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_DEL,      XXXXXXX, XXXXXXX, XXXXXXX,
+            _______,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_HOME, KC_COPY, KC_PGUP, XXXXXXX, XXXXXXX, KC_PSTE, KC_VOLD, KC_VOLU, MO(qmk),              XXXXXXX, XXXXXXX, XXXXXXX,
+            KC_ESC,           XXXXXXX, KC_PSCR, KC_PGDN, XXXXXXX, KC_END,  KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, XXXXXXX, XXXXXXX, _______, _______,
+            KC_CAPS, KC_CAPS, XXXXXXX, XXXXXXX, KC_MSEL, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE, KC_MPRV, KC_MNXT, KC_FIND,          KC_CAPS, _______,              XXXXXXX, KC_VOLU, XXXXXXX,
+            _______, _______, _______,                   KC_MPLY,          KC_MPLY,                   _______, _______, _______, _______,                       KC_MPRV, KC_VOLD, KC_MNXT
+            ),
+    [qmk] = LAYOUT_all(
+            XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,              XXXXXXX, XXXXXXX, XXXXXXX,
+            XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,     XXXXXXX, XXXXXXX, XXXXXXX,
+            _______,          TO(qty), TO(wrk), XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,              XXXXXXX, XXXXXXX, XXXXXXX,
+            XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, _______,              XXXXXXX, XXXXXXX, XXXXXXX,
+            XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX,          XXXXXXX,                   XXXXXXX, XXXXXXX, _______, XXXXXXX,                       XXXXXXX, XXXXXXX, XXXXXXX
+            ),
+};
diff --git a/modules/default.nix b/modules/default.nix
index b6ac53a..c1c2646 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -1,144 +1,65 @@
 {
-  lib,
-  flake-parts-lib,
+lib,
+flake-parts-lib,
+...
 }:
 let
-  inherit (lib) mkOption types;
-  inherit (flake-parts-lib) mkPerSystemModule;
+  inherit (lib) mkOption mkEnableOption types;
+  inherit (flake-parts-lib) mkPerSystemOption;
 in {
-  options.perSystem = mkPerSystemModule ({ pkgs, system, config', ... }: {
-
-    kbdConfigurations = {
-      firmware = {
-        qmk_firmware = mkOption {
-          type = types.path;
-          default = pkgs.qmk_firmware;
-          description = "Default qmk_firmware to use";
-        };
-      };
-
-      kbds = mkOption {
-        default = {};
-      type = types.attrsOf <| types.submodule (args: let
-        cfg = args.config;
-      in {
-          options = {
-            firmware = {
-              type = mkOption {
-                type = types.enum [ "qmk" ];
-                default = "qmk";
-                description = "Keyboard firmware type. Extensible for other firmwares";
-              };
-
-              qmk_firmware = mkOption {
-                type = types.path;
-                default = config'.kbdConfigurations.qmk_firmware;
-                description = "qmk_firmware to use";
-              };
+  # imports = [
+  #   ./qmk.nix
+  # ];
+
+  options.perSystem = mkPerSystemOption ({ pkgs, system, config, ... }: {
+    # options.firmware = mkOption {
+    #   default = {};
+    #   type = types.submodule {
+    #     options = {
+
+    options.devices = mkOption {
+      default = {};
+      type = types.lazyAttrsOf <| types.submoduleWith {
+        shorthandOnlyDefinesConfig = true;
+        modules = [
+          ({ name, ... }: {
+            _module.args = {
+              inherit pkgs lib flake-parts-lib;
             };
-
-            qmk = {
-              keyboard = {
-                name = mkOption {
-                  type = types.str;
-                  description = "path to keyboard";
-                  example = "4pplet/steezy60";
-                };
-
-                revision = mkOption {
-                  type = types.nullOr types.str;
-                  description = "keyboard revision";
-                  example = "rev_a"
-                };
-
-                _basePath = mkOption {
-                  type = types.str;
-                  internal = true;
-                  default = "keyboards/${cfg.qmk.keyboard.name}";
-                };
-
-                _path = mkOption {
-                  type = types.str;
-                  internal = true
-                  default = lib.concatStringsSep "/" ([cfg.qmk.keyboard.basePath] ++ optional (cfg.qmk.keyboard.revision != null) cfg.qmk.keyboard.revision);
-                };
-
-              };
-
-              keymap = {
-                name = mkOption {
-                  type = types.str;
-                  default = "default";
-                  example = "default";
-                };
-
-                _path = mkOption {
-                  type = types.str;
-                  default = "${cfg.qmk.keyboard._basePath}/keymaps/${cfg.qmk.keymap.name}";
-                  internal = true;
-                };
-
-                src = mkOption {
-                  type = types.nullOr types.path;
-                  default = null;
-                };
+            options = {
+              enable = mkEnableOption name // { default = true; };
+              firmware.type = mkOption {
+                type = types.enum [ ];
+                description = ''
+                Firmware type. Extensible for other firmwares.
+                '';
               };
 
               build = {
-                bin = mkOption {
-                  type = types.path;
-                  default = let
-                    ksrc = cfg.qmk.keymap.src;
-                  in pkgs.stdenv.mkDerivation {
-                      name = "qmk:${cfg.qmk.keyboard._path}:${cfg.qmk.keymap.name}";
-                      srcs = [
-                        {
-                          name = "qmk_firmware";
-                          src = cfg.qmk_firmware;
-                        }
-                      ] ++ lib.optional (ksrc != null) {
-                          name = "keymap";
-                          src = ksrc;
-                        };
-
-                      sourceRoot = "qmk_firmware";
-
-                      # nativeBuildImports = [
-                      #   pkgs.qmk
-                      # ];
-
-                      postUnpack = lib.optionalString (ksrc != null) ''
-                        mkdir -pv "${cfg.qmk.keymap._path}"
-                        cp -rv ../keymap/* "${cfg.qmk.keymap._path}"
-                      '';
-
-                      buildPhase = ''
-                        SKIP_GIT=yes SKIP_VERSION=yes \
-                          make "${cfg.qmk.keyboard._path}:${cfg.qmk.keymap.name}"
-                      '';
-
-                      installPhase = ''
-                        mkdir -p $out
-                        cp -v *.{bin,hex} $out/
-                      '';
-
-
-                    };
-                };
-
                 flash = mkOption {
                   type = types.package;
+                  description = ''
+                      Flash script
+                  '';
                 };
-              };
 
+              };
             };
+          })
 
-          };
-        });
+          ./qmk
+        ];
       };
 
+    };
 
+    # config._type = "submodule";
+    # };
+    #   };
+    # };
 
+    config = {
+      packages = config.devices |> lib.filterAttrs (_: v: v.enable) |> builtins.mapAttrs (_: v: v.build.flash);
     };
-  })
+  });
 }
diff --git a/modules/qmk.nix b/modules/qmk.nix
new file mode 100644
index 0000000..c892fc3
--- /dev/null
+++ b/modules/qmk.nix
@@ -0,0 +1,270 @@
+{
+lib,
+pkgs, ...
+}:
+let
+  inherit (lib) mkOption types;
+  inherit (flake-parts-lib) mkPerSystemOption;
+in {
+  options = {
+    firmware = {
+      type = mkOption {
+        type = types.enum [ "qmk" ];
+      };
+
+      qmk_firmware = mkOption {
+        type = types.path;
+        default = pkgs.qmk_firmware;
+        description = ''
+          qmk firmware path
+        '';
+      };
+
+      qmk = {
+        keyboard = {
+          name = mkOption {
+            type = types.str;
+            description = "keyboard path";
+            example = "4pplet/steezy60";
+          };
+
+          revision = mkOption {
+            type = types.nullOr types.str;
+            default = null;
+            description = "keyboard revision";
+            example = "rev_a";
+          };
+        };
+
+        keymap = {
+          name = mkOption {
+            type = types.str;
+            default = "default";
+            description = "keymap name";
+          };
+
+          src = mkOption {
+            type = types.nullOr types.str;
+            default = null;
+            description = "qmk keymap files";
+          };
+        };
+
+        build = {
+          bin = mkOption {
+            type = type.path;
+            internal = true;
+            readOnly = true;
+            default = let
+              ksrc = config.firmware.qmk_firmware;
+            in pkgs.stdenv.mkDerivation {
+                name = "qmk:${config.qmk.keyboard._path}:${config.qmk.keymap.name}";
+                srcs = [
+                  {
+                    name = "qmk_firmware";
+                    src = config.qmk_firmware;
+                  }
+                ] ++ lib.optional (ksrc != null) {
+                    name = "keymap";
+                    src = ksrc;
+                  };
+
+                sourceRoot = "qmk_firmware";
+
+                nativeBuildImports = [
+                  pkgs.qmk
+                ];
+
+                dontFixup = true;
+
+                postUnpack = lib.optionalString (ksrc != null) ''
+                  mkdir -pv "${config.qmk.keymap._path}"
+                  cp -rv $keymap/* "${config.qmk.keymap._path}"
+                '';
+
+                buildPhase = ''
+                  qmk compile \
+                    --env SKIP_GIT=true \
+                    --env BUILD_DIR=build \
+                    --env TARGET=fw \
+                    --keyboard ${config.qmk.keyboard._path} \
+                    --keymap ${config.qmk.keymap.name}
+                '';
+
+                installPhase = ''
+                  mkdir -p $out
+                  cp -v build/*.{bin,hex,elf,dfu,uf2,eep} $out/
+                '';
+
+
+              };
+            flash = mkOption {
+              type = types.either types.package types.str;
+            };
+
+          };
+        };
+      };
+    };
+  };
+
+  config = {
+    build.flash = pkgs.symlinkJoin {
+      name = "flash";
+      nativeBuildInputs = [ pkgs.wrapProgram ];
+      paths = if builtins.isPackage config.qmk.build.flash
+        then [ config.qmk.build.flash ] 
+        else [(pkgs.writeShellApplication {
+          name = "flash";
+          text = config.qmk.build.flash
+        })];
+      postBuild = ''
+        wrapProgram $out/bin/flash --set-arg "''${config.qmk.build.bin}"
+      '';
+    };
+  };
+}
+#   options.perSystem = mkPerSystemOption ({ pkgs, system, config', ... }: {
+#     options.firmware = mkOption {
+#       type = (f: types.submoduleWith { shorthandOnlyDefinesConfig = true; modules = [ f ]; }) {
+#         options = {
+#           qmk_firmware = mkOption {
+#             type = types.path;
+#             default = pkgs.qmk_firmware;
+#             description = "Default qmk_firmware to use";
+#           };
+#
+#           devices = mkOption {
+#             type = types.attrsOf <| types.submodule ({ config, ... }: {
+#               options = {
+#                 firmware = {
+#                   type = mkOption {
+#                     type = types.enum [ "qmk" ];
+#                   };
+#
+#                   qmk_firmware = mkOption {
+#                     type = types.path;
+#                     default = config'.kbdConfigurations.qmk_firmware;
+#                     description = "qmk_firmware to use";
+#                   };
+#                 };
+#
+#                 qmk = {
+#                   keyboard = {
+#                     name = mkOption {
+#                       type = types.str;
+#                       description = "path to keyboard";
+#                       example = "4pplet/steezy60";
+#                     };
+#
+#                     revision = mkOption {
+#                       type = types.nullOr types.str;
+#                       description = "keyboard revision";
+#                       example = "rev_a";
+#                     };
+#
+#                     _basePath = mkOption {
+#                       type = types.str;
+#                       internal = true;
+#                       default = config.qmk.keyboard.name;
+#                     };
+#
+#                     _path = mkOption {
+#                       type = types.str;
+#                       internal = true;
+#                       default = lib.concatStringsSep "/" ([config.qmk.keyboard.basePath] ++ lib.optional (config.qmk.keyboard.revision != null) config.qmk.keyboard.revision);
+#                     };
+#
+#                   };
+#
+#                   keymap = {
+#                     name = mkOption {
+#                       type = types.str;
+#                       default = "default";
+#                       example = "default";
+#                     };
+#
+#                     _path = mkOption {
+#                       type = types.str;
+#                       default = "${config.qmk.keyboard._basePath}/keymaps/${config.qmk.keymap.name}";
+#                       internal = true;
+#                     };
+#
+#                     src = mkOption {
+#                       type = types.nullOr types.path;
+#                       default = null;
+#                     };
+#                   };
+#
+#                   build = {
+#                     bin = mkOption {
+#                       type = types.path;
+#                       default = let
+#                         ksrc = config.qmk.keymap.src;
+#                       in pkgs.stdenv.mkDerivation {
+#                           name = "qmk:${config.qmk.keyboard._path}:${config.qmk.keymap.name}";
+#                           srcs = [
+#                             {
+#                               name = "qmk_firmware";
+#                               src = config.qmk_firmware;
+#                             }
+#                           ] ++ lib.optional (ksrc != null) {
+#                               name = "keymap";
+#                               src = ksrc;
+#                             };
+#
+#                           sourceRoot = "qmk_firmware";
+#
+#                           nativeBuildImports = [
+#                             pkgs.qmk
+#                           ];
+#
+#                           dontFixup = true;
+#
+#                           postUnpack = lib.optionalString (ksrc != null) ''
+#                         mkdir -pv "${config.qmk.keymap._path}"
+#                         cp -rv $keymap/* "${config.qmk.keymap._path}"
+#                           '';
+#
+#                           buildPhase = ''
+#                         qmk compile \
+#                         --env SKIP_GIT=true \
+#                         --env BUILD_DIR=build \
+#                         --env TARGET=fw \
+#                         --keyboard ${config.qmk.keyboard._path} \
+#                           --keymap ${config.qmk.keymap.name}
+#                           '';
+#
+#                           installPhase = ''
+#                         mkdir -p $out
+#                         cp -v build/*.{bin,hex,elf,dfu,uf2,eep} $out/
+#                         '';
+#
+#
+#                         };
+#                     };
+#
+#                     flash = mkOption {
+#                       type = types.package;
+#                     };
+#                   };
+#
+#                 };
+#
+#               };
+#
+#               config = {
+#                 build.flash = pkgs.writeShellApplication {
+#                   name = "flash";
+#                   text = ''
+#                 exec "''${lib.getExe config.qmk.build.flash}" "${config.qmk.build.bin}"
+#                 '';
+#                 };
+#               };
+#             });
+#           };
+#         };
+#       };
+#     };
+#   });
+# }