From 1a6ce11b07ed0406b71c65e293ddf6a081ab80eb Mon Sep 17 00:00:00 2001 From: Colin Date: Thu, 7 Dec 2023 13:01:40 +0000 Subject: [PATCH] disable binfmt emulation on my build machines --- hosts/by-name/desko/default.nix | 3 +++ hosts/by-name/servo/default.nix | 1 - hosts/modules/roles/build-machine.nix | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hosts/by-name/desko/default.nix b/hosts/by-name/desko/default.nix index 952a44c1..9177566f 100644 --- a/hosts/by-name/desko/default.nix +++ b/hosts/by-name/desko/default.nix @@ -9,6 +9,9 @@ # services.distccd.enable = true; # sane.programs.distcc.enableFor.user.guest = true; + # TODO: remove emulation, but need to fix nixos-rebuild to moby for that. + # sane.roles.build-machine.emulation = true; + sops.secrets.colin-passwd.neededForUsers = true; sane.ports.openFirewall = true; # for e.g. nix-serve diff --git a/hosts/by-name/servo/default.nix b/hosts/by-name/servo/default.nix index 88154c16..7e3e9281 100644 --- a/hosts/by-name/servo/default.nix +++ b/hosts/by-name/servo/default.nix @@ -15,7 +15,6 @@ }; sane.roles.build-machine.enable = true; - sane.roles.build-machine.emulation = false; sane.zsh.showDeadlines = false; # ~/knowledge doesn't always exist sane.programs.consoleUtils.suggestedPrograms = [ "pcConsoleUtils" diff --git a/hosts/modules/roles/build-machine.nix b/hosts/modules/roles/build-machine.nix index 54a4136d..bc7f828d 100644 --- a/hosts/modules/roles/build-machine.nix +++ b/hosts/modules/roles/build-machine.nix @@ -13,7 +13,7 @@ in }; emulation = mkOption { type = types.bool; - default = true; + default = false; }; ccache = mkOption { type = types.bool;