From bb0ce9ddd360e8d86b1091927074ba8c5fe86315 Mon Sep 17 00:00:00 2001 From: Artem Sheremet Date: Sun, 17 May 2026 14:20:49 +0000 Subject: [PATCH] Use isDarwin rather than checking if option exists .interval options exist in Darwin, only to tell you that you can not use them. --- modules/nix-gc.nix | 12 +++++++----- modules/nix-settings.nix | 12 +++++++----- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/modules/nix-gc.nix b/modules/nix-gc.nix index c0264ce..c167017 100644 --- a/modules/nix-gc.nix +++ b/modules/nix-gc.nix @@ -1,15 +1,17 @@ -{ lib, options, ... }: +{ + lib, + pkgs, + ... +}: { nix.gc = { automatic = true; options = "--delete-older-than 60d"; } - // lib.optionalAttrs (options.nix.gc ? dates) { - # NixOS + // lib.optionalAttrs (!pkgs.stdenv.isDarwin) { dates = lib.mkDefault "00:15"; } - // lib.optionalAttrs (options.nix.gc ? interval) { - # Darwin + // lib.optionalAttrs pkgs.stdenv.isDarwin { interval = lib.mkDefault { Hour = 0; Minute = 15; diff --git a/modules/nix-settings.nix b/modules/nix-settings.nix index 28a9fc2..10854c1 100644 --- a/modules/nix-settings.nix +++ b/modules/nix-settings.nix @@ -1,4 +1,8 @@ -{ lib, options, ... }: +{ + lib, + pkgs, + ... +}: { nix.settings = { extra-experimental-features = [ @@ -17,12 +21,10 @@ # build. automatic = true; } - // lib.optionalAttrs (options.nix.optimise ? dates) { - # NixOS + // lib.optionalAttrs (!pkgs.stdenv.isDarwin) { dates = lib.mkDefault "00:45"; } - // lib.optionalAttrs (options.nix.optimise ? interval) { - # Darwin + // lib.optionalAttrs pkgs.stdenv.isDarwin { interval = lib.mkDefault { Hour = 0; Minute = 45;