From 7f0fc889fe86da20ab0d36ea9ea09c0085a4acfb Mon Sep 17 00:00:00 2001 From: Yusuf Bera Ertan Date: Mon, 3 Oct 2022 15:08:54 +0300 Subject: [PATCH] refactor: reorganize discoverer modules --- src/modules/discoverers.default-discoverer/default.nix | 3 +++ .../implementation.nix} | 0 src/modules/discoverers/default.nix | 1 - src/modules/discoverers/interface.nix | 2 +- .../discoverer => interfaces.discoverer}/default.nix | 0 .../discoverer => interfaces.discoverer}/interface.nix | 0 src/modules/top-level.nix | 1 + 7 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 src/modules/discoverers.default-discoverer/default.nix rename src/modules/{discoverers/default-discoverer.nix => discoverers.default-discoverer/implementation.nix} (100%) rename src/modules/{discoverers/discoverer => interfaces.discoverer}/default.nix (100%) rename src/modules/{discoverers/discoverer => interfaces.discoverer}/interface.nix (100%) diff --git a/src/modules/discoverers.default-discoverer/default.nix b/src/modules/discoverers.default-discoverer/default.nix new file mode 100644 index 00000000..5117a20b --- /dev/null +++ b/src/modules/discoverers.default-discoverer/default.nix @@ -0,0 +1,3 @@ +{ + imports = [./implementation.nix]; +} diff --git a/src/modules/discoverers/default-discoverer.nix b/src/modules/discoverers.default-discoverer/implementation.nix similarity index 100% rename from src/modules/discoverers/default-discoverer.nix rename to src/modules/discoverers.default-discoverer/implementation.nix diff --git a/src/modules/discoverers/default.nix b/src/modules/discoverers/default.nix index 8b0cb1ba..274989a4 100644 --- a/src/modules/discoverers/default.nix +++ b/src/modules/discoverers/default.nix @@ -2,6 +2,5 @@ imports = [ ./interface.nix ./implementation.nix - ./default-discoverer.nix ]; } diff --git a/src/modules/discoverers/interface.nix b/src/modules/discoverers/interface.nix index 3efa41fc..c779c8ec 100644 --- a/src/modules/discoverers/interface.nix +++ b/src/modules/discoverers/interface.nix @@ -8,7 +8,7 @@ in { options = { discoverers = lib.mkOption { type = t.attrsOf (t.submoduleWith { - modules = [./discoverer/default.nix]; + modules = [../interfaces.discoverer]; inherit specialArgs; }); description = '' diff --git a/src/modules/discoverers/discoverer/default.nix b/src/modules/interfaces.discoverer/default.nix similarity index 100% rename from src/modules/discoverers/discoverer/default.nix rename to src/modules/interfaces.discoverer/default.nix diff --git a/src/modules/discoverers/discoverer/interface.nix b/src/modules/interfaces.discoverer/interface.nix similarity index 100% rename from src/modules/discoverers/discoverer/interface.nix rename to src/modules/interfaces.discoverer/interface.nix diff --git a/src/modules/top-level.nix b/src/modules/top-level.nix index 81e1b18f..46b4a525 100644 --- a/src/modules/top-level.nix +++ b/src/modules/top-level.nix @@ -12,6 +12,7 @@ in { ./translators ./builders ./discoverers + ./discoverers.default-discoverer ]; options = { lib = lib.mkOption {