Fix up some remaining warnings due to the upgrade

morph/grid/local/Vagrantfile

@@ -60,7 +60,7 @@ Vagrant.configure("2") do |config|
   end
 
   # To make the VMs assign the static IPs to the network interfaces we need a rebuild:
-  config.vm.provision "shell", inline: "echo '{nix.trustedUsers = [ \"@wheel\" \"root\" \"vagrant\" ];}' > /etc/nixos/custom-configuration.nix"
+  config.vm.provision "shell", inline: "echo '{nix.settings.trusted-users = [ \"@wheel\" \"root\" \"vagrant\" ];}' > /etc/nixos/custom-configuration.nix"
   config.vm.provision "shell", inline: "nixos-rebuild switch"
 
   config.trigger.after :up do |trigger|

morph/lib/hardware-vagrant.nix

@@ -52,6 +52,6 @@
       };
 
     # We want to push packages with morph without having to sign them
-    nix.trustedUsers = [ "@wheel" "root" "vagrant" ];
+    nix.settings.trusted-users = [ "@wheel" "root" "vagrant" ];
   };
 }

nixos/modules/deployment.nix

@@ -36,10 +36,10 @@ in {
     # Configure the system to use our binary cache so that deployment updates
     # only require downloading pre-built software, not building it ourselves.
     nix = {
-      binaryCachePublicKeys = [
+      settings.trusted-public-keys = [
         "saxtons.private.storage:MplOcEH8G/6mRlhlKkbA8GdeFR3dhCFsSszrspE/ZwY="
       ];
-      binaryCaches = [
+      settings.substituters = [
         "http://saxtons.private.storage"
       ];
     };

nixos/modules/issuer.nix

@@ -254,7 +254,7 @@ in {
     ];
 
     # NGINX reverse proxy
-    security.acme.email = cfg.letsEncryptAdminEmail;
+    security.acme.defaults.email = cfg.letsEncryptAdminEmail;
     security.acme.acceptTerms = true;
     services.nginx = {
       enable = true;

nixos/modules/ssh.nix

@@ -29,7 +29,7 @@
       allowSFTP = false;
 
       # We only allow key-based authentication.
-      challengeResponseAuthentication = false;
+      kbdInteractiveAuthentication = false;
       passwordAuthentication = false;
 
       extraConfig = ''