Some keyboards will build, but a number are having issues with -fPIC and -fPIE...

2 files changed, 93 insertions, 6 deletions

diff --git a/keyboards/nk_classic_tkl/default.nix b/keyboards/nk_classic_tkl/default.nix
index ffb4bf7..b2554b8 100644
--- a/keyboards/nk_classic_tkl/default.nix
+++ b/keyboards/nk_classic_tkl/default.nix
@@ -1,17 +1,31 @@
-{ pkgs, ... }: let
+{ pkgs, lib, ... }: let
   base = {
-    firmware.type = "qmk";
-    qmk.keyboard.name = "novelkeys/nk_classic_tkl";
+    type = "qmk";
+    qmk = {
+      keyboard.name = "novelkeys/nk_classic_tkl";
+      build.flash = fw: ''
+        ${pkgs.dfu-util}/bin/dfu-util "${fw}.bin"
+      '';
+    };
   };
 in {
   devices = {
     "nk_classic:default" = base;
-    "nk_classic:me" = base // {
+    "nk_classic:me" = lib.recursiveUpdate base {
       qmk.keymap = rec {
         name = "me";
-        src = builtins.path {
+        src = pkgs.symlinkJoin {
           inherit name;
-          path = ./.;
+          paths = [
+            (builtins.path {
+              inherit name;
+              path = ./.;
+            })
+            (builtins.path {
+              name = "shared";
+              path = ../shared;
+            })
+          ];
         };
       };
     };
diff --git a/keyboards/nk_classic_tkl/keymap.c b/keyboards/nk_classic_tkl/keymap.c
new file mode 100644
index 0000000..6f647f5
--- /dev/null
+++ b/keyboards/nk_classic_tkl/keymap.c
@@ -0,0 +1,73 @@
+/* Copyright 2024 Yiancar-Designs
+ *
+ * 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 my_keycodes {
+  RETRO_RGB = QK_USER_0
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[0] = LAYOUT_tkl_ansi_tsangan( /* Base */
+    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_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,
+    KC_TAB,  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,
+    KC_CAPS, 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_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+[1] = LAYOUT_tkl_ansi_tsangan( /* FN */
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_VOLU, KC_VOLD, KC_MUTE,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+    _______, RM_TOGG, RM_NEXT, RM_HUED, RM_HUEU, RM_SATD, RM_SATU, RM_VALD, RM_VALU, RM_SPDD, RM_SPDU,          _______,                   _______,
+    _______, _______, _______,                   RETRO_RGB,                                            _______, _______, _______, _______, _______, _______),
+
+};
+
+bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
+    if (host_keyboard_led_state().caps_lock) {
+        for (uint8_t i = 50; i <= 55; i++) {
+            rgb_matrix_set_color(i, 255, 86, 0);
+        }
+    } else if ((rgb_matrix_get_mode() == RGB_MATRIX_TYPING_HEATMAP) || (rgb_matrix_get_mode() == RGB_MATRIX_DIGITAL_RAIN)) {
+        for (uint8_t i = 50; i <= 55; i++) {
+            rgb_matrix_set_color(i, 0, 0, 0);
+        }
+    }
+    return false;
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+    case RETRO_RGB:
+        if (record->event.pressed) {
+            switch (rgb_matrix_get_flags()) {
+                case LED_FLAG_ALL: {
+                    rgb_matrix_set_flags(LED_FLAG_INDICATOR);
+                }
+                break;
+                default: {
+                    rgb_matrix_set_flags(LED_FLAG_ALL);
+                }
+                break;
+            }
+        }
+        return false; // Skip all further processing of this key
+    default:
+        return true; // Process all other keycodes normally
+    }
+}