Changes for lambda, fixes for sea.fudo.org

config/host-config/lambda.nix

@@ -39,6 +39,24 @@ in {
     "L /root/.ssh/id_rsa - - - - ${state-dir}/user/root/ssh/id_rsa"
     "L /root/.ssh/id_rsa.pub - - - - ${state-dir}/user/root/ssh/id_rsa.pub"
     "L /root/.ssh/known_hosts - - - - ${state-dir}/user/root/ssh/known_hosts"
+
+    # "L /etc/ssh/ssh_host_rsa_key - - - - ${state-dir}/ssh/ssh_host_rsa_key"
+    # "L /etc/ssh/ssh_host_rsa_key.pub - - - - ${state-dir}/ssh/ssh_host_rsa_key.pub"
+    # "L /etc/ssh/ssh_host_ed25519_key - - - - ${state-dir}/ssh/ssh_host_ed25519_key"
+    # "L /etc/ssh/ssh_host_ed25519_key.pub - - - - ${state-dir}/ssh/ssh_host_ed25519_key.pub"
+  ];
+
+  services.openssh.hostKeys = [
+    {
+      path = "${state-dir}/ssh/ssh_host_rsa_key";
+      type = "rsa";
+      bits = 4096;
+    }
+    {
+      path = "${state-dir}/ssh/ssh_host_ed25519_key";
+      type = "ed25519";
+      bits = 4096;
+    }
   ];
 
   environment.etc = {
@@ -66,7 +84,11 @@ in {
       group = "root";
       mode = "0444";
     };
+    nixos.source = "/etc/nixos-live";
     "machine-id".source = "${state-dir}/host/machine-id";
+    "host-config.nix".source = "/state/host/host-config.nix";
+    adjtime.source = "/state/host/adjtime";
+    NIXOS.source = "/state/host/NIXOS";
   };
 
   security.sudo.extraConfig = ''

config/host-config/limina.nix

@@ -139,11 +139,12 @@ in {
       NIXOS.source = "/state/etc/NIXOS";
       machine-id.source = "/state/etc/machine-id";
       "host-config.nix".source = "/state/etc/host-config.nix";
-      "krb5.keytab" = {
-        source = "/state/etc/limina.keytab";
-        user = "root";
-        mode = "0400";
-      };
+      ## This should be handled by nixops deploy
+      # "krb5.keytab" = {
+      #   source = "/state/etc/limina.keytab";
+      #   user = "root";
+      #   mode = "0400";
+      # };
     };
 
     boot.initrd.postDeviceCommands = lib.mkAfter ''

config/site-config/seattle.nix

@@ -6,18 +6,22 @@ in {
     "/mnt/documents" = {
       device = "whitedwarf.${local-domain}:/volume1/Documents";
       fsType = "nfs4";
+      options = [ "comment=systemd.automount" ];
     };
     "/mnt/downloads" = {
       device = "whitedwarf.${local-domain}:/volume1/Downloads";
       fsType = "nfs4";
+      options = [ "comment=systemd.automount" ];
     };
     "/mnt/music" = {
       device = "doraemon.${local-domain}:/volume1/Music";
       fsType = "nfs4";
+      options = [ "comment=systemd.automount" ];
     };
     "/mnt/video" = {
       device = "doraemon.${local-domain}:/volume1/Video";
       fsType = "nfs4";
+      options = [ "comment=systemd.automount" ];
     };
     # fileSystems."/mnt/security" = {
     #   device = "panopticon.${local-domain}:/srv/kerberos/data";
@@ -26,10 +30,12 @@ in {
     "/mnt/cargo_video" = {
       device = "cargo.${local-domain}:/volume1/video";
       fsType = "nfs4";
+      options = [ "comment=systemd.automount" ];
     };
     "/mnt/photo" = {
       device = "cargo.${local-domain}:/volume1/pictures";
       fsType = "nfs4";
+      options = [ "comment=systemd.automount" ];
     };
   };