Start refactoring
- remove emacs - remove inputs - trying to speed up evaluation - update inputs
This commit is contained in:
parent
0ab8805aa5
commit
2d3e4844b7
39 changed files with 808 additions and 1452 deletions
|
@ -32,12 +32,13 @@
|
|||
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
|
||||
"mlabs.cachix.org-1:gStKdEqNKcrlSQw5iMW6wFCj3+b+1ASpBVY2SYuNV2M="
|
||||
];
|
||||
# deprecated-features = [ "url-literals" ];
|
||||
};
|
||||
|
||||
nixPath = ["nixpkgs=${fleetFlake.inputs.nixpkgsUnstable}"];
|
||||
nixPath = ["nixpkgs=${fleetFlake.inputs.nixpkgs}"];
|
||||
|
||||
extraOptions = ''
|
||||
experimental-features = nix-command flakes ca-derivations impure-derivations
|
||||
experimental-features = nix-command flakes impure-derivations
|
||||
builders-use-substitutes = true
|
||||
'';
|
||||
|
||||
|
@ -50,19 +51,11 @@
|
|||
registry = lib.mkForce ({
|
||||
nixpkgs.to = {
|
||||
type = "path";
|
||||
path = fleetFlake.inputs.nixpkgsUnstable;
|
||||
};
|
||||
nixpkgsUnstable.to = {
|
||||
type = "path";
|
||||
path = fleetFlake.inputs.nixpkgsUnstable;
|
||||
};
|
||||
nixpkgsStable.to = {
|
||||
type = "path";
|
||||
path = fleetFlake.inputs.nixpkgsStable;
|
||||
path = fleetFlake.inputs.nixpkgs;
|
||||
};
|
||||
n.to = {
|
||||
type = "path";
|
||||
path = fleetFlake.inputs.nixpkgsUnstable;
|
||||
path = fleetFlake.inputs.nixpkgs;
|
||||
};
|
||||
}
|
||||
// (lib.optionalAttrs (builtins.hasAttr "ccr" config) {
|
||||
|
@ -92,11 +85,11 @@
|
|||
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?remote-program=/run/current-system/sw/bin/nix-store";
|
||||
system = "x86_64-darwin";
|
||||
maxJobs = 4;
|
||||
supportedFeatures = ["kvm" "nixos-test" "big-parallel" "benchmark"];
|
||||
protocol = "ssh-ng";
|
||||
protocol = "ssh";
|
||||
sshUser = "root";
|
||||
sshKey = "/home/${config.ccr.username}/.ssh/id_rsa";
|
||||
});
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue