From d7c1d539ffd79650d77ffa76c1474cb63b468c83 Mon Sep 17 00:00:00 2001 From: Xe Date: Tue, 21 Dec 2021 17:02:29 -0500 Subject: [PATCH] make logos work Signed-off-by: Xe --- flake.nix | 13 +++++++++---- hardware/alrest/zfs.nix | 21 --------------------- 2 files changed, 9 insertions(+), 25 deletions(-) diff --git a/flake.nix b/flake.nix index 29521ad..42a9def 100644 --- a/flake.nix +++ b/flake.nix @@ -20,11 +20,16 @@ modules = [ ./hosts/logos ./hardware/alrest ]; }; - deploy.nodes.some-random-system.profiles.system = { + deploy.nodes.logos = { hostname = "192.168.2.35"; - user = "root"; - path = deploy-rs.lib.x86_64-linux.activate.nixos - self.nixosConfigurations.logos; + sshUser = "root"; + fastConnection = true; + + profiles.system = { + user = "root"; + path = deploy-rs.lib.x86_64-linux.activate.nixos + self.nixosConfigurations.logos; + }; }; # This is highly advised, and will prevent many possible mistakes diff --git a/hardware/alrest/zfs.nix b/hardware/alrest/zfs.nix index da4b35c..7c436e7 100644 --- a/hardware/alrest/zfs.nix +++ b/hardware/alrest/zfs.nix @@ -1,26 +1,5 @@ { config, ... }: { - boot = { - initrd = { - kernelModules = [ "r8169" ]; - network = { - enable = true; - ssh = { - enable = true; - port = 2222; - authorizedKeys = config.users.users.cadey.openssh.authorizedKeys.keys; - hostKeys = [ - "/etc/secrets/initrd/ssh_host_rsa_key" - "/etc/secrets/initrd/ssh_host_ed25519_key" - ]; - }; - postCommands = '' - echo "zfs load-key -a; killall zfs" >> /root/.profile - ''; - }; - }; - }; - services.nfs.server.enable = true; }