flake: remove linux builder
This commit is contained in:
parent
b106ae96a9
commit
c925c9ae71
3 changed files with 35 additions and 47 deletions
20
justfile
20
justfile
|
@ -1,17 +1,25 @@
|
||||||
switch attic="false":
|
switch attic="false":
|
||||||
|
#!/usr/bin/env bash
|
||||||
nix-channel --update
|
nix-channel --update
|
||||||
nix flake update --flake ./nix/.
|
nix flake update --flake ./nix/.
|
||||||
sudo darwin-rebuild switch --verbose --flake ./nix/.
|
sudo darwin-rebuild switch --verbose --flake ./nix/.
|
||||||
if [ "{{attic}}" = "true" ]; then just attic; fi
|
if [ "{{attic}}" = "true" ]; then
|
||||||
|
just attic
|
||||||
|
just clean
|
||||||
|
fi
|
||||||
|
|
||||||
update attic="false":
|
update attic="false":
|
||||||
|
#!/usr/bin/env bash
|
||||||
nix-channel --update
|
nix-channel --update
|
||||||
sudo darwin-rebuild switch --verbose --flake ./nix/.
|
sudo darwin-rebuild switch --verbose --flake ./nix/.
|
||||||
if [ "{{attic}}" = "true" ]; then just attic; fi
|
if [ "{{attic}}" = "true" ]; then
|
||||||
|
just attic
|
||||||
|
just clean
|
||||||
|
fi
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
sudo nix-collect-garbage -d -k
|
sudo nix-collect-garbage -d -k
|
||||||
cargo clean-all -y ~/Desktop/Stuff/Programing/
|
cargo clean-all -d 7 -y ~/Desktop/Stuff/Programing/
|
||||||
rm -r ~/.cache/huggingface/hub/* || true
|
rm -r ~/.cache/huggingface/hub/* || true
|
||||||
|
|
||||||
attic:
|
attic:
|
||||||
|
@ -47,11 +55,13 @@ dot:
|
||||||
zed ~/.config/nix/nix.conf
|
zed ~/.config/nix/nix.conf
|
||||||
|
|
||||||
rc:
|
rc:
|
||||||
|
just hetzner
|
||||||
just rclone
|
just rclone
|
||||||
just rclone-proton
|
just rclone-proton
|
||||||
|
|
||||||
rclone:
|
rclone:
|
||||||
rclone sync -v /Users/elijahmcmorris/Desktop/Stuff/Excel tower:main/Excel
|
rclone sync -v /Users/elijahmcmorris/Desktop/Stuff/Excel tower:main/Excel
|
||||||
|
rclone sync -v /Users/elijahmcmorris/Desktop/Stuff/Pic tower:main/Pic
|
||||||
rclone sync -v /Users/elijahmcmorris/.cache/lm-studio/models tower:lm-studio/models
|
rclone sync -v /Users/elijahmcmorris/.cache/lm-studio/models tower:lm-studio/models
|
||||||
|
|
||||||
rclone-proton:
|
rclone-proton:
|
||||||
|
@ -60,6 +70,10 @@ rclone-proton:
|
||||||
wikidata:
|
wikidata:
|
||||||
rclone copyto -v tower:main/latest-all.json.bz2 /Users/elijahmcmorris/Desktop/Stuff/Programing/nextrack/data/latest-all.json.bz2
|
rclone copyto -v tower:main/latest-all.json.bz2 /Users/elijahmcmorris/Desktop/Stuff/Programing/nextrack/data/latest-all.json.bz2
|
||||||
|
|
||||||
|
hetzner:
|
||||||
|
rclone sync -v hetzner:NexVeridian/minecraft-data-vanilla /Users/elijahmcmorris/Desktop/Stuff/Excel/!Other/hetzner/minecraft-data-vanilla
|
||||||
|
rclone sync -v hetzner:NexVeridian/data/parquet /Users/elijahmcmorris/Desktop/Stuff/Excel/!Other/hetzner/data/parquet
|
||||||
|
|
||||||
docker:
|
docker:
|
||||||
# colima stop
|
# colima stop
|
||||||
# colima start --cpu 2 --memory 4
|
# colima start --cpu 2 --memory 4
|
||||||
|
|
18
nix/flake.lock
generated
18
nix/flake.lock
generated
|
@ -7,11 +7,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1748998583,
|
"lastModified": 1751313918,
|
||||||
"narHash": "sha256-X8kkfgfqdYa/sqGpMdDkrLytS6mj89PJW+x22+r29Yg=",
|
"narHash": "sha256-HsJM3XLa43WpG+665aGEh8iS8AfEwOIQWk3Mke3e7nk=",
|
||||||
"owner": "LnL7",
|
"owner": "LnL7",
|
||||||
"repo": "nix-darwin",
|
"repo": "nix-darwin",
|
||||||
"rev": "d46a07214fc25b6313f2ea3ba789cd7ff036aeb2",
|
"rev": "e04a388232d9a6ba56967ce5b53a8a6f713cdfcf",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -80,11 +80,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1748856973,
|
"lastModified": 1752077645,
|
||||||
"narHash": "sha256-RlTsJUvvr8ErjPBsiwrGbbHYW8XbB/oek0Gi78XdWKg=",
|
"narHash": "sha256-HM791ZQtXV93xtCY+ZxG1REzhQenSQO020cu6rHtAPk=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "e4b09e47ace7d87de083786b404bf232eb6c89d8",
|
"rev": "be9e214982e20b8310878ac2baa063a961c1bdf6",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -109,11 +109,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1749004659,
|
"lastModified": 1752461263,
|
||||||
"narHash": "sha256-zaZrcC5UwHPGkgfnhTPx5sZfSSnUJdvYHhgex10RadQ=",
|
"narHash": "sha256-f4XVgqkWF1vSzPbOG5xvi4aAd/n1GwSNsji3mLMFwYQ=",
|
||||||
"owner": "oxalica",
|
"owner": "oxalica",
|
||||||
"repo": "rust-overlay",
|
"repo": "rust-overlay",
|
||||||
"rev": "c52e346aedfa745564599558a096e88f9a5557f9",
|
"rev": "9cc51d100d24fb7ea13a0bee1480ee84fa12a0ad",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -43,11 +43,14 @@
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
# keepassxc
|
# keepassxc
|
||||||
raycast
|
raycast
|
||||||
# modrinth-app
|
|
||||||
rclone
|
rclone
|
||||||
keka
|
keka
|
||||||
# yt-dlp
|
yt-dlp
|
||||||
# zoom-us
|
zoom-us
|
||||||
|
teams
|
||||||
|
|
||||||
|
# game
|
||||||
|
modrinth-app
|
||||||
|
|
||||||
# dev
|
# dev
|
||||||
attic-client
|
attic-client
|
||||||
|
@ -103,6 +106,8 @@
|
||||||
cargo-edit
|
cargo-edit
|
||||||
cargo-update
|
cargo-update
|
||||||
cargo-binstall
|
cargo-binstall
|
||||||
|
cargo-machete
|
||||||
|
|
||||||
sea-orm-cli
|
sea-orm-cli
|
||||||
bacon
|
bacon
|
||||||
zola
|
zola
|
||||||
|
@ -127,7 +132,6 @@
|
||||||
|
|
||||||
# nix
|
# nix
|
||||||
nixpkgs-review
|
nixpkgs-review
|
||||||
# nixpacks
|
|
||||||
nix-fast-build
|
nix-fast-build
|
||||||
|
|
||||||
# k8s
|
# k8s
|
||||||
|
@ -138,6 +142,7 @@
|
||||||
|
|
||||||
nix = {
|
nix = {
|
||||||
distributedBuilds = true;
|
distributedBuilds = true;
|
||||||
|
optimise.automatic = true;
|
||||||
|
|
||||||
settings = {
|
settings = {
|
||||||
max-jobs = 32;
|
max-jobs = 32;
|
||||||
|
@ -154,19 +159,6 @@
|
||||||
"elijahmcmorris"
|
"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 =
|
system.activationScripts.applications.text =
|
||||||
|
@ -219,24 +211,6 @@
|
||||||
darwinConfigurations."Elijahs-MacBook-Pro" = nix-darwin.lib.darwinSystem {
|
darwinConfigurations."Elijahs-MacBook-Pro" = nix-darwin.lib.darwinSystem {
|
||||||
modules = [
|
modules = [
|
||||||
configuration
|
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