More correct dfu-util flash script + rearranged personal devices

2 files changed, 64 insertions, 0 deletions

diff --git a/devices/qmk/xd60/default.nix b/devices/qmk/xd60/default.nix
new file mode 100644
index 0000000..12f946c
--- /dev/null
+++ b/devices/qmk/xd60/default.nix
@@ -0,0 +1,18 @@
+{ lib, withShared, ... }: let
+  base = {
+    type = "qmk";
+    qmk = {
+      keyboard.name = "kprepublic/xd60";
+    };
+  };
+in {
+  devices = {
+    "xd60:default" = base;
+    "xd60:me" = lib.recursiveUpdate base {
+      qmk.keymap = {
+        name = "me";
+        src = withShared ./.;
+      };
+    };
+  };
+}
diff --git a/devices/qmk/xd60/keymap.c b/devices/qmk/xd60/keymap.c
new file mode 100644
index 0000000..a211d1c
--- /dev/null
+++ b/devices/qmk/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, _______, _______, _______
+            ),
+
+};