From 5f4775ef10846f4c5413928f544670b39053a36e Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Thu, 26 Jun 2025 17:04:42 +0200 Subject: [PATCH] flake-parts: enable modules feature --- flake.nix | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/flake.nix b/flake.nix index 5fb51be50..f1b4568ff 100644 --- a/flake.nix +++ b/flake.nix @@ -63,27 +63,28 @@ clan = { meta.name = "clan-core"; }; - systems = import systems; imports = - # only importing existing paths allows to minimize the flake for test - # by removing files - filter pathExists [ - ./checks/flake-module.nix - ./clanModules/flake-module.nix - ./clanServices/flake-module.nix - ./devShell.nix - ./docs/nix/flake-module.nix - ./flakeModules/flake-module.nix - ./flakeModules/demo_iso.nix - ./lib/filter-clan-core/flake-module.nix - ./lib/flake-module.nix - ./lib/flake-parts/clan-nixos-test.nix - ./nixosModules/clanCore/vars/flake-module.nix - ./nixosModules/flake-module.nix - ./pkgs/flake-module.nix - ./templates/flake-module.nix - ] + [ flake-parts.flakeModules.modules ] + ++ + # only importing existing paths allows to minimize the flake for test + # by removing files + filter pathExists [ + ./checks/flake-module.nix + ./clanModules/flake-module.nix + ./clanServices/flake-module.nix + ./devShell.nix + ./docs/nix/flake-module.nix + ./flakeModules/flake-module.nix + ./flakeModules/demo_iso.nix + ./lib/filter-clan-core/flake-module.nix + ./lib/flake-module.nix + ./lib/flake-parts/clan-nixos-test.nix + ./nixosModules/clanCore/vars/flake-module.nix + ./nixosModules/flake-module.nix + ./pkgs/flake-module.nix + ./templates/flake-module.nix + ] ++ [ (if pathExists ./flakeModules/clan.nix then import ./flakeModules/clan.nix inputs.self else { }) ]