From d422809bed966e7cce1117cb061832e2bd872a63 Mon Sep 17 00:00:00 2001
From: Christoph Heiss <christoph@c8h4.io>
Date: Wed, 3 Jan 2024 00:24:47 +0100
Subject: [PATCH] module: import modules in morph target definition

Signed-off-by: Christoph Heiss <christoph@c8h4.io>
---
 default.nix         | 2 +-
 machines/fort.nix   | 2 --
 machines/serv.nix   | 3 ---
 modules/default.nix | 9 +++++++++
 4 files changed, 10 insertions(+), 6 deletions(-)
 create mode 100644 modules/default.nix

diff --git a/default.nix b/default.nix
index 71b431d..b3c9837 100644
--- a/default.nix
+++ b/default.nix
@@ -7,7 +7,7 @@ let
         machineName = "${name}.c8h4.io";
         my = import ./secrets/my.nix;
       };
-      imports = [ (./machines + "/${name}.nix") ];
+      imports = [ (./machines + "/${name}.nix") ./modules ];
       deployment = {
         substituteOnDestination = true;
         inherit tags;
diff --git a/machines/fort.nix b/machines/fort.nix
index e954c42..375383b 100644
--- a/machines/fort.nix
+++ b/machines/fort.nix
@@ -18,8 +18,6 @@ let
   };
 in {
   imports = [
-    ../modules/services/gatus.nix
-    ../modules/services/matrix-hookshot.nix
     ../secrets/morph/acme.nix
     ../secrets/morph/fort.nix
     ../secrets/morph/matrix.nix
diff --git a/machines/serv.nix b/machines/serv.nix
index eb5be3f..789b6d7 100644
--- a/machines/serv.nix
+++ b/machines/serv.nix
@@ -2,9 +2,6 @@
 
 {
   imports = [
-    ../modules/services/dashboard-icons.nix
-    ../modules/services/filebrowser.nix
-    ../modules/services/homer.nix
     ../secrets/morph/acme.nix
     ../secrets/morph/restic.nix
     ../secrets/morph/serv.nix
diff --git a/modules/default.nix b/modules/default.nix
new file mode 100644
index 0000000..38b52fb
--- /dev/null
+++ b/modules/default.nix
@@ -0,0 +1,9 @@
+{
+  imports = [
+    ./services/dashboard-icons.nix
+    ./services/filebrowser.nix
+    ./services/gatus.nix
+    ./services/homer.nix
+    ./services/matrix-hookshot.nix
+  ];
+}