More correct dfu-util flash script + rearranged personal devices

2 files changed, 84 insertions, 0 deletions

diff --git a/devices/qmk/nk87/default.nix b/devices/qmk/nk87/default.nix
new file mode 100644
index 0000000..361f05c
--- /dev/null
+++ b/devices/qmk/nk87/default.nix
@@ -0,0 +1,21 @@
+{ pkgs, lib, withShared, ... }: let
+  base = {
+    type = "qmk";
+    qmk = {
+      keyboard.name = "novelkeys/nk87";
+      # build.flash = fw: ''
+      #   ${pkgs.dfu-util}/bin/dfu-util "${fw}.bin";
+      # '';
+    };
+  };
+in {
+  devices = {
+    "nk87:default" = base;
+    "nk87:me" = lib.recursiveUpdate base {
+      qmk.keymap = {
+        name = "me";
+        src = withShared ./.;
+      };
+    };
+  };
+}
diff --git a/devices/qmk/nk87/keymap.c b/devices/qmk/nk87/keymap.c
new file mode 100644
index 0000000..72a7aea
--- /dev/null
+++ b/devices/qmk/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
+            ),
+};