darwin/workmac: use nix 2.25

This is supposed to improve the performance of the git tarball cache.
This commit is contained in:
Trolli Schmittlauch 2025-03-18 11:50:16 +01:00
parent 151165cecd
commit 4ebcaa637e

View file

@ -2,20 +2,28 @@
{ {
imports = [ ../common/nix-settings.nix ]; imports = [ ../common/nix-settings.nix ];
nix.settings = { nix = {
trusted-users = [ enable = true;
"os" package = pkgs.nixVersions.nix_2_25;
"@admin" settings = {
]; # @admin for linux-builder trusted-users = [
substituters = [ "os"
"https://s3.whq.fcio.net/hydra" "@admin"
"https://hydra.flyingcircus.io" ]; # @admin for linux-builder
]; substituters = [
trusted-public-keys = [ "https://s3.whq.fcio.net/hydra"
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" "https://hydra.flyingcircus.io"
"flyingcircus.io-1:Rr9CwiPv8cdVf3EQu633IOTb6iJKnWbVfCC8x8gVz2o=" ];
]; trusted-public-keys = [
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
"flyingcircus.io-1:Rr9CwiPv8cdVf3EQu633IOTb6iJKnWbVfCC8x8gVz2o="
];
};
}; };
# Auto upgrade nix package and the daemon service.
services.nix-daemon.enable = true;
# List packages installed in system profile. To search by name, run: # List packages installed in system profile. To search by name, run:
# $ nix-env -qaP | grep wget # $ nix-env -qaP | grep wget
environment.systemPackages = [ pkgs.vim ]; environment.systemPackages = [ pkgs.vim ];
@ -24,10 +32,6 @@
# $ darwin-rebuild switch -I darwin-config=$HOME/.config/nixpkgs/darwin/configuration.nix # $ darwin-rebuild switch -I darwin-config=$HOME/.config/nixpkgs/darwin/configuration.nix
# environment.darwinConfig = "$HOME/.config/nixpkgs/darwin/configuration.nix"; # environment.darwinConfig = "$HOME/.config/nixpkgs/darwin/configuration.nix";
# Auto upgrade nix package and the daemon service.
services.nix-daemon.enable = true;
# nix.package = pkgs.nix;
# Create /etc/bashrc that loads the nix-darwin environment. # Create /etc/bashrc that loads the nix-darwin environment.
programs.zsh.enable = true; # default shell on catalina programs.zsh.enable = true; # default shell on catalina