fixup initrd-ssh

1 files changed, 28 insertions, 18 deletions

diff --git a/system-profiles/initrd-ssh/default.nix b/system-profiles/initrd-ssh/default.nix
index 55a608b9..dca0f125 100644
--- a/system-profiles/initrd-ssh/default.nix
+++ b/system-profiles/initrd-ssh/default.nix
@@ -1,35 +1,45 @@
-{ hostName, config, pkgs, ... }:
+{ hostName, config, pkgs, lib, ... }:
+
+with lib;
+
 {
+  imports = [ ./module.nix ];
+
   config = {
-    boot.initrd.network = {
-      enable = true;
-      ssh = {
+    boot.initrd = {
+      network = {
         enable = true;
-        hostKeys = with config.sops.secrets; [ initrd_ssh_host_rsa_key.path initrd_ssh_host_ed25519_key.path ];
-        authorizedKeys = config.users.users.root.openssh.authorizedKeys.keys ++ map (kF: builtins.readFile kF) config.users.users.root.openssh.authorizedKeys.keyFiles;
+        ssh = {
+          enable = true;
+          hostKeys = [ "/etc/ssh/ssh_host_ed25519_key" "/etc/ssh/ssh_host_rsa_key" ];
+          authorizedKeys = config.users.users.root.openssh.authorizedKeys.keys ++ map (kF: builtins.readFile kF) config.users.users.root.openssh.authorizedKeys.keyFiles;
+        };
+      };
+
+      secrets = with config.sops.secrets; {
+        "/etc/ssh/ssh_host_ed25519_key" = initrd_ssh_host_ed25519_key.path;
+        "/etc/ssh/ssh_host_rsa_key" = initrd_ssh_host_rsa_key.path;
+      };
+
+      extraFiles = let
+        mkPubkey = typ: pkgs.runCommand "ssh_host_${typ}_key.pub" { buildInputs = with pkgs; [ yq ]; } ''
+          yq -r '.${typ}' ${./host-keys + "/${hostName}-public.yaml"} > $out
+        '';
+      in {
+        "/etc/ssh/ssh_host_rsa_key.pub".source = mkPubkey "rsa";
+        "/etc/ssh/ssh_host_ed25519_key.pub".source = mkPubkey "ed25519";
       };
     };
-    
+
     sops.secrets = {
       initrd_ssh_host_rsa_key = {
           key = "rsa";
-          path = "/etc/initrd-ssh/ssh_host_rsa_key";
           sopsFile = ./host-keys + "/${hostName}-private.yaml";
       };
       initrd_ssh_host_ed25519_key = {
           key = "ed25519";
-          path = "/etc/initrd-ssh/ssh_host_ed25519_key";
           sopsFile = ./host-keys + "/${hostName}-private.yaml";
       };
     };
-    environment.etc =
-      let
-        mkPubkey = typ: pkgs.runCommand "initrd_ssh_host_${typ}_key" { buildInputs = with pkgs; [ yq ]; } ''
-          yq -r '.${typ}' ${./host-keys + "/${hostName}-public.yaml"} > $out
-        '';
-      in {
-        "initrd-ssh/ssh_host_rsa_key.pub".source = mkPubkey "rsa";
-        "initrd-ssh/ssh_host_ed25519_key.pub".source = mkPubkey "ed25519";
-      };
   };
 }