diff options
44 files changed, 452 insertions, 455 deletions
diff --git a/devices/default.nix b/devices/default.nix new file mode 100644 index 0000000..046191b --- /dev/null +++ b/devices/default.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ./pinecil + ./qmk + ]; +} diff --git a/devices/pinecil/default.nix b/devices/pinecil/default.nix new file mode 100644 index 0000000..7f5d13d --- /dev/null +++ b/devices/pinecil/default.nix @@ -0,0 +1,5 @@ +{ + perSystem = {...}: { + imports = [ ./pinecil.nix ]; + }; +} diff --git a/devices/pinecil/pinecil.nix b/devices/pinecil/pinecil.nix new file mode 100644 index 0000000..48468c7 --- /dev/null +++ b/devices/pinecil/pinecil.nix @@ -0,0 +1,10 @@ +{ + devices = { + pinecil = { + type = "pinecil"; + pinecil = { + version = "v2"; + }; + }; + }; +} diff --git a/devices/qmk/default.nix b/devices/qmk/default.nix new file mode 100644 index 0000000..64b92cd --- /dev/null +++ b/devices/qmk/default.nix @@ -0,0 +1,32 @@ +{ lib, ... }: +let + inherit (lib) mkOption types; + mkSrc = pkgs: p: pkgs.symlinkJoin { + name = "me"; + paths = [ + (builtins.path { + name = "me"; + path = p; + }) + (builtins.path { + name = "shared"; + path = ./shared; + }) + ]; + }; +in { + perSystem = { pkgs, ...}: { + _module.args.withShared = mkSrc pkgs; + imports = [ + ./f62 + ./f77 + ./nk65b + ./nk87 + ./nk_classic_tkl + ./steezy60 + ./xd60 + ./xd84pro + ./xd87 + ]; + }; +} diff --git a/devices/qmk/f62/default.nix b/devices/qmk/f62/default.nix new file mode 100644 index 0000000..aadc0ac --- /dev/null +++ b/devices/qmk/f62/default.nix @@ -0,0 +1,26 @@ +{ pkgs, lib, withShared, ... }: let + base = { + type = "qmk"; + qmk = { + qmk_firmware = pkgs.qmk_firmware-modelf; + keyboard = { + name = "model_f_labs/f62"; + revision = "wcass"; + }; + build.flash = fw: '' + ${pkgs.dfu-util}/bin/dfu-util "${fw}.bin" + ''; + }; + }; +in { + devices = { + "f62:default" = base; + + "f62:me" = lib.recursiveUpdate base { + qmk.keymap = { + name = "me"; + src = withShared ./.; + }; + }; + }; +} diff --git a/keyboards/f62/keymap.c b/devices/qmk/f62/keymap.c index 971b66a..971b66a 100644 --- a/keyboards/f62/keymap.c +++ b/devices/qmk/f62/keymap.c diff --git a/devices/qmk/f77/default.nix b/devices/qmk/f77/default.nix new file mode 100644 index 0000000..c8a9dcb --- /dev/null +++ b/devices/qmk/f77/default.nix @@ -0,0 +1,26 @@ +{ pkgs, lib, withShared, ... }: let + base = { + 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 --device 1209:4707 "${fw}.hex" + ''; + }; + }; +in { + devices = { + "f77:default" = base; + + "f77:me" = lib.recursiveUpdate base { + qmk.keymap = { + name = "me"; + src = withShared ./.; + }; + }; + }; +} diff --git a/keyboards/f77/keymap.c b/devices/qmk/f77/keymap.c index ace1f5e..ace1f5e 100644 --- a/keyboards/f77/keymap.c +++ b/devices/qmk/f77/keymap.c diff --git a/devices/qmk/nk65b/default.nix b/devices/qmk/nk65b/default.nix new file mode 100644 index 0000000..7a37fdf --- /dev/null +++ b/devices/qmk/nk65b/default.nix @@ -0,0 +1,21 @@ +{ pkgs, lib, withShared, ... }: let + base = { + type = "qmk"; + qmk = { + keyboard.name = "novelkeys/nk65b"; + build.flash = fw: '' + ${pkgs.dfu-util}/bin/dfu-util "${fw}.bin" + ''; + }; + }; +in { + devices = { + "nk65b:default" = base; + "nk65b:me" = lib.recursiveUpdate base { + qmk.keymap = { + name = "me"; + src = withShared ./.; + }; + }; + }; +} diff --git a/keyboards/nk65b/keymap.c b/devices/qmk/nk65b/keymap.c index 993493b..993493b 100644 --- a/keyboards/nk65b/keymap.c +++ b/devices/qmk/nk65b/keymap.c 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/keyboards/nk87/keymap.c b/devices/qmk/nk87/keymap.c index 72a7aea..72a7aea 100644 --- a/keyboards/nk87/keymap.c +++ b/devices/qmk/nk87/keymap.c diff --git a/devices/qmk/nk_classic_tkl/default.nix b/devices/qmk/nk_classic_tkl/default.nix new file mode 100644 index 0000000..50bee6e --- /dev/null +++ b/devices/qmk/nk_classic_tkl/default.nix @@ -0,0 +1,21 @@ +{ pkgs, lib, withShared, ... }: let + base = { + type = "qmk"; + qmk = { + keyboard.name = "novelkeys/nk_classic_tkl"; + build.flash = fw: '' + ${pkgs.dfu-util}/bin/dfu-util --device 0483:df11 --alt 0 --dfuse-address 0x08000000:leave -D "${fw}.bin" + ''; + }; + }; +in { + devices = { + "nk_classic_tkl:default" = base; + "nk_classic_tkl:me" = lib.recursiveUpdate base { + qmk.keymap = { + name = "me"; + src = withShared ./.; + }; + }; + }; +} diff --git a/devices/qmk/nk_classic_tkl/keymap.c b/devices/qmk/nk_classic_tkl/keymap.c new file mode 100644 index 0000000..7546036 --- /dev/null +++ b/devices/qmk/nk_classic_tkl/keymap.c @@ -0,0 +1,98 @@ +/* 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 +}; + +#define TAB_fn LT(fnc, KC_TAB) + +enum layers { + qty, + wrk, + fnc, + qmk +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [qty] = LAYOUT_tkl_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_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_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_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_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_RIGHT, XXXXXXX, XXXXXXX, XXXXXXX, + KC_CAPS, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_MPRV, KC_MNXT, KC_FIND, KC_CAPS, _______, + _______, _______, _______, KC_MPLY, KC_TRNS, KC_TRNS, KC_TRNS, _______, _______, _______), + + [qmk] = LAYOUT_tkl_ansi_tsangan( + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLU, KC_VOLD, KC_MUTE, + 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, RM_TOGG, RM_NEXT, RM_HUED, RM_HUEU, RM_SATD, RM_SATU, RM_VALD, RM_VALU, RM_SPDD, RM_SPDU, XXXXXXX, XXXXXXX, + _______, _______, _______, RETRO_RGB, _______, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX), + +}; + +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/shared/config.h b/devices/qmk/shared/config.h index 140922d..140922d 100644 --- a/keyboards/shared/config.h +++ b/devices/qmk/shared/config.h diff --git a/keyboards/shared/leader.c b/devices/qmk/shared/leader.c index fd8ae82..fd8ae82 100644 --- a/keyboards/shared/leader.c +++ b/devices/qmk/shared/leader.c diff --git a/keyboards/shared/rules.mk b/devices/qmk/shared/rules.mk index 1636b99..1636b99 100644 --- a/keyboards/shared/rules.mk +++ b/devices/qmk/shared/rules.mk diff --git a/devices/qmk/steezy60/default.nix b/devices/qmk/steezy60/default.nix new file mode 100644 index 0000000..06496ee --- /dev/null +++ b/devices/qmk/steezy60/default.nix @@ -0,0 +1,24 @@ +{ pkgs, lib, withShared, ... }: let + base = { + type = "qmk"; + qmk = { + keyboard = { + name = "4pplet/steezy60"; + revision = "rev_a"; + }; + # build.flash = fw: '' + # ${pkgs.dfu-util}/bin/dfu-util "${fw}.bin" + # ''; + }; + }; +in { + devices = { + "steezy60:default" = base; + "steezy60:me" = lib.recursiveUpdate base { + qmk.keymap = { + name = "me"; + src = withShared ./.; + }; + }; + }; +} diff --git a/keyboards/steezy60/keymap.c b/devices/qmk/steezy60/keymap.c index f5a6c81..f5a6c81 100644 --- a/keyboards/steezy60/keymap.c +++ b/devices/qmk/steezy60/keymap.c 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/keyboards/xd60/keymap.c b/devices/qmk/xd60/keymap.c index a211d1c..a211d1c 100644 --- a/keyboards/xd60/keymap.c +++ b/devices/qmk/xd60/keymap.c diff --git a/devices/qmk/xd84pro/default.nix b/devices/qmk/xd84pro/default.nix new file mode 100644 index 0000000..4305dc8 --- /dev/null +++ b/devices/qmk/xd84pro/default.nix @@ -0,0 +1,21 @@ +{ pkgs, lib, withShared, ... }: let + base = { + type = "qmk"; + qmk = { + keyboard.name = "xiudi/xd84pro"; + # build.flash = fw: '' + # ${pkgs.dfu-util}/bin/dfu-util "${fw}.bin" + # ''; + }; + }; +in { + devices = { + "xd84pro:default" = base; + "xd84pro:me" = lib.recursiveUpdate base { + qmk.keymap = { + name = "me"; + src = withShared ./.; + }; + }; + }; +} diff --git a/keyboards/xd84pro/keymap.c b/devices/qmk/xd84pro/keymap.c index 304eca1..304eca1 100644 --- a/keyboards/xd84pro/keymap.c +++ b/devices/qmk/xd84pro/keymap.c diff --git a/devices/qmk/xd87/default.nix b/devices/qmk/xd87/default.nix new file mode 100644 index 0000000..3f1f64a --- /dev/null +++ b/devices/qmk/xd87/default.nix @@ -0,0 +1,21 @@ +{ pkgs, lib, withShared, ... }: let + base = { + type = "qmk"; + qmk = { + keyboard.name = "xiudi/xd87"; + # build.flash = fw: '' + # ${pkgs.dfu-util}/bin/dfu-util "${fw}.bin" + # ''; + }; + }; +in { + devices = { + "xd87:default" = base; + "xd87:me" = lib.recursiveUpdate base { + qmk.keymap = rec { + name = "me"; + src = withShared ./.; + }; + }; + }; +} diff --git a/keyboards/xd87/keymap.c b/devices/qmk/xd87/keymap.c index c806df5..c806df5 100644 --- a/keyboards/xd87/keymap.c +++ b/devices/qmk/xd87/keymap.c @@ -5,11 +5,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1759362264, - "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=", + "lastModified": 1760948891, + "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "758cf7296bee11f1706a574c77d072b8a7baa881", + "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04", "type": "github" }, "original": { @@ -20,15 +20,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1760630522, - "narHash": "sha256-H7Rw2hQbJO4v60jhqiYo/oftvcW6lnsF16PHRELGVPM=", + "lastModified": 1760968520, + "narHash": "sha256-EjGslHDzCBKOVr+dnDB1CAD7wiQSHfUt3suOpFj9O1Q=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8af9bf8c93e208784d682613820cb606a963debc", + "rev": "e755547441a0413942a37692f7bf7fc6315bb7f6", "type": "github" }, "original": { "owner": "nixos", + "ref": "release-25.05", "repo": "nixpkgs", "type": "github" } @@ -48,22 +49,6 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1754340878, - "narHash": "sha256-lgmUyVQL9tSnvvIvBp7x1euhkkCho7n3TMzgjdvgPoU=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "cab778239e705082fe97bb4990e0d24c50924c04", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "root": { "inputs": { "flake-parts": "flake-parts", @@ -89,14 +74,16 @@ }, "treefmt-nix": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { - "lastModified": 1760120816, - "narHash": "sha256-gq9rdocpmRZCwLS5vsHozwB6b5nrOBDNc2kkEaTXHfg=", + "lastModified": 1760945191, + "narHash": "sha256-ZRVs8UqikBa4Ki3X4KCnMBtBW0ux1DaT35tgsnB1jM4=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "761ae7aff00907b607125b2f57338b74177697ed", + "rev": "f56b1934f5f8fcab8deb5d38d42fd692632b47c2", "type": "github" }, "original": { @@ -2,10 +2,13 @@ description = "Nix utilities to manage keyboard firmware"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs"; + nixpkgs.url = "github:nixos/nixpkgs/release-25.05"; flake-parts.url = "github:hercules-ci/flake-parts"; systems.url = "github:nix-systems/default"; - treefmt-nix.url = "github:numtide/treefmt-nix"; + treefmt-nix = { + url = "github:numtide/treefmt-nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = inputs@{self, ... }: inputs.flake-parts.lib.mkFlake { inherit inputs self; } { @@ -18,7 +21,7 @@ imports = [ inputs.treefmt-nix.flakeModule ./modules - ./keyboards + ./devices ]; perSystem = { pkgs, config, system, ... }: { diff --git a/keyboards/default.nix b/keyboards/default.nix deleted file mode 100644 index e7155bb..0000000 --- a/keyboards/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ lib, ... }: -let - inherit (lib) mkOption types; -in { - perSystem = {...}: { - imports = [ - ./f62 - ./f77 - ./nk65b - ./nk87 - ./nk_classic_tkl - ./steezy60 - # ./xd60 - ./xd84pro - # ./xd87 - ]; - }; -} diff --git a/keyboards/f62/default.nix b/keyboards/f62/default.nix deleted file mode 100644 index c23755c..0000000 --- a/keyboards/f62/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ pkgs, lib, ... }: let - base = { - 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" - ''; - }; - }; -in { - devices = { - "f62:default" = base; - - "f62:me" = base // { - qmk.keymap = rec { - name = "me"; - src = pkgs.symlinkJoin { - inherit name; - path = [ - (builtins.path { - inherit name; - path = ./.; - }) - (builtins.path { - name = "shared"; - path = ../shared; - }) - ]; - }; - }; - }; - }; -} diff --git a/keyboards/f77/default.nix b/keyboards/f77/default.nix deleted file mode 100644 index 4af837e..0000000 --- a/keyboards/f77/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ pkgs, lib, ... }: let - base = { - 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" - ''; - }; - }; -in { - devices = { - "f77:default" = base; - - "f77" = lib.recursiveUpdate base { - qmk.keymap = rec { - name = "me"; - src = pkgs.symlinkJoin { - inherit name; - paths = [ - (builtins.path { - inherit name; - path = ./.; - }) - (builtins.path { - name = "shared"; - path = ../shared; - }) - ]; - }; - }; - }; - }; -} diff --git a/keyboards/nk65b/default.nix b/keyboards/nk65b/default.nix deleted file mode 100644 index 1700a6f..0000000 --- a/keyboards/nk65b/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ pkgs, lib, ... }: let - base = { - type = "qmk"; - qmk = { - keyboard.name = "novelkeys/nk65b"; - build.flash = fw: '' - ${pkgs.dfu-util}/bin/dfu-util "${fw}.bin" - ''; - }; - }; -in { - devices = { - "nk65b-default" = base; - "nk65b" = lib.recursiveUpdate base { - qmk.keymap = rec { - name = "mwahaha"; - src = pkgs.symlinkJoin { - inherit name; - paths = [ - (builtins.path { - inherit name; - path = ./.; - }) - (builtins.path { - name = "shared"; - path = ../shared; - }) - ]; - }; - }; - }; - }; -} diff --git a/keyboards/nk87/default.nix b/keyboards/nk87/default.nix deleted file mode 100644 index 8e8b239..0000000 --- a/keyboards/nk87/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ pkgs, lib, ... }: 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 = rec { - name = "me"; - src = pkgs.symlinkJoin { - inherit name; - 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 deleted file mode 100644 index b2554b8..0000000 --- a/keyboards/nk_classic_tkl/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ pkgs, lib, ... }: let - base = { - 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" = lib.recursiveUpdate base { - qmk.keymap = rec { - name = "me"; - src = pkgs.symlinkJoin { - inherit name; - 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 deleted file mode 100644 index 6f647f5..0000000 --- a/keyboards/nk_classic_tkl/keymap.c +++ /dev/null @@ -1,73 +0,0 @@ -/* 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 deleted file mode 100644 index 28b6b7a..0000000 --- a/keyboards/steezy60/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ pkgs, lib, ... }: let - base = { - 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" = lib.recursiveUpdate base { - qmk.keymap = rec { - name = "me"; - src = pkgs.symlinkJoin { - inherit name; - paths = [ - (builtins.path { - inherit name; - path = ./.; - }) - (builtins.path { - name = "shared"; - path = ../shared; - }) - ]; - }; - }; - }; - }; -} diff --git a/keyboards/xd60/default.nix b/keyboards/xd60/default.nix deleted file mode 100644 index 8cef0de..0000000 --- a/keyboards/xd60/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{...}: let - base = { - firmware.type = "qmk"; - qmk.keyboard.name = "kprepublic/xd60"; - }; -in { - devices = { - "xd60:default" = base; - "xd60:me" = base // { - qmk.keymap = rec { - name = "me"; - src = builtins.path { - inherit name; - path = ./.; - }; - }; - }; - }; -} diff --git a/keyboards/xd84pro/default.nix b/keyboards/xd84pro/default.nix deleted file mode 100644 index d254e33..0000000 --- a/keyboards/xd84pro/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ pkgs, lib, ... }: let - base = { - type = "qmk"; - qmk = { - keyboard.name = "xiudi/xd84pro"; - build.flash = fw: '' - ${pkgs.dfu-util}/bin/dfu-util "${fw}.bin" - ''; - }; - }; -in { - devices = { - "xd84pro:default" = base; - "xd84pro" = lib.recursiveUpdate base { - qmk.keymap = rec { - name = "me"; - src = pkgs.symlinkJoin { - inherit name; - paths = [ - (builtins.path { - inherit name; - path = ./.; - }) - (builtins.path { - name = "shared"; - path = ../shared; - }) - ]; - }; - }; - }; - }; -} diff --git a/keyboards/xd87/default.nix b/keyboards/xd87/default.nix deleted file mode 100644 index 54b62c2..0000000 --- a/keyboards/xd87/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ pkgs, ... }: let - base = { - firmware.type = "qmk"; - qmk.keyboard.name = "xiudi/xd84pro"; - }; -in { - devices = { - "xd87:default" = base; - "xd87:me" = base // { - qmk.keymap = rec { - name = "me"; - src = builtins.path { - inherit name; - path = ./.; - }; - }; - }; - }; -} diff --git a/modules/default.nix b/modules/default.nix index dea6fb3..fbed630 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -48,6 +48,8 @@ in { }) ./qmk.nix + ./pinecil.nix + ./klipper.nix ]; }; diff --git a/modules/klipper.nix b/modules/klipper.nix new file mode 100644 index 0000000..2782bcd --- /dev/null +++ b/modules/klipper.nix @@ -0,0 +1,42 @@ +{ + lib, + pkgs, + config, + ... +}: +let + inherit (lib) mkOption mkIf mkPackageOption types; +in { + options = { + type = mkOption { + type = types.enum [ "klipper" ]; + }; + + klipper = { + klipper-firmware = mkPackageOption pkgs "klipper-firmware" {}; + + mcu = mkOption { + type = types.str; + }; + + firmwareConfig = mkOption { + type = types.path; + }; + + build = { + bin = mkOption { + type = types.path; + default = "${config.klipper.klipper-firmware.override { + inherit (config.klipper) mcu firmwareConfig; + }}/klipper.bin"; + }; + flash = mkOption { + type = types.functionTo <| types.either types.str types.package; + }; + }; + }; + }; + + config = mkIf (config.type == "klipper") { + }; +} diff --git a/modules/pinecil.nix b/modules/pinecil.nix index d59c37d..137de94 100644 --- a/modules/pinecil.nix +++ b/modules/pinecil.nix @@ -2,7 +2,9 @@ inherit (lib) mkOption mkPackageOption mkIf types; in { options = { - type = types.enum [ "pinecil" ]; + type = mkOption { + type = types.enum [ "pinecil" ]; + }; pinecil = { version = mkOption { @@ -36,7 +38,7 @@ in { '' else '' cp ${iron}/Pinecilv2_EN.bin $out - ''; + '' ); }; @@ -48,10 +50,10 @@ in { build.flash = let flasher = if config.pinecil.version == "v1" then { pkg = config.pinecil.dfu-util; - tool = "dfu-util"; + tool = "dfu-util -D"; } else { pkg = config.pinecil.blisp; - tool = "blisp" + tool = "blisp write -c bl70x --reset"; }; in pkgs.writeShellApplication { name = "flash"; diff --git a/modules/qmk.nix b/modules/qmk.nix index c083b06..3834369 100644 --- a/modules/qmk.nix +++ b/modules/qmk.nix @@ -73,6 +73,8 @@ in { name = "qmk:${config.qmk.keyboard._path}:${config.qmk.keymap.name}"; src = config.qmk.qmk_firmware; + allowSubstitutes = false; + # hardeningDisable = [ "pic" "pie" ]; nativeBuildInputs = [ @@ -81,22 +83,23 @@ in { # dontFixup = true; - preBuild = lib.optionalString (ksrc != null) '' + postPatch = lib.optionalString (ksrc != null) /* bash */ '' mkdir -pv "${config.qmk.keymap._path}" cp -v "${ksrc}"/* "${config.qmk.keymap._path}" ''; - buildPhase = '' - # SKIP_GIT=true BUILD_DIR=build \ - # make "${config.qmk.keyboard._path}:${config.qmk.keymap.name}" - qmk compile \ - --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}" + buildPhase = /* bash */ '' + runHook preBuild + + qmk compile \ + --env SKIP_GIT=yes \ + --env BUILD_DIR=build \ + --env SKIP_VERSION=yes \ + --env VERBOSE=true \ + --keyboard "${config.qmk.keyboard._path}" \ + --keymap "${config.qmk.keymap.name}" + + runHook postBuild ''; installPhase = '' @@ -108,7 +111,10 @@ in { }; }; flash = mkOption { - type = types.functionTo (types.either types.package types.str); + type = types.functionTo <| types.either types.package types.str; + default = hex: '' + "${pkgs.dfu-util}/bin/dfu-util" --alt 0 --dfuse-address 0x08000000:leave -D "${hex}.hex" + ''; }; }; diff --git a/overlays/default.nix b/overlays/default.nix index 3a6d3bb..bc46ee2 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,15 +1,19 @@ final: prev: { - qmk_firmware = prev.callPackage ../pkgs/qmk_firmware.nix {}; + # qmk_firmware = prev.callPackage ../pkgs/qmk_firmware.nix {}; - qmk_firmware-modelf = final.qmk_firmware.overrideAttrs { - version = "model_f_labs"; + qmk_firmware = prev.fetchFromGitHub { + owner = "qmk"; + repo = "qmk_firmware"; + fetchSubmodules = true; + rev = "0.30.5"; + hash = "sha256-TdStj8Hf5seH/5SMDqG7B3JLXHCvlL58AJlRqydaNJ0="; + }; - src = prev.fetchFromGitHub { - owner = "matthew-wolf-n4mtt"; - repo = "qmk_firmware"; - fetchSubmodules = true; - rev = "93734d1"; - hash = "sha256-E5zVcfELcFTqJspAyQmnD2qGRzFw4Y48Ce5c9FHl7Bk="; - }; + qmk_firmware-modelf = prev.fetchFromGitHub { + owner = "matthew-wolf-n4mtt"; + repo = "qmk_firmware"; + fetchSubmodules = true; + rev = "93734d1"; + hash = "sha256-E5zVcfELcFTqJspAyQmnD2qGRzFw4Y48Ce5c9FHl7Bk="; }; } diff --git a/pkgs/qmk_firmware.nix b/pkgs/qmk_firmware.nix deleted file mode 100644 index ef647c0..0000000 --- a/pkgs/qmk_firmware.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenvNoCC, fetchFromGitHub, unstableGitUpdater, lib }: -stdenvNoCC.mkDerivation (finalAttrs: { - pname = "qmk_firmware"; - version = "0.30.5"; - - src = fetchFromGitHub { - owner = "qmk"; - repo = "qmk_firmware"; - fetchSubmodules = true; - rev = finalAttrs.version; - hash = "sha256-TdStj8Hf5seH/5SMDqG7B3JLXHCvlL58AJlRqydaNJ0="; - }; - - phases = [ "installPhase" ]; - - installPhase = '' - cp -r --no-preserve=mode $src $out - ''; - - passthru.updateScript = unstableGitUpdater {}; - - meta = with lib; { - homepage = "https://github.com/qmk/qmk_firmware"; - license = licenses.gpl2; - }; -}) |