aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--keyboards/default.nix12
-rw-r--r--keyboards/f62/default.nix27
-rw-r--r--keyboards/f77/default.nix29
-rw-r--r--keyboards/nk65b/default.nix13
-rw-r--r--keyboards/nk87/default.nix26
-rw-r--r--keyboards/nk_classic_tkl/default.nix26
-rw-r--r--keyboards/nk_classic_tkl/keymap.c73
-rw-r--r--keyboards/steezy60/default.nix31
-rw-r--r--keyboards/xd84pro/default.nix28
-rw-r--r--modules/qmk.nix21
-rw-r--r--pkgs/qmk_firmware.nix10
11 files changed, 230 insertions, 66 deletions
diff --git a/keyboards/default.nix b/keyboards/default.nix
index d3f39a5..e7155bb 100644
--- a/keyboards/default.nix
+++ b/keyboards/default.nix
@@ -4,14 +4,14 @@ let
in {
perSystem = {...}: {
imports = [
- # ./f62
- # ./f77
+ ./f62
+ ./f77
./nk65b
- # ./nk87
- # ./nk_classic_tkl
- # ./steezy60
+ ./nk87
+ ./nk_classic_tkl
+ ./steezy60
# ./xd60
- # ./xd84pro
+ ./xd84pro
# ./xd87
];
};
diff --git a/keyboards/f62/default.nix b/keyboards/f62/default.nix
index c15b8eb..c23755c 100644
--- a/keyboards/f62/default.nix
+++ b/keyboards/f62/default.nix
@@ -1,10 +1,16 @@
-{ pkgs, ... }: let
+{ pkgs, lib, ... }: let
base = {
- firmware = {
- type = "qmk";
+ type = "qmk";
+ qmk = {
qmk_firmware = pkgs.qmk_firwmare-modelf;
+ keyboard = {
+ name = "model_f_labs/f62";
+ revision = "wcass";
+ };
+ build.flash = fw: ''
+ ${pkgs.dfu-util}/bin/dfu-util "${fw}.bin"
+ '';
};
- qmk.keyboard.name = "model_f_labs/f62";
};
in {
devices = {
@@ -13,9 +19,18 @@ in {
"f62:me" = base // {
qmk.keymap = rec {
name = "me";
- src = builtins.path {
+ src = pkgs.symlinkJoin {
inherit name;
- path = ./.;
+ path = [
+ (builtins.path {
+ inherit name;
+ path = ./.;
+ })
+ (builtins.path {
+ name = "shared";
+ path = ../shared;
+ })
+ ];
};
};
};
diff --git a/keyboards/f77/default.nix b/keyboards/f77/default.nix
index 4331637..4af837e 100644
--- a/keyboards/f77/default.nix
+++ b/keyboards/f77/default.nix
@@ -1,21 +1,36 @@
-{ pkgs, ... }: let
+{ pkgs, lib, ... }: let
base = {
- firmware = {
- type = "qmk";
+ type = "qmk";
+ qmk = {
qmk_firmware = pkgs.qmk_firmware-modelf;
+ keyboard = {
+ name = "model_f_labs/f77";
+ revision = "wcass";
+ };
+ build.flash = fw: ''
+ ${pkgs.dfu-util}/bin/dfu-util "${fw}.bin"
+ '';
};
- qmk.keyboard.name = "model_f_labs/f77";
};
in {
devices = {
"f77:default" = base;
- "f77:me" = base // {
+ "f77" = 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/nk65b/default.nix b/keyboards/nk65b/default.nix
index 5e629d4..1700a6f 100644
--- a/keyboards/nk65b/default.nix
+++ b/keyboards/nk65b/default.nix
@@ -14,9 +14,18 @@ in {
"nk65b" = lib.recursiveUpdate base {
qmk.keymap = rec {
name = "mwahaha";
- 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/nk87/default.nix b/keyboards/nk87/default.nix
index 9ad3ba0..8e8b239 100644
--- a/keyboards/nk87/default.nix
+++ b/keyboards/nk87/default.nix
@@ -1,17 +1,31 @@
-{ pkgs, ... }: let
+{ pkgs, lib, ... }: let
base = {
- firmware.type = "qmk";
- qmk.keyboard.name = "novelkeys/nk87";
+ 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" = base // {
+ "nk87: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/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
+ }
+}
diff --git a/keyboards/steezy60/default.nix b/keyboards/steezy60/default.nix
index b043a8a..28b6b7a 100644
--- a/keyboards/steezy60/default.nix
+++ b/keyboards/steezy60/default.nix
@@ -1,21 +1,36 @@
-{ pkgs, ... }: let
+{ pkgs, lib, ... }: let
base = {
- qmk.keyboard = {
- name = "4pplet/steezy60";
- revision = "rev_a";
+ type = "qmk";
+ qmk = {
+ keyboard = {
+ name = "4pplet/steezy60";
+ revision = "rev_a";
+ };
+ build.flash = fw: ''
+ ${pkgs.dfu-util}/bin/dfu-util "${fw}.bin"
+ '';
};
};
in {
devices = {
"steezy:default" = base;
- "steezy:me" = base // {
+ "steezy: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/xd84pro/default.nix b/keyboards/xd84pro/default.nix
index 54b62c2..d254e33 100644
--- a/keyboards/xd84pro/default.nix
+++ b/keyboards/xd84pro/default.nix
@@ -1,17 +1,31 @@
-{ pkgs, ... }: let
+{ pkgs, lib, ... }: let
base = {
- firmware.type = "qmk";
- qmk.keyboard.name = "xiudi/xd84pro";
+ type = "qmk";
+ qmk = {
+ keyboard.name = "xiudi/xd84pro";
+ build.flash = fw: ''
+ ${pkgs.dfu-util}/bin/dfu-util "${fw}.bin"
+ '';
+ };
};
in {
devices = {
- "xd87:default" = base;
- "xd87:me" = base // {
+ "xd84pro:default" = base;
+ "xd84pro" = 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/modules/qmk.nix b/modules/qmk.nix
index 6288d7e..c083b06 100644
--- a/modules/qmk.nix
+++ b/modules/qmk.nix
@@ -72,24 +72,16 @@ in {
in pkgs.stdenv.mkDerivation {
name = "qmk:${config.qmk.keyboard._path}:${config.qmk.keymap.name}";
src = config.qmk.qmk_firmware;
- # {
- # name = "qmk_firmware";
- # src = config.qmk.qmk_firmware;
- # }
- # ] ++ lib.optional (ksrc != null) {
- # name = "keymap";
- # src = ksrc;
- # };
- #
- # sourceRoot = "qmk_firmware";
+
+ # hardeningDisable = [ "pic" "pie" ];
nativeBuildInputs = [
pkgs.qmk
];
- dontFixup = true;
+ # dontFixup = true;
- preConfigure = lib.optionalString (ksrc != null) ''
+ preBuild = lib.optionalString (ksrc != null) ''
mkdir -pv "${config.qmk.keymap._path}"
cp -v "${ksrc}"/* "${config.qmk.keymap._path}"
'';
@@ -98,8 +90,11 @@ in {
# SKIP_GIT=true BUILD_DIR=build \
# make "${config.qmk.keyboard._path}:${config.qmk.keymap.name}"
qmk compile \
- --env SKIP_GIT=true \
+ --env SKIP_GIT=yes \
--env BUILD_DIR=build \
+ --env SKIP_VERSION=yes \
+ --env VERBOSE=true \
+ --env ALLOW_WARNINGS=yes \
--keyboard "${config.qmk.keyboard._path}" \
--keymap "${config.qmk.keymap.name}"
'';
diff --git a/pkgs/qmk_firmware.nix b/pkgs/qmk_firmware.nix
index 49b0de6..ef647c0 100644
--- a/pkgs/qmk_firmware.nix
+++ b/pkgs/qmk_firmware.nix
@@ -1,14 +1,14 @@
{ stdenvNoCC, fetchFromGitHub, unstableGitUpdater, lib }:
-stdenvNoCC.mkDerivation {
+stdenvNoCC.mkDerivation (finalAttrs: {
pname = "qmk_firmware";
- version = "unstable";
+ version = "0.30.5";
src = fetchFromGitHub {
owner = "qmk";
repo = "qmk_firmware";
fetchSubmodules = true;
- rev = "608bcf0";
- hash = "sha256-vYKrcaLIq194Q+OgcawwrwZonxySBAEQF4CTD7dYUtI=";
+ rev = finalAttrs.version;
+ hash = "sha256-TdStj8Hf5seH/5SMDqG7B3JLXHCvlL58AJlRqydaNJ0=";
};
phases = [ "installPhase" ];
@@ -23,4 +23,4 @@ stdenvNoCC.mkDerivation {
homepage = "https://github.com/qmk/qmk_firmware";
license = licenses.gpl2;
};
-}
+})
generated by cgit v1.2.3 (git 2.25.1) at 2026-07-09 17:41:26 +0000