diff --git a/machines/beef/default.nix b/machines/beef/default.nix index 250e2a5..2dd1c57 100644 --- a/machines/beef/default.nix +++ b/machines/beef/default.nix @@ -12,6 +12,9 @@ networking.hostName = "beef"; + # Determinate Nix manages its own daemon; disable nix-darwin nix management + nix.enable = false; + atelier.machine = { enable = true; type = "client"; diff --git a/modules/darwin/defaults.nix b/modules/darwin/defaults.nix index 6469f63..3560a21 100644 --- a/modules/darwin/defaults.nix +++ b/modules/darwin/defaults.nix @@ -1,6 +1,8 @@ { inputs, pkgs, + lib, + config, ... }: { @@ -34,9 +36,11 @@ "flakes" ]; - nix.package = pkgs.lixPackageSets.latest.lix; + # Nix installation management (only when nix-darwin manages nix) + # Machines using Determinate Nix should set nix.enable = false + nix.package = lib.mkIf config.nix.enable pkgs.lixPackageSets.latest.lix; - nix.gc = { + nix.gc = lib.mkIf config.nix.enable { automatic = true; interval = { Weekday = 0; @@ -45,7 +49,7 @@ }; options = "--delete-older-than 14d"; }; - nix.optimise.automatic = true; + nix.optimise.automatic = lib.mkIf config.nix.enable true; users.users.kierank = { name = "kierank";