qmk seems to be mostly working. Now working on pinecil

2 files changed, 11 insertions, 15 deletions

diff --git a/keyboards/default.nix b/keyboards/default.nix
index ea5ceec..d3f39a5 100644
--- a/keyboards/default.nix
+++ b/keyboards/default.nix
@@ -1,9 +1,9 @@
 { lib, ... }:
-let 
+let
   inherit (lib) mkOption types;
 in {
-  perSystem.firmware = mkOption {
-    type = types.submodule [
+  perSystem = {...}: {
+    imports = [
       # ./f62
       # ./f77
       ./nk65b
diff --git a/keyboards/nk65b/default.nix b/keyboards/nk65b/default.nix
index 7176ebf..5e629d4 100644
--- a/keyboards/nk65b/default.nix
+++ b/keyboards/nk65b/default.nix
@@ -1,23 +1,19 @@
-{ pkgs, ... }: let
+{ pkgs, lib, ... }: let
   base = {
-    firmware.type = "qmk";
+    type = "qmk";
     qmk = {
       keyboard.name = "novelkeys/nk65b";
-      flash = pkgs.writeShellApplication {
-        name = "flash";
-        runtimeDependencies = with pkgs; [ dfu-util ];
-        text = ''
-          dfu-util "''${1:-}"
-        '';
-      };
+      build.flash = fw: ''
+        ${pkgs.dfu-util}/bin/dfu-util "${fw}.bin"
+      '';
     };
   };
 in {
   devices = {
-    "nk65b:default" = base;
-    "nk65b:me" = base // {
+    "nk65b-default" = base;
+    "nk65b" = lib.recursiveUpdate base {
       qmk.keymap = rec {
-        name = "me";
+        name = "mwahaha";
         src = builtins.path {
           inherit name;
           path = ./.;