From f8d8753cd7cdf81e2a88abb4bcdf3739399eff5d Mon Sep 17 00:00:00 2001 From: seth Date: Sat, 10 Feb 2024 19:02:50 -0500 Subject: modules: flatten imports --- modules/flake/configurations.nix | 1 + modules/flake/default.nix | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'modules/flake') diff --git a/modules/flake/configurations.nix b/modules/flake/configurations.nix index 78a5033..d9406db 100644 --- a/modules/flake/configurations.nix +++ b/modules/flake/configurations.nix @@ -146,6 +146,7 @@ in { (mkAliasOptionModule ["nixosModules"] ["flake" "nixosModules"]) (mkAliasOptionModule ["darwinModules"] ["flake" "darwinModules"]) (mkAliasOptionModule ["homeModules"] ["flake" "homeModules"]) + (mkAliasOptionModule ["flakeModules"] ["flake" "flakeModules"]) ]; options = { diff --git a/modules/flake/default.nix b/modules/flake/default.nix index 8730f01..c653708 100644 --- a/modules/flake/default.nix +++ b/modules/flake/default.nix @@ -1,6 +1,4 @@ { - flake.flakeModules = { - configurations = import ./configurations.nix; - terranix = import ./terranix.nix; - }; + configurations = import ./configurations.nix; + terranix = import ./terranix.nix; } -- cgit v1.2.3