From 147afb0403da63ed4bb22e34cc6cc3d04050ddf7 Mon Sep 17 00:00:00 2001 From: Julien Malka Date: Thu, 19 Jan 2023 19:42:26 +0100 Subject: [PATCH] Added 2nd job --- flake.nix | 4 +++- machines/lisa/hardware.nix | 6 ------ machines/newton/hardware.nix | 2 +- machines/tower/default.nix | 3 ++- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/flake.nix b/flake.nix index e810b95..e4987f4 100644 --- a/flake.nix +++ b/flake.nix @@ -107,7 +107,9 @@ }; }; - hydraJobs.test = self.nixosConfigurations.tower.config.system.build.toplevel; + + hydraJobs.tower = self.nixosConfigurations.tower.config.system.build.toplevel; + hydraJobs.lisa = self.nixosConfigurations.lisa.config.system.build.toplevel; packages."x86_64-linux" = { tinystatus = import ./packages/tinystatus { inherit pkgs; }; diff --git a/machines/lisa/hardware.nix b/machines/lisa/hardware.nix index de081f1..a078df1 100644 --- a/machines/lisa/hardware.nix +++ b/machines/lisa/hardware.nix @@ -28,12 +28,6 @@ enable = true; port = 2222; hostKeys = [ /boot/initrd-ssh-key ]; - authorizedKeys = lib.splitString "\n" - (builtins.readFile (pkgs.fetchurl { - url = "https://github.com/JulienMalka.keys"; - sha256 = "sha256-Dl/KYUQ8OJeBlG3iqQZxVIadN/Y14cEJZufWI3iRcq8="; - })); - }; postCommands = '' zpool import zroot diff --git a/machines/newton/hardware.nix b/machines/newton/hardware.nix index 212e8e6..abe1f55 100644 --- a/machines/newton/hardware.nix +++ b/machines/newton/hardware.nix @@ -21,7 +21,7 @@ authorizedKeys = lib.splitString "\n" (builtins.readFile (pkgs.fetchurl { url = "https://github.com/JulienMalka.keys"; - sha256 = "sha256-Dl/KYUQ8OJeBlG3iqQZxVIadN/Y14cEJZufWI3iRcq8="; + sha256 = "sha256-xa8TyZb28M4cwdTDAwqN608xdXZBf8PtvNFk1JxE2lQ="; })); }; diff --git a/machines/tower/default.nix b/machines/tower/default.nix index 97cb027..a6880e5 100644 --- a/machines/tower/default.nix +++ b/machines/tower/default.nix @@ -49,7 +49,8 @@ services.tailscale.enable = true; nix.extraOptions = '' - experimental-features = nix-command flakes + allow-import-from-derivation = true + experimental-features = nix-command flakes ''; services.openssh.extraConfig = ''