From e727e435f50027c30d3311020c64ead42c146d66 Mon Sep 17 00:00:00 2001 From: seth Date: Wed, 17 May 2023 02:24:49 -0400 Subject: flake-modules: remove flakeModule it already exists https://flake.parts/options/flake-parts-flakemodules --- flake.nix | 1 - modules/flake/default.nix | 1 - modules/flake/flakeModules.nix | 25 ------------------------- 3 files changed, 27 deletions(-) delete mode 100644 modules/flake/flakeModules.nix diff --git a/flake.nix b/flake.nix index d8e4e91..9fb4959 100644 --- a/flake.nix +++ b/flake.nix @@ -39,7 +39,6 @@ in { flakeModules = { default = import ./modules/flake; - flakeModules = import ./modules/flake/flakeModules.nix; homeConfigurations = import ./modules/flake/homeConfigurations.nix; }; diff --git a/modules/flake/default.nix b/modules/flake/default.nix index c3de095..8bda4e4 100644 --- a/modules/flake/default.nix +++ b/modules/flake/default.nix @@ -1,6 +1,5 @@ _: { imports = [ - ./flakeModules.nix ./homeConfigurations.nix ]; } diff --git a/modules/flake/flakeModules.nix b/modules/flake/flakeModules.nix deleted file mode 100644 index 8c27e9f..0000000 --- a/modules/flake/flakeModules.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ - self, - lib, - flake-parts-lib, - ... -}: let - inherit (lib) mapAttrs mkOption types; - inherit (flake-parts-lib) mkSubmoduleOptions; -in { - options = { - flake = mkSubmoduleOptions { - flakeModules = mkOption { - type = types.lazyAttrsOf types.unspecified; - default = {}; - apply = mapAttrs (k: v: { - _file = "${toString self.outPath}/flake.nix#flakeModules.${k}"; - imports = [v]; - }); - description = '' - flake-parts modules - ''; - }; - }; - }; -} -- cgit v1.2.3