From bf9e3a044b0adc153d45c95b8d447eed474d273d Mon Sep 17 00:00:00 2001 From: Evan Reichard Date: Sat, 8 Nov 2025 11:32:50 -0500 Subject: [PATCH] fix: determinate nix + nix darwin --- modules/darwin/nix/default.nix | 5 +++-- .../aarch64-darwin/mac-va-mbp-personal/default.nix | 11 ++++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/modules/darwin/nix/default.nix b/modules/darwin/nix/default.nix index e031ff4..3adffcd 100644 --- a/modules/darwin/nix/default.nix +++ b/modules/darwin/nix/default.nix @@ -8,6 +8,7 @@ in { options.${namespace}.nix = { enable = mkBoolOpt true "Whether or not to manage nix configuration."; + usingDeterminate = mkBoolOpt false "Whether we're using determinate nix"; package = mkOpt types.package pkgs.nixVersions.latest "Which nix package to use."; }; @@ -48,11 +49,11 @@ in checkConfig = true; distributedBuilds = true; - optimise.automatic = true; + optimise.automatic = !cfg.usingDeterminate; registry = lib.mkForce mappedRegistry; gc = { - automatic = true; + automatic = !cfg.usingDeterminate; options = "--delete-older-than 7d"; }; diff --git a/systems/aarch64-darwin/mac-va-mbp-personal/default.nix b/systems/aarch64-darwin/mac-va-mbp-personal/default.nix index 09e8b22..c57fc25 100644 --- a/systems/aarch64-darwin/mac-va-mbp-personal/default.nix +++ b/systems/aarch64-darwin/mac-va-mbp-personal/default.nix @@ -1,13 +1,14 @@ -{ namespace, lib, ... }: -let - inherit (lib.${namespace}) enabled; -in +{ lib, ... }: { system.stateVersion = 6; + nix.enable = false; # System Config reichard = { - nix = enabled; + nix = { + enable = true; + usingDeterminate = true; + }; security = { sops = {