diff options
Diffstat (limited to '')
| -rw-r--r-- | nix/machines/darwin/aarch64-darwin/hq-kwny2vh41p.nix | 37 | ||||
| -rw-r--r-- | nix/machines/darwin/aarch64-darwin/mba-m2.nix | 35 | ||||
| -rw-r--r-- | nix/profiles/nix.nix | 47 |
3 files changed, 49 insertions, 70 deletions
diff --git a/nix/machines/darwin/aarch64-darwin/hq-kwny2vh41p.nix b/nix/machines/darwin/aarch64-darwin/hq-kwny2vh41p.nix index 42300a9..dd38c6f 100644 --- a/nix/machines/darwin/aarch64-darwin/hq-kwny2vh41p.nix +++ b/nix/machines/darwin/aarch64-darwin/hq-kwny2vh41p.nix @@ -9,49 +9,14 @@ imports = [ "${self}/nix/profiles/home-manager.nix" "${self}/nix/profiles/darwin.nix" + "${self}/nix/profiles/nix.nix" ]; - nix = { - extraOptions = '' - tarball-ttl = 900 - ''; - gc = { - automatic = true; - interval = { - Weekday = 0; - Hour = 0; - Minute = 0; - }; - options = "--delete-older-than 30d"; - }; - package = pkgs.nixVersions.stable; - settings = { - substituters = [ - "https://cache.nixos.org" - "https://nix-community.cachix.org" - ]; - trusted-public-keys = [ - "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" - "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - ]; - trusted-users = [ - "@admin" - "fcuny" - ]; - experimental-features = [ - "nix-command" - "flakes" - ]; - }; - }; - system.primaryUser = adminUser.name; # https://github.com/nix-darwin/nix-darwin/issues/1339 ids.gids.nixbld = 30000; - networking.hostName = "mba-m2"; - fonts.packages = with pkgs; [ source-code-pro ]; diff --git a/nix/machines/darwin/aarch64-darwin/mba-m2.nix b/nix/machines/darwin/aarch64-darwin/mba-m2.nix index ce481cb..a97327b 100644 --- a/nix/machines/darwin/aarch64-darwin/mba-m2.nix +++ b/nix/machines/darwin/aarch64-darwin/mba-m2.nix @@ -8,42 +8,9 @@ imports = [ "${self}/nix/profiles/home-manager.nix" "${self}/nix/profiles/darwin.nix" + "${self}/nix/profiles/nix.nix" ]; - nix = { - extraOptions = '' - tarball-ttl = 900 - ''; - gc = { - automatic = true; - interval = { - Weekday = 0; - Hour = 0; - Minute = 0; - }; - options = "--delete-older-than 30d"; - }; - package = pkgs.nixVersions.stable; - settings = { - substituters = [ - "https://cache.nixos.org" - "https://nix-community.cachix.org" - ]; - trusted-public-keys = [ - "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" - "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - ]; - trusted-users = [ - "@admin" - "fcuny" - ]; - experimental-features = [ - "nix-command" - "flakes" - ]; - }; - }; - system.primaryUser = adminUser.name; # https://github.com/nix-darwin/nix-darwin/issues/1339 diff --git a/nix/profiles/nix.nix b/nix/profiles/nix.nix new file mode 100644 index 0000000..acfe151 --- /dev/null +++ b/nix/profiles/nix.nix @@ -0,0 +1,47 @@ +{ lib, pkgs, ... }: +{ + nix = { + extraOptions = '' + tarball-ttl = 900 + ''; + gc = { + automatic = true; + options = "--delete-older-than 7d"; + interval = { + Weekday = 0; + Hour = 0; + Minute = 0; + }; + }; + optimise = { + automatic = true; + interval = { + Weekday = 0; + Hour = 0; + Minute = 0; + }; + }; + package = pkgs.nixVersions.stable; + settings = { + trusted-substituters = [ + "https://cachix.cachix.org" + "https://nixpkgs.cachix.org" + "https://nix-community.cachix.org" + ]; + trusted-public-keys = [ + "cachix.cachix.org-1:eWNHQldwUO7G2VkjpnjDbWwy4KQ/HNxht7H4SSoMckM=" + "nixpkgs.cachix.org-1:q91R6hxbwFvDqTSDKwDAV4T5PxqXGxswD8vhONFMeOE=" + "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" + "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + ]; + trusted-users = [ + "@admin" + "fcuny" + ]; + experimental-features = lib.mkDefault [ + "nix-command" + "flakes" + ]; + }; + }; +} |