From e2be04ddba52e527cf9338c74f8b221d32e590f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 15 Jul 2024 14:06:07 +0200 Subject: [PATCH] web01: use clan flake-parts module --- flake.nix | 1 + targets/flake-module.nix | 10 ++++------ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/flake.nix b/flake.nix index 438f34f..69e2a50 100644 --- a/flake.nix +++ b/flake.nix @@ -47,6 +47,7 @@ "aarch64-linux" ]; imports = [ + inputs.clan-core.flakeModules.default inputs.treefmt-nix.flakeModule ./devShells/flake-module.nix ./targets/flake-module.nix diff --git a/targets/flake-module.nix b/targets/flake-module.nix index 2478508..0d009a2 100644 --- a/targets/flake-module.nix +++ b/targets/flake-module.nix @@ -1,16 +1,14 @@ { self, inputs, ... }: { - flake = inputs.clan-core.lib.buildClan { + clan = { meta.name = "infra"; - directory = self; # Make flake available in modules specialArgs.self = { inherit (self) inputs nixosModules packages; }; - machines = { - web01 = { - imports = [ (./web01/configuration.nix) ]; - }; + directory = self; + machines.web01 = { + imports = [ ./web01/configuration.nix ]; }; }; }