From cfbb58e45507902fa15a69edd9d8d9a813912ad3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikodem=20Rabuli=C5=84ski?= Date: Tue, 23 Jul 2024 20:11:50 +0200 Subject: [PATCH] treewide: small darwin improvements --- hosts/default.nix | 1 + modules/system/common/incus.nix | 2 +- modules/system/settei/containers.nix | 4 +++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/hosts/default.nix b/hosts/default.nix index 24063a8..1f1ab38 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -74,6 +74,7 @@ in { system = eval.config.system.build.toplevel; + inherit eval; }; }; } diff --git a/modules/system/common/incus.nix b/modules/system/common/incus.nix index c71dd78..57140d3 100644 --- a/modules/system/common/incus.nix +++ b/modules/system/common/incus.nix @@ -69,7 +69,7 @@ in type = types.bool; default = !isLinux; }; - package = lib.mkPackageOption pkgs "incus" { }; + package = lib.mkPackageOption pkgs "incus-lts" { }; clientPackage = lib.mkOption { type = types.package; default = cfg.package.client; diff --git a/modules/system/settei/containers.nix b/modules/system/settei/containers.nix index 58c7184..a0942f9 100644 --- a/modules/system/settei/containers.nix +++ b/modules/system/settei/containers.nix @@ -98,7 +98,9 @@ let }; darwinConfig = lib.optionalAttrs (!isLinux) { - warnings = lib.optional options.settei.containers.isDefined "settei.containers doesn't do anything on darwin yet"; + warnings = lib.optional ( + config.settei.containers != { } + ) "settei.containers doesn't do anything on darwin yet"; }; in {