evan/nix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: determinate nix + nix darwin

Browse Source
This commit is contained in:
Evan Reichard 2025-11-08 11:32:50 -05:00
parent 56921235b3
commit bf9e3a044b
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/darwin/nix/default.nix
View File

@ -8,6 +8,7 @@ in
{ {
options.${namespace}.nix = { options.${namespace}.nix = {
enable = mkBoolOpt true "Whether or not to manage nix configuration."; 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."; package = mkOpt types.package pkgs.nixVersions.latest "Which nix package to use.";
}; };
@ -48,11 +49,11 @@ in
checkConfig = true; checkConfig = true;
distributedBuilds = true; distributedBuilds = true;
optimise.automatic = true; optimise.automatic = !cfg.usingDeterminate;
registry = lib.mkForce mappedRegistry; registry = lib.mkForce mappedRegistry;
gc = { gc = {
automatic = true; automatic = !cfg.usingDeterminate;
options = "--delete-older-than 7d"; options = "--delete-older-than 7d";
}; };

11
systems/aarch64-darwin/mac-va-mbp-personal/default.nix
View File

@ -1,13 +1,14 @@
{ namespace, lib, ... }: { lib, ... }:
let
inherit (lib.${namespace}) enabled;
in
{ {
system.stateVersion = 6; system.stateVersion = 6;
nix.enable = false;
# System Config # System Config
reichard = { reichard = {
nix = enabled; nix = {
enable = true;
usingDeterminate = true;
};
security = { security = {
sops = { sops = {