From 7800545ddb39fc0eec43c88ebebdc95f46b9afb1 Mon Sep 17 00:00:00 2001 From: Igor Rzegocki Date: Mon, 4 Nov 2024 00:08:40 +0100 Subject: [PATCH] chore: expose system and hardware in flake --- flake.nix | 9 +++++++++ modules/system/apps/docker/default.nix | 2 +- modules/system/backup.nix | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 9a34609..97e4f72 100644 --- a/flake.nix +++ b/flake.nix @@ -79,5 +79,14 @@ ./local ./machines ]; + } + // { + nixlab = { + system = ./modules/system; + hardware = { + incus = ./modules/hardware/incus.nix; + ms-01 = ./modules/hardware/ms-01.nix; + }; + }; }; } diff --git a/modules/system/apps/docker/default.nix b/modules/system/apps/docker/default.nix index d567e0e..f4ef81c 100644 --- a/modules/system/apps/docker/default.nix +++ b/modules/system/apps/docker/default.nix @@ -93,7 +93,7 @@ in config = lib.mkIf cfg.enable { assertions = [ { - assertion = (!cfg.rootless) && cfg.startDockerSockProxy; + assertion = (!cfg.rootless) || (!cfg.startDockerSockProxy); message = "docker.sock proxy is currently only supported in root mode"; } ]; diff --git a/modules/system/backup.nix b/modules/system/backup.nix index d30fa9c..0bfee68 100644 --- a/modules/system/backup.nix +++ b/modules/system/backup.nix @@ -43,6 +43,7 @@ in }; } ); + default = [ ]; }; snapshotMountPath = lib.mkOption { type = lib.types.str;