From b37c5c0cbda36c292b003ffbf27e5a6d23db74fe Mon Sep 17 00:00:00 2001
From: Chris Kruining <c.kruining@4dotnet.nl>
Date: Mon, 30 Mar 2026 09:32:15 +0200
Subject: [PATCH] also refactor nixos modules

---
 clanServices/flake-module.nix                             | 8 ++++++++
 clanServices/servarr/flake-module.nix                     | 1 +
 flake.nix                                                 | 1 +
 modules/nixos/{boot/default.nix => boot.nix}              | 0
 modules/nixos/desktop/{cosmic/default.nix => cosmic.nix}  | 0
 .../desktop/{gamescope/default.nix => gamescope.nix}      | 0
 modules/nixos/desktop/{gnome/default.nix => gnome.nix}    | 0
 modules/nixos/desktop/{plasma/default.nix => plasma.nix}  | 0
 modules/nixos/editor/{nano/default.nix => nano.nix}       | 0
 modules/nixos/editor/{nvim/default.nix => nvim.nix}       | 0
 modules/nixos/hardware/{audio/default.nix => audio.nix}   | 0
 .../hardware/{bluetooth/default.nix => bluetooth.nix}     | 0
 .../nixos/{home-manager/default.nix => home-manager.nix}  | 0
 modules/nixos/{nix/default.nix => nix.nix}                | 0
 .../authentication/{authelia/default.nix => authelia.nix} | 0
 .../{himmelblau/default.nix => himmelblau.nix}            | 0
 .../authentication/{zitadel/default.nix => zitadel.nix}   | 0
 .../nixos/services/backup/{borg/default.nix => borg.nix}  | 0
 .../communication/{matrix/default.nix => matrix.nix}      | 0
 .../development/{forgejo/default.nix => forgejo.nix}      | 0
 .../games/{minecraft/default.nix => minecraft.nix}        | 0
 .../services/games/{palworld/default.nix => palworld.nix} | 0
 .../services/media/{glance/default.nix => glance.nix}     | 0
 .../services/media/{jellyfin/default.nix => jellyfin.nix} | 0
 .../nixos/services/media/{mydia/default.nix => mydia.nix} | 0
 .../media/{nextcloud/default.nix => nextcloud.nix}        | 0
 modules/nixos/services/media/{nfs/default.nix => nfs.nix} | 0
 .../services/media/{servarr/default.nix => servarr.nix}   | 0
 modules/nixos/services/media/servarr/lib.nix              | 2 --
 .../services/networking/{caddy/default.nix => caddy.nix}  | 0
 .../services/networking/{ssh/default.nix => ssh.nix}      | 0
 .../networking/{wireguard/default.nix => wireguard.nix}   | 0
 .../services/observability/{loki/default.nix => loki.nix} | 0
 .../{prometheus/default.nix => prometheus.nix}            | 0
 .../observability/{promtail/default.nix => promtail.nix}  | 0
 .../{uptime-kuma/default.nix => uptime-kuma.nix}          | 0
 .../persistance/{postgesql/default.nix => postgresql.nix} | 0
 .../security/{vaultwarden/default.nix => vaultwarden.nix} | 0
 .../virtualisation/{podman/default.nix => podman.nix}     | 0
 modules/nixos/shells/{zsh/default.nix => zsh.nix}         | 0
 .../system/{networking/default.nix => networking.nix}     | 0
 .../nixos/system/security/{boot/default.nix => boot.nix}  | 0
 .../nixos/system/security/{sops/default.nix => sops.nix}  | 0
 .../nixos/system/security/{sudo/default.nix => sudo.nix}  | 0
 44 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 clanServices/flake-module.nix
 create mode 100644 clanServices/servarr/flake-module.nix
 rename modules/nixos/{boot/default.nix => boot.nix} (100%)
 rename modules/nixos/desktop/{cosmic/default.nix => cosmic.nix} (100%)
 rename modules/nixos/desktop/{gamescope/default.nix => gamescope.nix} (100%)
 rename modules/nixos/desktop/{gnome/default.nix => gnome.nix} (100%)
 rename modules/nixos/desktop/{plasma/default.nix => plasma.nix} (100%)
 rename modules/nixos/editor/{nano/default.nix => nano.nix} (100%)
 rename modules/nixos/editor/{nvim/default.nix => nvim.nix} (100%)
 rename modules/nixos/hardware/{audio/default.nix => audio.nix} (100%)
 rename modules/nixos/hardware/{bluetooth/default.nix => bluetooth.nix} (100%)
 rename modules/nixos/{home-manager/default.nix => home-manager.nix} (100%)
 rename modules/nixos/{nix/default.nix => nix.nix} (100%)
 rename modules/nixos/services/authentication/{authelia/default.nix => authelia.nix} (100%)
 rename modules/nixos/services/authentication/{himmelblau/default.nix => himmelblau.nix} (100%)
 rename modules/nixos/services/authentication/{zitadel/default.nix => zitadel.nix} (100%)
 rename modules/nixos/services/backup/{borg/default.nix => borg.nix} (100%)
 rename modules/nixos/services/communication/{matrix/default.nix => matrix.nix} (100%)
 rename modules/nixos/services/development/{forgejo/default.nix => forgejo.nix} (100%)
 rename modules/nixos/services/games/{minecraft/default.nix => minecraft.nix} (100%)
 rename modules/nixos/services/games/{palworld/default.nix => palworld.nix} (100%)
 rename modules/nixos/services/media/{glance/default.nix => glance.nix} (100%)
 rename modules/nixos/services/media/{jellyfin/default.nix => jellyfin.nix} (100%)
 rename modules/nixos/services/media/{mydia/default.nix => mydia.nix} (100%)
 rename modules/nixos/services/media/{nextcloud/default.nix => nextcloud.nix} (100%)
 rename modules/nixos/services/media/{nfs/default.nix => nfs.nix} (100%)
 rename modules/nixos/services/media/{servarr/default.nix => servarr.nix} (100%)
 delete mode 100644 modules/nixos/services/media/servarr/lib.nix
 rename modules/nixos/services/networking/{caddy/default.nix => caddy.nix} (100%)
 rename modules/nixos/services/networking/{ssh/default.nix => ssh.nix} (100%)
 rename modules/nixos/services/networking/{wireguard/default.nix => wireguard.nix} (100%)
 rename modules/nixos/services/observability/{loki/default.nix => loki.nix} (100%)
 rename modules/nixos/services/observability/{prometheus/default.nix => prometheus.nix} (100%)
 rename modules/nixos/services/observability/{promtail/default.nix => promtail.nix} (100%)
 rename modules/nixos/services/observability/{uptime-kuma/default.nix => uptime-kuma.nix} (100%)
 rename modules/nixos/services/persistance/{postgesql/default.nix => postgresql.nix} (100%)
 rename modules/nixos/services/security/{vaultwarden/default.nix => vaultwarden.nix} (100%)
 rename modules/nixos/services/virtualisation/{podman/default.nix => podman.nix} (100%)
 rename modules/nixos/shells/{zsh/default.nix => zsh.nix} (100%)
 rename modules/nixos/system/{networking/default.nix => networking.nix} (100%)
 rename modules/nixos/system/security/{boot/default.nix => boot.nix} (100%)
 rename modules/nixos/system/security/{sops/default.nix => sops.nix} (100%)
 rename modules/nixos/system/security/{sudo/default.nix => sudo.nix} (100%)

