aciceri/nixfleet
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Things

Browse source
This commit is contained in:
Andrea Ciceri 2024-01-28 14:39:09 +01:00
parent 30ca703476
commit 4faa251a6e
Signed by: aciceri
SSH key fingerprint: SHA256:/AagBweyV4Hlfg9u092n8hbHwD5fcB6A3qhDiDA65Rg
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
hmModules/shell/default.nix
View file

@ -201,7 +201,8 @@
lsof lsof
zsh-completions zsh-completions
nix-zsh-completions nix-zsh-completions
carapace # used by nushell comma
# carapace # used by nushell
nil # TODO probably not best place nil # TODO probably not best place
nixd # TODO probably not best place nixd # TODO probably not best place
terraform-lsp # TODO probably not best place terraform-lsp # TODO probably not best place

2
modules/binfmt/default.nix
View file

@ -1,5 +1,5 @@
{ {
boot.binfmt.emulatedSystems = ["i686-linux" "riscv64-linux"]; boot.binfmt.emulatedSystems = ["i686-linux" "aarch64-linux" "riscv64-linux"];
nix.extraOptions = '' nix.extraOptions = ''
extra-platforms = aarch64-linux arm-linux i686-linux riscv64-linux extra-platforms = aarch64-linux arm-linux i686-linux riscv64-linux
''; '';

2
modules/hercules-ci/default.nix
View file

@ -2,7 +2,7 @@
services.hercules-ci-agent = { services.hercules-ci-agent = {
enable = true; enable = true;
settings = { settings = {
concurrentTasks = 32; concurrentTasks = "auto";
clusterJoinTokenPath = config.age.secrets.hercules-ci-join-token.path; clusterJoinTokenPath = config.age.secrets.hercules-ci-join-token.path;
binaryCachesPath = config.age.secrets.hercules-ci-binary-caches.path; binaryCachesPath = config.age.secrets.hercules-ci-binary-caches.path;
secretsJsonPath = config.age.secrets.hercules-ci-secrets-json.path; secretsJsonPath = config.age.secrets.hercules-ci-secrets-json.path;

11
modules/nix/default.nix
View file

@ -66,8 +66,8 @@
}; };
distributedBuilds = true; distributedBuilds = true;
buildMachines = [ buildMachines =
{ (lib.lists.optional (config.networking.hostName == "picard") {
hostName = "sisko.fleet"; hostName = "sisko.fleet";
system = "aarch64-linux"; system = "aarch64-linux";
maxJobs = 4; maxJobs = 4;
@ -75,8 +75,8 @@
protocol = "ssh-ng"; protocol = "ssh-ng";
sshUser = "root"; sshUser = "root";
sshKey = "/home/${config.ccr.username}/.ssh/id_rsa"; sshKey = "/home/${config.ccr.username}/.ssh/id_rsa";
} })
{ ++ (lib.lists.optional (config.networking.hostName == "picard") {
hostName = "mac.staging.mlabs.city"; hostName = "mac.staging.mlabs.city";
system = "x86_64-darwin"; system = "x86_64-darwin";
maxJobs = 4; maxJobs = 4;
@ -84,7 +84,6 @@
protocol = "ssh-ng"; protocol = "ssh-ng";
sshUser = "root"; sshUser = "root";
sshKey = "/home/${config.ccr.username}/.ssh/id_rsa"; sshKey = "/home/${config.ccr.username}/.ssh/id_rsa";
} });
];
}; };
} }