From c11792ae07820486eebefdc4bd472dc969df9cc8 Mon Sep 17 00:00:00 2001
From: Kiana Sheibani <kiana.a.sheibani@gmail.com>
Date: Sun, 8 Feb 2026 07:43:29 -0500
Subject: [PATCH] tweak!(deploy-rpi5): switch to `nixos-raspberrypi`

This project is better-maintained and more stable, so it's what we're
using now.
---
 deploy/rpi5/default.nix |  5 ++---
 flake.nix               | 21 +++++++++++++++++----
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/deploy/rpi5/default.nix b/deploy/rpi5/default.nix
index 502ae6c..3194da0 100644
--- a/deploy/rpi5/default.nix
+++ b/deploy/rpi5/default.nix
@@ -1,6 +1,5 @@
-{ config, lib, ... }:
+{ ... }:
 {
   nixpkgs.system = "aarch64-linux";
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = false;
+  boot.loader.raspberry-pi.bootloader = "kernel";
 }
diff --git a/flake.nix b/flake.nix
index 24356df..501173f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,7 +3,7 @@ description = "Aether - web server configuration";
 
 inputs = {
   nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-  nixos-hardware.url = "github:NixOS/nixos-hardware";
+  nixos-raspberrypi.url = "github:nvmd/nixos-raspberrypi/main";
 
   agenix.url = "github:ryantm/agenix";
   agenix.inputs.nixpkgs.follows = "nixpkgs";
@@ -13,7 +13,16 @@ inputs = {
   forgejo-tokyo-night.flake = false;
 };
 
-outputs = inputs@{ self, nixpkgs, nixos-hardware, agenix, ... }:
+nixConfig = {
+  extra-substituters = [
+    "https://nixos-raspberrypi.cachix.org"
+  ];
+  extra-trusted-public-keys = [
+    "nixos-raspberrypi.cachix.org-1:4iMO9LXa8BqhU+Rpg6LQKiGa2lsNh/j2oiYLNOQ5sPI="
+  ];
+};
+
+outputs = inputs@{ self, nixpkgs, nixos-raspberrypi, agenix, ... }:
   let
     inherit (nixpkgs) lib;
 
@@ -21,7 +30,11 @@ outputs = inputs@{ self, nixpkgs, nixos-hardware, agenix, ... }:
     # (Mostly used for injecting flake inputs)
     extraConfig = {
       deploy-rpi5 = {
-        imports = [ nixos-hardware.nixosModules.raspberry-pi-5 ];
+        imports = with nixos-raspberrypi.nixosModules; [
+          raspberry-pi-5.base
+          raspberry-pi-5.page-size-16k
+          raspberry-pi-5.display-vc4
+        ];
       };
     };
 
@@ -56,7 +69,7 @@ outputs = inputs@{ self, nixpkgs, nixos-hardware, agenix, ... }:
       };
 
     nixosConfigurations."toki-aether" =
-      nixpkgs.lib.nixosSystem {
+      nixos-raspberrypi.lib.nixosSystem {
         specialArgs = inputs // {
           aether = self.nixosModules;
         };