From 359c8b601d0fa94fc33e6683f5f61320ccd618bb Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Wed, 13 Feb 2019 17:33:19 +0700
Subject: [PATCH] Move modules into modules/{composition,service}

---
 src/nix/eval-composition.nix                              | 2 +-
 .../composition/docker-compose.nix}                       | 8 ++++----
 .../service/docker-compose-service.nix}                   | 0
 .../service/host-store.nix}                               | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename src/nix/{docker-compose-module.nix => modules/composition/docker-compose.nix} (90%)
 rename src/nix/{service.nix => modules/service/docker-compose-service.nix} (100%)
 rename src/nix/{service-host-store.nix => modules/service/host-store.nix} (92%)

diff --git a/src/nix/eval-composition.nix b/src/nix/eval-composition.nix
index d8bb6f2..349a414 100644
--- a/src/nix/eval-composition.nix
+++ b/src/nix/eval-composition.nix
@@ -18,7 +18,7 @@ let
 
   builtinModules = [
     argsModule
-    ./docker-compose-module.nix
+    ./modules/composition/docker-compose.nix
   ];
 
   argsModule = {
diff --git a/src/nix/docker-compose-module.nix b/src/nix/modules/composition/docker-compose.nix
similarity index 90%
rename from src/nix/docker-compose-module.nix
rename to src/nix/modules/composition/docker-compose.nix
index c76e36f..af4e896 100644
--- a/src/nix/docker-compose-module.nix
+++ b/src/nix/modules/composition/docker-compose.nix
@@ -21,13 +21,13 @@ let
 
       builtinModules = [
         argsModule
-        ./service.nix
-        ./service-host-store.nix
+        ../service/docker-compose-service.nix
+        ../service/host-store.nix
       ];
 
       argsModule = {
-        _file = ./docker-compose-module.nix;
-        key = ./docker-compose-module.nix;
+        _file = ./docker-compose.nix;
+        key = ./docker-compose.nix;
         config._module.args.pkgs = lib.mkForce pkgs;
         config._module.args.uid = uid;
         config._module.args.customNixRootPath = customNixRootPath;
diff --git a/src/nix/service.nix b/src/nix/modules/service/docker-compose-service.nix
similarity index 100%
rename from src/nix/service.nix
rename to src/nix/modules/service/docker-compose-service.nix
diff --git a/src/nix/service-host-store.nix b/src/nix/modules/service/host-store.nix
similarity index 92%
rename from src/nix/service-host-store.nix
rename to src/nix/modules/service/host-store.nix
index 5a06bdb..f837a81 100644
--- a/src/nix/service-host-store.nix
+++ b/src/nix/modules/service/host-store.nix
@@ -19,7 +19,7 @@ in
   };
   config = mkIf config.service.useHostStore {
     service.image = "arion-base";
-    service.build.context = "${../arion-image}";
+    service.build.context = "${../../../arion-image}";
     service.volumes = [
       "${customNixRootPath}/nix/store:/nix/store"
       "${customNixRootPath}${pkgs.buildEnv { name = "container-system-env"; paths = [ pkgs.bashInteractive pkgs.coreutils ]; }}:/run/system"