From 5967974d15084d5cdc36f0f42ce0bd96df16fe9b Mon Sep 17 00:00:00 2001
From: Katherina Walshe-Grey <git@qenya.tel>
Date: Tue, 16 Sep 2025 18:35:07 +0100
Subject: [PATCH] Alter services directory structure

---
 flake.nix                               |  1 -
 services/default.nix                    | 10 +++-------
 services/{ => qenya}/actual.nix         |  0
 services/{ => qenya}/audiobookshelf.nix |  0
 services/qenya/default.nix              | 11 +++++++++++
 services/{ => qenya}/forgejo.nix        |  0
 services/{ => qenya}/headscale.nix      |  0
 services/{ => qenya}/jellyfin.nix       |  0
 services/{ => qenya}/navidrome.nix      |  0
 services/{ => qenya}/owncast.nix        |  0
 services/randomcat/default.nix          |  7 +++++++
 11 files changed, 21 insertions(+), 8 deletions(-)
 rename services/{ => qenya}/actual.nix (100%)
 rename services/{ => qenya}/audiobookshelf.nix (100%)
 create mode 100644 services/qenya/default.nix
 rename services/{ => qenya}/forgejo.nix (100%)
 rename services/{ => qenya}/headscale.nix (100%)
 rename services/{ => qenya}/jellyfin.nix (100%)
 rename services/{ => qenya}/navidrome.nix (100%)
 rename services/{ => qenya}/owncast.nix (100%)
 create mode 100644 services/randomcat/default.nix

diff --git a/flake.nix b/flake.nix
index 21c464d..9552d18 100644
--- a/flake.nix
+++ b/flake.nix
@@ -135,7 +135,6 @@
               inputs.agenix.nixosModules.default
               ./common
               ./services
-              (builtins.toPath "${inputs.randomcat}/services/default.nix")
             ];
           };
 
diff --git a/services/default.nix b/services/default.nix
index 194eb43..112bdc9 100644
--- a/services/default.nix
+++ b/services/default.nix
@@ -1,13 +1,9 @@
 {
   imports = [
-    ./actual.nix
-    ./audiobookshelf.nix
+    ./qenya
+    ./randomcat
+
     ./distributed-builds.nix
-    ./forgejo.nix
-    ./headscale.nix
-    ./jellyfin.nix
-    ./navidrome.nix
-    ./owncast.nix
     ./remote-builder.nix
     ./web-redirect.nix
   ];
diff --git a/services/actual.nix b/services/qenya/actual.nix
similarity index 100%
rename from services/actual.nix
rename to services/qenya/actual.nix
diff --git a/services/audiobookshelf.nix b/services/qenya/audiobookshelf.nix
similarity index 100%
rename from services/audiobookshelf.nix
rename to services/qenya/audiobookshelf.nix
diff --git a/services/qenya/default.nix b/services/qenya/default.nix
new file mode 100644
index 0000000..bd1c6ea
--- /dev/null
+++ b/services/qenya/default.nix
@@ -0,0 +1,11 @@
+{
+  imports = [
+    ./actual.nix
+    ./audiobookshelf.nix
+    ./forgejo.nix
+    ./headscale.nix
+    ./jellyfin.nix
+    ./navidrome.nix
+    ./owncast.nix
+  ];
+}
diff --git a/services/forgejo.nix b/services/qenya/forgejo.nix
similarity index 100%
rename from services/forgejo.nix
rename to services/qenya/forgejo.nix
diff --git a/services/headscale.nix b/services/qenya/headscale.nix
similarity index 100%
rename from services/headscale.nix
rename to services/qenya/headscale.nix
diff --git a/services/jellyfin.nix b/services/qenya/jellyfin.nix
similarity index 100%
rename from services/jellyfin.nix
rename to services/qenya/jellyfin.nix
diff --git a/services/navidrome.nix b/services/qenya/navidrome.nix
similarity index 100%
rename from services/navidrome.nix
rename to services/qenya/navidrome.nix
diff --git a/services/owncast.nix b/services/qenya/owncast.nix
similarity index 100%
rename from services/owncast.nix
rename to services/qenya/owncast.nix
diff --git a/services/randomcat/default.nix b/services/randomcat/default.nix
new file mode 100644
index 0000000..72758b9
--- /dev/null
+++ b/services/randomcat/default.nix
@@ -0,0 +1,7 @@
+{ inputs, ... }:
+
+{
+  imports = [
+    (builtins.toPath "${inputs.randomcat}/services/default.nix")
+  ];
+}