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;