From 86bdec5e4e37771328ea98800378b0f21fb7e609 Mon Sep 17 00:00:00 2001
From: Sridhar Ratnakumar <srid@srid.ca>
Date: Mon, 18 Jul 2022 16:10:36 -0400
Subject: [PATCH] Migrate

---
 nixos/caches/oss.nix     | 4 ++--
 systems/hetzner/ax41.nix | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/caches/oss.nix b/nixos/caches/oss.nix
index 59baca3..06af29b 100644
--- a/nixos/caches/oss.nix
+++ b/nixos/caches/oss.nix
@@ -1,10 +1,10 @@
 { pkgs, ... }: {
-  nix.binaryCachePublicKeys = [
+  nix.settings.trusted-public-keys = [
     # "srid.cachix.org-1:MTQ6ksbfz3LBMmjyPh0PLmos+1x+CdtJxA/J2W+PQxI="
     # "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
     "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
   ];
-  nix.binaryCaches = [
+  nix.settings.substituters = [
     # "https://srid.cachix.org"
     # "https://nix-community.cachix.org"
     "https://cache.garnix.io"
diff --git a/systems/hetzner/ax41.nix b/systems/hetzner/ax41.nix
index 45f328a..c4b4ff7 100644
--- a/systems/hetzner/ax41.nix
+++ b/systems/hetzner/ax41.nix
@@ -50,7 +50,7 @@
 
   # The RAIDs are assembled in stage1, so we need to make the config
   # available there.
-  boot.initrd.mdadmConf = config.environment.etc."mdadm.conf".text;
+  boot.initrd.services.swraid.mdadmConf = config.environment.etc."mdadm.conf".text;
 
   # Network (Hetzner uses static IP assignments, and we don't use DHCP here)
   networking.useDHCP = false;