refactor: reorganize server modules

- Moved each individual service definition into a dedicated `services/`
  directory under every server module (e.g.
`modules/servers/bragi/services/`).
- Updated the corresponding `default.nix` files to import the renamed
  service modules from the new location.
- Applied the same changes across all server modules, ensuring
  the API and import paths remain consistent.
This commit is contained in:
CronyAkatsuki 2026-01-19 19:21:11 +01:00
parent 8a149c3533
commit 4e783c052b
45 changed files with 97 additions and 63 deletions

View file

@ -19,7 +19,7 @@
serverExtras =
if host.type == "server"
then [
./modules/servers/general
# ./modules/servers/general
./modules/servers/${name}
./modules/servers/home-manager
]

View file

@ -1,5 +1,14 @@
{...}: {
imports = [
./crafty-controller.nix
];
{...}: let
servicesDir = ./services;
serviceFiles =
builtins.filter
(name: builtins.match "^.*\\.nix$" name != null)
(builtins.attrNames (builtins.readDir servicesDir));
hostModules = map (fn: import "${servicesDir}/${fn}") serviceFiles;
in {
imports =
[
../general
]
++ hostModules;
}

View file

@ -1,9 +1,15 @@
{...}: {
imports = [
./audiobookshelf.nix
./storage-box.nix
./secrets.nix
./navidrome.nix
./umurmur.nix
];
{...}: let
servicesDir = ./services;
serviceFiles =
builtins.filter
(name: builtins.match "^.*\\.nix$" name != null)
(builtins.attrNames (builtins.readDir servicesDir));
hostModules = map (fn: import "${servicesDir}/${fn}") serviceFiles;
in {
imports =
[
../general
./secrets.nix
]
++ hostModules;
}

View file

@ -1,5 +1,14 @@
{...}: {
imports = [
./immich.nix
];
{...}: let
servicesDir = ./services;
serviceFiles =
builtins.filter
(name: builtins.match "^.*\\.nix$" name != null)
(builtins.attrNames (builtins.readDir servicesDir));
hostModules = map (fn: import "${servicesDir}/${fn}") serviceFiles;
in {
imports =
[
../general
]
++ hostModules;
}

View file

@ -1,11 +1,15 @@
{...}: {
imports = [
./uptime-kuma.nix
./ntfy-sh.nix
./wireguard.nix
./secrets.nix
./redlib.nix
./beszel-hub.nix
./atuin.nix
];
{...}: let
servicesDir = ./services;
serviceFiles =
builtins.filter
(name: builtins.match "^.*\\.nix$" name != null)
(builtins.attrNames (builtins.readDir servicesDir));
hostModules = map (fn: import "${servicesDir}/${fn}") serviceFiles;
in {
imports =
[
../general
./secrets.nix
]
++ hostModules;
}

View file

@ -1,12 +1,15 @@
{...}: {
imports = [
./secrets.nix
./searx.nix
./syncyomi.nix
./wallabag.nix
./upfast.nix
./miniflux.nix
./website.nix
./filebrowser.nix
];
{...}: let
servicesDir = ./services;
serviceFiles =
builtins.filter
(name: builtins.match "^.*\\.nix$" name != null)
(builtins.attrNames (builtins.readDir servicesDir));
hostModules = map (fn: import "${servicesDir}/${fn}") serviceFiles;
in {
imports =
[
../general
./secrets.nix
]
++ hostModules;
}

View file

@ -1,10 +1,15 @@
{...}: {
imports = [
./changedetection-io.nix
./forgejo.nix
./secrets.nix
./plausible.nix
./conduit.nix
./lemmy.nix
];
{...}: let
servicesDir = ./services;
serviceFiles =
builtins.filter
(name: builtins.match "^.*\\.nix$" name != null)
(builtins.attrNames (builtins.readDir servicesDir));
hostModules = map (fn: import "${servicesDir}/${fn}") serviceFiles;
in {
imports =
[
../general
./secrets.nix
]
++ hostModules;
}

View file

@ -1,17 +1,15 @@
{
imports = [
./syncthing.nix
./glance.nix
./wallos.nix
./wireguard.nix
./secrets.nix
./nfs-server.nix
./dns.nix
./traefik.nix
./home-assistant.nix
./mosquitto.nix
./linkwarden.nix
./paperless-ngx.nix
./komga.nix
];
{...}: let
servicesDir = ./services;
serviceFiles =
builtins.filter
(name: builtins.match "^.*\\.nix$" name != null)
(builtins.attrNames (builtins.readDir servicesDir));
hostModules = map (fn: import "${servicesDir}/${fn}") serviceFiles;
in {
imports =
[
../general
./secrets.nix
]
++ hostModules;
}