all repos — nixfiles @ 0ec102440b3cff35cb1238f8298b982b2e01d35d

System and user configuration, managed by nix and home-manager

re-add nix-rosetta-builder (for smrk)

Alin
commit

0ec102440b3cff35cb1238f8298b982b2e01d35d

parent

d7d9a123107b44b857db72c2a55e57e2d9bde2b8

3 files changed, 35 insertions(+), 6 deletions(-)

changed files
M flake.lock → flake.lock
@@ -975,12 +975,33 @@ "nixpkgs"
], "nixvim": "nixvim", "nur": "nur", + "rosetta-builder": "rosetta-builder", "scriptura": "scriptura", "searchix": "searchix", "srvos": "srvos", "stylix": "stylix", "tg-auth": "tg-auth", "vpsadminos": "vpsadminos" + } + }, + "rosetta-builder": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1770491098, + "narHash": "sha256-ZfhynJqgV3A9hEivcgOEZa+TZnJPc26lIUjzKsSchgI=", + "owner": "cpick", + "repo": "nix-rosetta-builder", + "rev": "50e6070082e0b4fbaf67dd8f346892a1a9ed685c", + "type": "github" + }, + "original": { + "owner": "cpick", + "repo": "nix-rosetta-builder", + "type": "github" } }, "scriptura": {
M flake.nix → flake.nix
@@ -21,6 +21,10 @@ home-manager = {
url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; + rosetta-builder = { + url = "github:cpick/nix-rosetta-builder"; + inputs.nixpkgs.follows = "nixpkgs"; + }; nur = { url = "github:nix-community/nur"; inputs.nixpkgs.follows = "nixpkgs";
@@ -169,6 +173,7 @@ nixpkgs.overlays = [
angrr.overlays.default ]; } + rosetta-builder.darwinModules.default srvos.darwinModules.desktop angrr.darwinModules.angrr ./system/hosts/marvin.nix
M system/hosts/marvin.nix → system/hosts/marvin.nix
@@ -92,13 +92,16 @@ cores = 8;
}; nix.linux-builder = { + enable = false; # will be needed for building the rosetta image + systems = [ "aarch64-linux" ]; + speedFactor = 8; + }; + + nix-rosetta-builder = { enable = true; - systems = [ - "aarch64-linux" - ]; + memory = "8GiB"; + onDemand = true; + onDemandLingerMinutes = 180; speedFactor = 8; - config = { - virtualisation.cores = 4; - }; }; }