diff --git a/clanServices/flake-module.nix b/clanServices/flake-module.nix
new file mode 100644
index 0000000..46cf514
--- /dev/null
+++ b/clanServices/flake-module.nix
@@ -0,0 +1,8 @@
+{...}: {
+  imports = ./.
+    |> builtins.readDir
+    |> builtins.attrsToList
+    |> builtins.map ({ name, value }: { type = value; path = ./. "/${name}/flake-module.nix" })
+    |> builtins.filter ({ type, path }: type == "directory" && (builtins.pathExists path))
+    |> builtins.map ({ name }: name);
+}
diff --git a/clanServices/servarr/flake-module.nix b/clanServices/servarr/flake-module.nix
new file mode 100644
index 0000000..6462967
--- /dev/null
+++ b/clanServices/servarr/flake-module.nix
@@ -0,0 +1 @@
+{...}: {}
diff --git a/flake.nix b/flake.nix
index 9694a61..7e4bf77 100644
--- a/flake.nix
+++ b/flake.nix
@@ -110,6 +110,7 @@
         home-manager.flakeModules.default
         terranix.flakeModule
         ./packages/flake-module.nix
+        ./clanServices/flake-module.nix
       ];
 
       perSystem = {system, ...}: {
diff --git a/modules/nixos/boot/default.nix b/modules/nixos/boot.nix
similarity index 100%
rename from modules/nixos/boot/default.nix
rename to modules/nixos/boot.nix
diff --git a/modules/nixos/desktop/cosmic/default.nix b/modules/nixos/desktop/cosmic.nix
similarity index 100%
rename from modules/nixos/desktop/cosmic/default.nix
rename to modules/nixos/desktop/cosmic.nix
diff --git a/modules/nixos/desktop/gamescope/default.nix b/modules/nixos/desktop/gamescope.nix
similarity index 100%
rename from modules/nixos/desktop/gamescope/default.nix
rename to modules/nixos/desktop/gamescope.nix
diff --git a/modules/nixos/desktop/gnome/default.nix b/modules/nixos/desktop/gnome.nix
similarity index 100%
rename from modules/nixos/desktop/gnome/default.nix
rename to modules/nixos/desktop/gnome.nix
diff --git a/modules/nixos/desktop/plasma/default.nix b/modules/nixos/desktop/plasma.nix
similarity index 100%
rename from modules/nixos/desktop/plasma/default.nix
rename to modules/nixos/desktop/plasma.nix
diff --git a/modules/nixos/editor/nano/default.nix b/modules/nixos/editor/nano.nix
similarity index 100%
rename from modules/nixos/editor/nano/default.nix
rename to modules/nixos/editor/nano.nix
diff --git a/modules/nixos/editor/nvim/default.nix b/modules/nixos/editor/nvim.nix
similarity index 100%
rename from modules/nixos/editor/nvim/default.nix
rename to modules/nixos/editor/nvim.nix
diff --git a/modules/nixos/hardware/audio/default.nix b/modules/nixos/hardware/audio.nix
similarity index 100%
rename from modules/nixos/hardware/audio/default.nix
rename to modules/nixos/hardware/audio.nix
diff --git a/modules/nixos/hardware/bluetooth/default.nix b/modules/nixos/hardware/bluetooth.nix
similarity index 100%
rename from modules/nixos/hardware/bluetooth/default.nix
rename to modules/nixos/hardware/bluetooth.nix
diff --git a/modules/nixos/home-manager/default.nix b/modules/nixos/home-manager.nix
similarity index 100%
rename from modules/nixos/home-manager/default.nix
rename to modules/nixos/home-manager.nix
diff --git a/modules/nixos/nix/default.nix b/modules/nixos/nix.nix
similarity index 100%
rename from modules/nixos/nix/default.nix
rename to modules/nixos/nix.nix
diff --git a/modules/nixos/services/authentication/authelia/default.nix b/modules/nixos/services/authentication/authelia.nix
similarity index 100%
rename from modules/nixos/services/authentication/authelia/default.nix
rename to modules/nixos/services/authentication/authelia.nix
diff --git a/modules/nixos/services/authentication/himmelblau/default.nix b/modules/nixos/services/authentication/himmelblau.nix
similarity index 100%
rename from modules/nixos/services/authentication/himmelblau/default.nix
rename to modules/nixos/services/authentication/himmelblau.nix
diff --git a/modules/nixos/services/authentication/zitadel/default.nix b/modules/nixos/services/authentication/zitadel.nix
similarity index 100%
rename from modules/nixos/services/authentication/zitadel/default.nix
rename to modules/nixos/services/authentication/zitadel.nix
diff --git a/modules/nixos/services/backup/borg/default.nix b/modules/nixos/services/backup/borg.nix
similarity index 100%
rename from modules/nixos/services/backup/borg/default.nix
rename to modules/nixos/services/backup/borg.nix
diff --git a/modules/nixos/services/communication/matrix/default.nix b/modules/nixos/services/communication/matrix.nix
similarity index 100%
rename from modules/nixos/services/communication/matrix/default.nix
rename to modules/nixos/services/communication/matrix.nix
diff --git a/modules/nixos/services/development/forgejo/default.nix b/modules/nixos/services/development/forgejo.nix
similarity index 100%
rename from modules/nixos/services/development/forgejo/default.nix
rename to modules/nixos/services/development/forgejo.nix
diff --git a/modules/nixos/services/games/minecraft/default.nix b/modules/nixos/services/games/minecraft.nix
similarity index 100%
rename from modules/nixos/services/games/minecraft/default.nix
rename to modules/nixos/services/games/minecraft.nix
diff --git a/modules/nixos/services/games/palworld/default.nix b/modules/nixos/services/games/palworld.nix
similarity index 100%
rename from modules/nixos/services/games/palworld/default.nix
rename to modules/nixos/services/games/palworld.nix
diff --git a/modules/nixos/services/media/glance/default.nix b/modules/nixos/services/media/glance.nix
similarity index 100%
rename from modules/nixos/services/media/glance/default.nix
rename to modules/nixos/services/media/glance.nix
diff --git a/modules/nixos/services/media/jellyfin/default.nix b/modules/nixos/services/media/jellyfin.nix
similarity index 100%
rename from modules/nixos/services/media/jellyfin/default.nix
rename to modules/nixos/services/media/jellyfin.nix
diff --git a/modules/nixos/services/media/mydia/default.nix b/modules/nixos/services/media/mydia.nix
similarity index 100%
rename from modules/nixos/services/media/mydia/default.nix
rename to modules/nixos/services/media/mydia.nix
diff --git a/modules/nixos/services/media/nextcloud/default.nix b/modules/nixos/services/media/nextcloud.nix
similarity index 100%
rename from modules/nixos/services/media/nextcloud/default.nix
rename to modules/nixos/services/media/nextcloud.nix
diff --git a/modules/nixos/services/media/nfs/default.nix b/modules/nixos/services/media/nfs.nix
similarity index 100%
rename from modules/nixos/services/media/nfs/default.nix
rename to modules/nixos/services/media/nfs.nix
diff --git a/modules/nixos/services/media/servarr/default.nix b/modules/nixos/services/media/servarr.nix
similarity index 100%
rename from modules/nixos/services/media/servarr/default.nix
rename to modules/nixos/services/media/servarr.nix
diff --git a/modules/nixos/services/media/servarr/lib.nix b/modules/nixos/services/media/servarr/lib.nix
deleted file mode 100644
index 8ee412b..0000000
--- a/modules/nixos/services/media/servarr/lib.nix
+++ /dev/null
@@ -1,2 +0,0 @@
-{lib, ...}: {
-}
diff --git a/modules/nixos/services/networking/caddy/default.nix b/modules/nixos/services/networking/caddy.nix
similarity index 100%
rename from modules/nixos/services/networking/caddy/default.nix
rename to modules/nixos/services/networking/caddy.nix
diff --git a/modules/nixos/services/networking/ssh/default.nix b/modules/nixos/services/networking/ssh.nix
similarity index 100%
rename from modules/nixos/services/networking/ssh/default.nix
rename to modules/nixos/services/networking/ssh.nix
diff --git a/modules/nixos/services/networking/wireguard/default.nix b/modules/nixos/services/networking/wireguard.nix
similarity index 100%
rename from modules/nixos/services/networking/wireguard/default.nix
rename to modules/nixos/services/networking/wireguard.nix
diff --git a/modules/nixos/services/observability/loki/default.nix b/modules/nixos/services/observability/loki.nix
similarity index 100%
rename from modules/nixos/services/observability/loki/default.nix
rename to modules/nixos/services/observability/loki.nix
diff --git a/modules/nixos/services/observability/prometheus/default.nix b/modules/nixos/services/observability/prometheus.nix
similarity index 100%
rename from modules/nixos/services/observability/prometheus/default.nix
rename to modules/nixos/services/observability/prometheus.nix
diff --git a/modules/nixos/services/observability/promtail/default.nix b/modules/nixos/services/observability/promtail.nix
similarity index 100%
rename from modules/nixos/services/observability/promtail/default.nix
rename to modules/nixos/services/observability/promtail.nix
diff --git a/modules/nixos/services/observability/uptime-kuma/default.nix b/modules/nixos/services/observability/uptime-kuma.nix
similarity index 100%
rename from modules/nixos/services/observability/uptime-kuma/default.nix
rename to modules/nixos/services/observability/uptime-kuma.nix
diff --git a/modules/nixos/services/persistance/postgesql/default.nix b/modules/nixos/services/persistance/postgresql.nix
similarity index 100%
rename from modules/nixos/services/persistance/postgesql/default.nix
rename to modules/nixos/services/persistance/postgresql.nix
diff --git a/modules/nixos/services/security/vaultwarden/default.nix b/modules/nixos/services/security/vaultwarden.nix
similarity index 100%
rename from modules/nixos/services/security/vaultwarden/default.nix
rename to modules/nixos/services/security/vaultwarden.nix
diff --git a/modules/nixos/services/virtualisation/podman/default.nix b/modules/nixos/services/virtualisation/podman.nix
similarity index 100%
rename from modules/nixos/services/virtualisation/podman/default.nix
rename to modules/nixos/services/virtualisation/podman.nix
diff --git a/modules/nixos/shells/zsh/default.nix b/modules/nixos/shells/zsh.nix
similarity index 100%
rename from modules/nixos/shells/zsh/default.nix
rename to modules/nixos/shells/zsh.nix
diff --git a/modules/nixos/system/networking/default.nix b/modules/nixos/system/networking.nix
similarity index 100%
rename from modules/nixos/system/networking/default.nix
rename to modules/nixos/system/networking.nix
diff --git a/modules/nixos/system/security/boot/default.nix b/modules/nixos/system/security/boot.nix
similarity index 100%
rename from modules/nixos/system/security/boot/default.nix
rename to modules/nixos/system/security/boot.nix
diff --git a/modules/nixos/system/security/sops/default.nix b/modules/nixos/system/security/sops.nix
similarity index 100%
rename from modules/nixos/system/security/sops/default.nix
rename to modules/nixos/system/security/sops.nix
diff --git a/modules/nixos/system/security/sudo/default.nix b/modules/nixos/system/security/sudo.nix
similarity index 100%
rename from modules/nixos/system/security/sudo/default.nix
rename to modules/nixos/system/security/sudo.nix