From ab3a6d663d5d0771ea9e3f69b8e9892275f24f01 Mon Sep 17 00:00:00 2001
From: Richard Goulter <richard.goulter@gmail.com>
Date: Tue, 11 Jun 2024 13:05:12 +0700
Subject: [PATCH] flake.nix: import firmware/keyberon flake module

---
 flake.lock | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 flake.nix  | 11 ++++++++++
 2 files changed, 71 insertions(+)

diff --git a/flake.lock b/flake.lock
index 5f8916e..eaea24c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -65,6 +65,27 @@
         "type": "github"
       }
     },
+    "fenix": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "rust-analyzer-src": "rust-analyzer-src"
+      },
+      "locked": {
+        "lastModified": 1717827974,
+        "narHash": "sha256-ixopuTeTouxqTxfMuzs6IaRttbT8JqRW5C9Q/57WxQw=",
+        "owner": "nix-community",
+        "repo": "fenix",
+        "rev": "ab655c627777ab5f9964652fe23bbb1dfbd687a8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "fenix",
+        "type": "github"
+      }
+    },
     "flake-compat": {
       "flake": false,
       "locked": {
@@ -243,6 +264,26 @@
         "type": "github"
       }
     },
+    "naersk": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1717067539,
+        "narHash": "sha256-oIs5EF+6VpHJRvvpVWuqCYJMMVW/6h59aYUv9lABLtY=",
+        "owner": "nmattia",
+        "repo": "naersk",
+        "rev": "fa19d8c135e776dc97f4dcca08656a0eeb28d5c0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nmattia",
+        "repo": "naersk",
+        "type": "github"
+      }
+    },
     "nickel": {
       "inputs": {
         "crane": "crane",
@@ -410,13 +451,32 @@
     },
     "root": {
       "inputs": {
+        "fenix": "fenix",
         "flake-parts": "flake-parts",
+        "naersk": "naersk",
         "nickel": "nickel",
         "nixos-generators": "nixos-generators",
         "nixpkgs": "nixpkgs_2",
         "systems": "systems_6"
       }
     },
+    "rust-analyzer-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1717583671,
+        "narHash": "sha256-+lRAmz92CNUxorqWusgJbL9VE1eKCnQQojglRemzwkw=",
+        "owner": "rust-lang",
+        "repo": "rust-analyzer",
+        "rev": "48bbdd6a74f3176987d5c809894ac33957000d19",
+        "type": "github"
+      },
+      "original": {
+        "owner": "rust-lang",
+        "ref": "nightly",
+        "repo": "rust-analyzer",
+        "type": "github"
+      }
+    },
     "rust-overlay": {
       "inputs": {
         "flake-utils": [
diff --git a/flake.nix b/flake.nix
index a24207a..f339a4f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,6 +4,16 @@
   inputs = {
     flake-parts.url = "github:hercules-ci/flake-parts";
 
+    fenix = {
+      url = "github:nix-community/fenix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    naersk = {
+      url = "github:nmattia/naersk";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     # For the offline ISO,
     # use same version of Nickel as Fak uses.
     nickel = {
@@ -34,6 +44,7 @@
       systems = import systems;
 
       imports = [
+        ./firmware/keyberon/flake-module.nix
       ];
 
       flake = {