flake: remove linux builder
This commit is contained in:
parent
b106ae96a9
commit
c925c9ae71
3 changed files with 35 additions and 47 deletions
18
nix/flake.lock
generated
18
nix/flake.lock
generated
|
@ -7,11 +7,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1748998583,
|
||||
"narHash": "sha256-X8kkfgfqdYa/sqGpMdDkrLytS6mj89PJW+x22+r29Yg=",
|
||||
"lastModified": 1751313918,
|
||||
"narHash": "sha256-HsJM3XLa43WpG+665aGEh8iS8AfEwOIQWk3Mke3e7nk=",
|
||||
"owner": "LnL7",
|
||||
"repo": "nix-darwin",
|
||||
"rev": "d46a07214fc25b6313f2ea3ba789cd7ff036aeb2",
|
||||
"rev": "e04a388232d9a6ba56967ce5b53a8a6f713cdfcf",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -80,11 +80,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1748856973,
|
||||
"narHash": "sha256-RlTsJUvvr8ErjPBsiwrGbbHYW8XbB/oek0Gi78XdWKg=",
|
||||
"lastModified": 1752077645,
|
||||
"narHash": "sha256-HM791ZQtXV93xtCY+ZxG1REzhQenSQO020cu6rHtAPk=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "e4b09e47ace7d87de083786b404bf232eb6c89d8",
|
||||
"rev": "be9e214982e20b8310878ac2baa063a961c1bdf6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -109,11 +109,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1749004659,
|
||||
"narHash": "sha256-zaZrcC5UwHPGkgfnhTPx5sZfSSnUJdvYHhgex10RadQ=",
|
||||
"lastModified": 1752461263,
|
||||
"narHash": "sha256-f4XVgqkWF1vSzPbOG5xvi4aAd/n1GwSNsji3mLMFwYQ=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "c52e346aedfa745564599558a096e88f9a5557f9",
|
||||
"rev": "9cc51d100d24fb7ea13a0bee1480ee84fa12a0ad",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
@ -43,11 +43,14 @@
|
|||
environment.systemPackages = with pkgs; [
|
||||
# keepassxc
|
||||
raycast
|
||||
# modrinth-app
|
||||
rclone
|
||||
keka
|
||||
# yt-dlp
|
||||
# zoom-us
|
||||
yt-dlp
|
||||
zoom-us
|
||||
teams
|
||||
|
||||
# game
|
||||
modrinth-app
|
||||
|
||||
# dev
|
||||
attic-client
|
||||
|
@ -103,6 +106,8 @@
|
|||
cargo-edit
|
||||
cargo-update
|
||||
cargo-binstall
|
||||
cargo-machete
|
||||
|
||||
sea-orm-cli
|
||||
bacon
|
||||
zola
|
||||
|
@ -127,7 +132,6 @@
|
|||
|
||||
# nix
|
||||
nixpkgs-review
|
||||
# nixpacks
|
||||
nix-fast-build
|
||||
|
||||
# k8s
|
||||
|
@ -138,6 +142,7 @@
|
|||
|
||||
nix = {
|
||||
distributedBuilds = true;
|
||||
optimise.automatic = true;
|
||||
|
||||
settings = {
|
||||
max-jobs = 32;
|
||||
|
@ -154,19 +159,6 @@
|
|||
"elijahmcmorris"
|
||||
];
|
||||
};
|
||||
|
||||
# https://github.com/nix-darwin/nix-darwin/issues/1192#issuecomment-2619629531
|
||||
linux-builder = {
|
||||
enable = true;
|
||||
systems = [
|
||||
"x86_64-linux"
|
||||
"aarch64-linux"
|
||||
];
|
||||
# config = {
|
||||
# virtualisation.cores = 16;
|
||||
# boot.binfmt.emulatedSystems = [ "x86_64-linux" ];
|
||||
# };
|
||||
};
|
||||
};
|
||||
|
||||
system.activationScripts.applications.text =
|
||||
|
@ -219,24 +211,6 @@
|
|||
darwinConfigurations."Elijahs-MacBook-Pro" = nix-darwin.lib.darwinSystem {
|
||||
modules = [
|
||||
configuration
|
||||
|
||||
# An existing Linux builder is needed to initially bootstrap `nix-rosetta-builder`.
|
||||
# If one isn't already available: comment out the `nix-rosetta-builder` module below,
|
||||
# uncomment this `linux-builder` module, and run `darwin-rebuild switch`:
|
||||
# { nix.linux-builder.enable = true; }
|
||||
# Then: uncomment `nix-rosetta-builder`, remove `linux-builder`, and `darwin-rebuild switch`
|
||||
# a second time. Subsequently, `nix-rosetta-builder` can rebuild itself.
|
||||
nix-rosetta-builder.darwinModules.default
|
||||
{
|
||||
# see available options in module.nix's `options.nix-rosetta-builder`
|
||||
# https://github.com/cpick/nix-rosetta-builder/blob/main/module.nix
|
||||
nix-rosetta-builder = {
|
||||
cores = 16;
|
||||
memory = "16GiB";
|
||||
onDemand = true;
|
||||
onDemandLingerMinutes = 1;
|
||||
};
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue