From 72be85e30bbdd658d100b70efc7deafa2a925267 Mon Sep 17 00:00:00 2001
From: lassulus <git@lassul.us>
Date: Sun, 3 Sep 2023 11:55:15 +0200
Subject: l neoprism.r: disable initrd ssh

---
 lass/1systems/neoprism/physical.nix | 39 ++++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 18 deletions(-)

(limited to 'lass/1systems')

diff --git a/lass/1systems/neoprism/physical.nix b/lass/1systems/neoprism/physical.nix
index f2092d9aa..cc7734f39 100644
--- a/lass/1systems/neoprism/physical.nix
+++ b/lass/1systems/neoprism/physical.nix
@@ -13,7 +13,10 @@
   boot.loader.grub.enable = true;
   boot.loader.grub.version = 2;
   boot.loader.grub.efiSupport = true;
-  boot.loader.grub.devices = [ "/dev/nvme0n1" "/dev/nvme1n1" ];
+  boot.loader.grub.devices = [
+    config.disko.devices.disk."/dev/nvme0n1".device
+    config.disko.devices.disk."/dev/nvme1n1".device
+  ];
   boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "sd_mod" ];
   boot.kernelModules = [ "kvm-amd" ];
   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
@@ -56,21 +59,21 @@
   };
 
   networking.useDHCP = false;
-  boot.initrd.network = {
-    enable = true;
-    ssh = {
-      enable = true;
-      authorizedKeys = [ config.krebs.users.lass.pubkey ];
-      port = 2222;
-      hostKeys = [
-        (toString <secrets/ssh.id_ed25519>)
-        (toString <secrets/ssh.id_rsa>)
-      ];
-    };
-  };
-  boot.kernelParams = [
-    "net.ifnames=0"
-    "ip=dhcp"
-    "boot.trace"
-  ];
+  # boot.initrd.network = {
+  #   enable = true;
+  #   ssh = {
+  #     enable = true;
+  #     authorizedKeys = [ config.krebs.users.lass.pubkey ];
+  #     port = 2222;
+  #     hostKeys = [
+  #       (<secrets/ssh.id_ed25519>)
+  #       (<secrets/ssh.id_rsa>)
+  #     ];
+  #   };
+  # };
+  # boot.kernelParams = [
+  #   "net.ifnames=0"
+  #   "ip=dhcp"
+  #   "boot.trace"
+  # ];
 }
-- 
cgit v1.2.3