From 6637450aa5450c275e6b0d8750d57fc034d79a11 Mon Sep 17 00:00:00 2001 From: Ingolf Wagner Date: Wed, 7 Aug 2024 21:25:21 +0200 Subject: [PATCH] wip (works with encryption) --- components/nixos/boot/ssh.nix | 2 +- machines/probe/configuration.nix | 2 ++ machines/probe/hardware-configuration/default.nix | 3 ++- machines/probe/hardware-configuration/hetzner.nix | 8 +++++++- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/components/nixos/boot/ssh.nix b/components/nixos/boot/ssh.nix index ce5bb98..b774840 100644 --- a/components/nixos/boot/ssh.nix +++ b/components/nixos/boot/ssh.nix @@ -12,7 +12,7 @@ with types; type = listOf str; default = [ ]; description = - "lspci -v will tell you which kernel module is used for the ethernet interface"; + "nix-shell -p pciutils --run 'lspci -v' will tell you which kernel module is used for the ethernet interface"; }; }; diff --git a/machines/probe/configuration.nix b/machines/probe/configuration.nix index 259636a..46b5999 100644 --- a/machines/probe/configuration.nix +++ b/machines/probe/configuration.nix @@ -12,6 +12,8 @@ components.nixos.boot.enable = true; components.nixos.boot.ssh.enable = true; + components.nixos.boot.ssh.kernelModules = ["virtio_pci"]; + networking.hostName = "probe"; users.users.root.openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJkqVvuJSvRMO5pG2CHNNBxjB7HlJudK4TQs3BhbOWOD" ]; diff --git a/machines/probe/hardware-configuration/default.nix b/machines/probe/hardware-configuration/default.nix index c1b98cf..57ff87b 100644 --- a/machines/probe/hardware-configuration/default.nix +++ b/machines/probe/hardware-configuration/default.nix @@ -1,7 +1,8 @@ { config, factsGenerator, clanLib, ... }: { imports = [ - ./disko-config-simple.nix + #./disko-config-simple.nix + ./disko-config-encrypted.nix ./hardware-configuration.nix ./hetzner.nix # to more me to components ]; diff --git a/machines/probe/hardware-configuration/hetzner.nix b/machines/probe/hardware-configuration/hetzner.nix index fcb87dd..caeb738 100644 --- a/machines/probe/hardware-configuration/hetzner.nix +++ b/machines/probe/hardware-configuration/hetzner.nix @@ -1,12 +1,18 @@ +{config, ... }: { systemd.network.enable = true; - systemd.network.networks."10-private-hetzner" = { + + systemd.network.networks."10-hetzner" = { matchConfig.Name = "e*"; networkConfig.DHCP = "ipv4"; linkConfig.RequiredForOnline = "routable"; }; + + boot.initrd.systemd.network.networks."10-hetzner" = config.systemd.network.networks."10-hetzner"; + boot.loader.grub = { efiSupport = true; efiInstallAsRemovable = true; }; + }