From 3cce61c7b0ae01189db75e1411a7ac86e3328d01 Mon Sep 17 00:00:00 2001 From: matt1432 Date: Thu, 29 Feb 2024 17:00:13 -0500 Subject: [PATCH] refactor(arion): move around folders and change import --- common/default.nix | 2 ++ devices/nas/modules/arion/default.nix | 2 -- {devices/nas/modules => modules}/arion/.template/compose.nix | 0 .../nas/modules => modules}/arion/.template/images/image.nix | 0 modules/{arion.nix => arion/default.nix} | 0 5 files changed, 2 insertions(+), 2 deletions(-) rename {devices/nas/modules => modules}/arion/.template/compose.nix (100%) rename {devices/nas/modules => modules}/arion/.template/images/image.nix (100%) rename modules/{arion.nix => arion/default.nix} (100%) diff --git a/common/default.nix b/common/default.nix index 7c9481fa..b8e753fa 100644 --- a/common/default.nix +++ b/common/default.nix @@ -17,6 +17,8 @@ nur.nixosModules.nur nh.nixosModules.default home-manager.nixosModules.home-manager + + ../modules/arion ]; nixpkgs = { diff --git a/devices/nas/modules/arion/default.nix b/devices/nas/modules/arion/default.nix index 850aca75..729fca9f 100644 --- a/devices/nas/modules/arion/default.nix +++ b/devices/nas/modules/arion/default.nix @@ -2,8 +2,6 @@ configPath = "/var/lib/arion"; in { imports = [ - ../../../../modules/arion.nix - ./forgejo/compose.nix ./freshrss/compose.nix ./gameyfin/compose.nix diff --git a/devices/nas/modules/arion/.template/compose.nix b/modules/arion/.template/compose.nix similarity index 100% rename from devices/nas/modules/arion/.template/compose.nix rename to modules/arion/.template/compose.nix diff --git a/devices/nas/modules/arion/.template/images/image.nix b/modules/arion/.template/images/image.nix similarity index 100% rename from devices/nas/modules/arion/.template/images/image.nix rename to modules/arion/.template/images/image.nix diff --git a/modules/arion.nix b/modules/arion/default.nix similarity index 100% rename from modules/arion.nix rename to modules/arion/default.nix