From 9a18827cbce3faa9ac73545c67cea8d7a23b9431 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Geoffrey=20=E2=80=9CFrogeye=E2=80=9D=20Preud=27homme?=
 <geoffrey@frogeye.fr>
Date: Wed, 22 Nov 2023 13:38:25 +0100
Subject: [PATCH] nix: Make nixos-hardware work for pindakaas

---
 config/nix/add_channels.sh | 5 ++++-
 config/nix/pindakaas.nix   | 7 +++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/config/nix/add_channels.sh b/config/nix/add_channels.sh
index d5323e4..aea4785 100755
--- a/config/nix/add_channels.sh
+++ b/config/nix/add_channels.sh
@@ -1,6 +1,9 @@
 #!/usr/bin/env bash
 
 # TODO Surely there's more elegant?
+
 nix-channel --add https://nixos.org/channels/nixos-23.05 nixpkgs
 nix-channel --add https://github.com/nix-community/home-manager/archive/release-23.05.tar.gz home-manager
-nix-channel --add https://github.com/NixOS/nixos-hardware/archive/master.tar.gz nixos-hardware
+# First commit before 23.05 release date:
+nix-channel --add https://github.com/NixOS/nixos-hardware/archive/468a7a108108908c7a35d6549f1e1f0236a9448a.tar.gz nixos-hardware
+nix-channel --update
diff --git a/config/nix/pindakaas.nix b/config/nix/pindakaas.nix
index aef4544..a7f49c9 100644
--- a/config/nix/pindakaas.nix
+++ b/config/nix/pindakaas.nix
@@ -1,9 +1,12 @@
-{ ... }:
+{ pkgs, config, ... }:
 {
   imports = [
-    # <nixos-hardware/pine64/pinebook-pro>
+    <nixos-hardware/pine64/pinebook-pro>
     <nixpkgs/nixos/modules/installer/sd-card/sd-image-aarch64.nix>
     ./os/loader.nix
   ];
   networking.hostName = "pindakaas";
+  # nixos-hardware use latest kernel by default. This obviously runs quickly out of sync with zfs packages.
+  # zfs packages are included despite me asking anything zfs, probably they're in the image for installation purposes?
+  boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
 }