From 4faa251a6efc5c14e3c46f0eeb311516e1c4e7a4 Mon Sep 17 00:00:00 2001
From: Andrea Ciceri <andrea.ciceri@autistici.org>
Date: Sun, 28 Jan 2024 14:39:09 +0100
Subject: [PATCH] Things

---
 hmModules/shell/default.nix     |  3 ++-
 modules/binfmt/default.nix      |  2 +-
 modules/hercules-ci/default.nix |  2 +-
 modules/nix/default.nix         | 11 +++++------
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/hmModules/shell/default.nix b/hmModules/shell/default.nix
index ff729fb..ce68eb2 100644
--- a/hmModules/shell/default.nix
+++ b/hmModules/shell/default.nix
@@ -201,7 +201,8 @@
     lsof
     zsh-completions
     nix-zsh-completions
-    carapace # used by nushell
+    comma
+    # carapace # used by nushell
     nil # TODO probably not best place
     nixd # TODO probably not best place
     terraform-lsp # TODO probably not best place
diff --git a/modules/binfmt/default.nix b/modules/binfmt/default.nix
index 4073776..b1f04cf 100644
--- a/modules/binfmt/default.nix
+++ b/modules/binfmt/default.nix
@@ -1,5 +1,5 @@
 {
-  boot.binfmt.emulatedSystems = ["i686-linux" "riscv64-linux"];
+  boot.binfmt.emulatedSystems = ["i686-linux" "aarch64-linux" "riscv64-linux"];
   nix.extraOptions = ''
     extra-platforms = aarch64-linux arm-linux i686-linux riscv64-linux
   '';
diff --git a/modules/hercules-ci/default.nix b/modules/hercules-ci/default.nix
index 6a8da22..dc861b1 100644
--- a/modules/hercules-ci/default.nix
+++ b/modules/hercules-ci/default.nix
@@ -2,7 +2,7 @@
   services.hercules-ci-agent = {
     enable = true;
     settings = {
-      concurrentTasks = 32;
+      concurrentTasks = "auto";
       clusterJoinTokenPath = config.age.secrets.hercules-ci-join-token.path;
       binaryCachesPath = config.age.secrets.hercules-ci-binary-caches.path;
       secretsJsonPath = config.age.secrets.hercules-ci-secrets-json.path;
diff --git a/modules/nix/default.nix b/modules/nix/default.nix
index 278e0f8..f0c669c 100644
--- a/modules/nix/default.nix
+++ b/modules/nix/default.nix
@@ -66,8 +66,8 @@
     };
 
     distributedBuilds = true;
-    buildMachines = [
-      {
+    buildMachines =
+      (lib.lists.optional (config.networking.hostName == "picard") {
         hostName = "sisko.fleet";
         system = "aarch64-linux";
         maxJobs = 4;
@@ -75,8 +75,8 @@
         protocol = "ssh-ng";
         sshUser = "root";
         sshKey = "/home/${config.ccr.username}/.ssh/id_rsa";
-      }
-      {
+      })
+      ++ (lib.lists.optional (config.networking.hostName == "picard") {
         hostName = "mac.staging.mlabs.city";
         system = "x86_64-darwin";
         maxJobs = 4;
@@ -84,7 +84,6 @@
         protocol = "ssh-ng";
         sshUser = "root";
         sshKey = "/home/${config.ccr.username}/.ssh/id_rsa";
-      }
-    ];
+      });
   };
 }