From fd0069c6267ea962f5be16b308705e74e4ecf613 Mon Sep 17 00:00:00 2001 From: oddlama Date: Thu, 14 Mar 2024 13:07:05 +0100 Subject: [PATCH] chore: move topology to subfolder --- flake.nix | 2 +- modules/default.nix | 2 +- topology/default.nix | 1 + modules/topology.nix => topology/module.nix | 0 generate-topology.nix => topology/render.nix | 0 5 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 topology/default.nix rename modules/topology.nix => topology/module.nix (100%) rename generate-topology.nix => topology/render.nix (100%) diff --git a/flake.nix b/flake.nix index eb6fd48..79383ba 100644 --- a/flake.nix +++ b/flake.nix @@ -175,7 +175,7 @@ }; # XXX: WIP: only testing - topology = import ./generate-topology.nix { + topology = import ./topology { inherit pkgs; nixosConfigurations = self.nodes; }; diff --git a/modules/default.nix b/modules/default.nix index dda1c11..414a272 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -40,7 +40,7 @@ ./wireguard-proxy.nix ./wireguard.nix - ./topology.nix + ../topology/module.nix ]; nixpkgs.overlays = [ diff --git a/topology/default.nix b/topology/default.nix new file mode 100644 index 0000000..f9bfa80 --- /dev/null +++ b/topology/default.nix @@ -0,0 +1 @@ +import ./render.nix diff --git a/modules/topology.nix b/topology/module.nix similarity index 100% rename from modules/topology.nix rename to topology/module.nix diff --git a/generate-topology.nix b/topology/render.nix similarity index 100% rename from generate-topology.nix rename to topology/render.nix