From 4fef42b0f147f4dfa1a78243687868b1725834c7 Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Mon, 21 Oct 2024 20:19:28 +0200 Subject: [PATCH] feat: nope, no more hydra --- flake.nix | 6 ----- hosts/lambdaos/configuration.nix | 16 ------------- hosts/nuos/configuration.nix | 40 -------------------------------- 3 files changed, 62 deletions(-) diff --git a/flake.nix b/flake.nix index d800099..6e27347 100644 --- a/flake.nix +++ b/flake.nix @@ -118,12 +118,6 @@ nixosModules = { automapaper = ./modules/automapaper; }; - - hydraJobs = { - lambda.x86_64-linux = self.nixosConfigurations.lambdaOS.config.system.build.toplevel; - nu.x86_64-linux = self.nixosConfigurations.nuOS.config.system.build.toplevel; - mu.x86_64-linux = self.nixosConfigurations.muOS.config.system.build.toplevel; - }; }; } diff --git a/hosts/lambdaos/configuration.nix b/hosts/lambdaos/configuration.nix index f697e36..0b71b33 100644 --- a/hosts/lambdaos/configuration.nix +++ b/hosts/lambdaos/configuration.nix @@ -52,12 +52,6 @@ ]; write = true; }; - nix = { - settings = { - builders-use-substitutes = true; - trusted-users = [ "root" "remotebuilder" "@wheel" ]; - }; - }; # Allow unfree packages @@ -94,16 +88,6 @@ hashedPassword = "$6$rounds=512400$Zip3xoK2zcoR4qEL$N13YTHO5tpWfx2nKb1sye.ZPwfoRtMQ5f3YrMZqKzzoFoSSHHJ.l5ulCEa9HygFxZmBtPnwlseFEtl8ERnwF50"; openssh.authorizedKeys.keys = (import ../../common/ssh-keys.nix); }; - remotebuilder = { - isNormalUser = true; - hashedPassword = "!"; - description = "Remote nix builder"; - openssh.authorizedKeys.keys = - [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILRZXNqs7FgVeTCt2ElOARt5f/bR1gjk5bS+zCJA6C1P root@nuOS" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII7X17VovmxkwhKxIg795yO1Sf7dwO50pybMRlUDLLcA hydra@nuOS" - ]; - }; }; home-manager = { diff --git a/hosts/nuos/configuration.nix b/hosts/nuos/configuration.nix index ab379de..5ff1a9a 100644 --- a/hosts/nuos/configuration.nix +++ b/hosts/nuos/configuration.nix @@ -43,16 +43,6 @@ hashedPassword = "$6$rounds=512400$g/s4dcRttXi4ux6c$Z6pKnhJXcWxv0TBSMtvJu5.piETdUBSgBVN7oDPKiQV.lbTYz1r.0XQLwMYxzcvaaX0DL6Iw/SEUTiC2M50wC/"; openssh.authorizedKeys.keys = import ../../common/ssh-keys.nix; }; - remotebuilder = { - isNormalUser = true; - hashedPassword = "!"; - description = "Remote nix builder"; - openssh.authorizedKeys.keys = - [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILRZXNqs7FgVeTCt2ElOARt5f/bR1gjk5bS+zCJA6C1P root@nuOS" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII7X17VovmxkwhKxIg795yO1Sf7dwO50pybMRlUDLLcA hydra@nuOS" - ]; - }; }; # Allow unfree packages @@ -99,28 +89,8 @@ }; nix = { - buildMachines = [ - { - hostName = "localhost"; - protocol = null; - system = "x86_64-linux"; - supportedFeatures = [ "kvm" "nixos-test" "big-parallel" "benchmark" ]; - maxJobs = 4; - sshUser = "remotebuilder"; - } - { - hostName = "lambdaos"; - protocol = "ssh"; - system = "x86_64-linux"; - supportedFeatures = [ "kvm" "nixos-test" "big-parallel" "benchmark" ]; - maxJobs = 8; - sshUser = "remotebuilder"; - } - ]; - distributedBuilds = false; settings = { builders-use-substitutes = true; - trusted-users = [ "root" "remotebuilder" "@wheel" ]; }; }; @@ -176,16 +146,6 @@ }; services = { - hydra = { - enable = true; - hydraURL = "https://hydra.itepastra.nl"; - port = 9212; - notificationSender = "hydra@localhost"; - useSubstitutes = true; - # listenHost = "localhost"; - minimumDiskFree = 100; - minimumDiskFreeEvaluator = 100; - }; nix-serve = { enable = true; package = pkgs.nix-serve-ng;