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:
parent
8a149c3533
commit
4e783c052b
45 changed files with 97 additions and 63 deletions
|
|
@ -19,7 +19,7 @@
|
||||||
serverExtras =
|
serverExtras =
|
||||||
if host.type == "server"
|
if host.type == "server"
|
||||||
then [
|
then [
|
||||||
./modules/servers/general
|
# ./modules/servers/general
|
||||||
./modules/servers/${name}
|
./modules/servers/${name}
|
||||||
./modules/servers/home-manager
|
./modules/servers/home-manager
|
||||||
]
|
]
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,14 @@
|
||||||
{...}: {
|
{...}: let
|
||||||
imports = [
|
servicesDir = ./services;
|
||||||
./crafty-controller.nix
|
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;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,15 @@
|
||||||
{...}: {
|
{...}: let
|
||||||
imports = [
|
servicesDir = ./services;
|
||||||
./audiobookshelf.nix
|
serviceFiles =
|
||||||
./storage-box.nix
|
builtins.filter
|
||||||
./secrets.nix
|
(name: builtins.match "^.*\\.nix$" name != null)
|
||||||
./navidrome.nix
|
(builtins.attrNames (builtins.readDir servicesDir));
|
||||||
./umurmur.nix
|
hostModules = map (fn: import "${servicesDir}/${fn}") serviceFiles;
|
||||||
];
|
in {
|
||||||
|
imports =
|
||||||
|
[
|
||||||
|
../general
|
||||||
|
./secrets.nix
|
||||||
|
]
|
||||||
|
++ hostModules;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,14 @@
|
||||||
{...}: {
|
{...}: let
|
||||||
imports = [
|
servicesDir = ./services;
|
||||||
./immich.nix
|
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;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,15 @@
|
||||||
{...}: {
|
{...}: let
|
||||||
imports = [
|
servicesDir = ./services;
|
||||||
./uptime-kuma.nix
|
serviceFiles =
|
||||||
./ntfy-sh.nix
|
builtins.filter
|
||||||
./wireguard.nix
|
(name: builtins.match "^.*\\.nix$" name != null)
|
||||||
./secrets.nix
|
(builtins.attrNames (builtins.readDir servicesDir));
|
||||||
./redlib.nix
|
hostModules = map (fn: import "${servicesDir}/${fn}") serviceFiles;
|
||||||
./beszel-hub.nix
|
in {
|
||||||
./atuin.nix
|
imports =
|
||||||
];
|
[
|
||||||
|
../general
|
||||||
|
./secrets.nix
|
||||||
|
]
|
||||||
|
++ hostModules;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,15 @@
|
||||||
{...}: {
|
{...}: let
|
||||||
imports = [
|
servicesDir = ./services;
|
||||||
./secrets.nix
|
serviceFiles =
|
||||||
./searx.nix
|
builtins.filter
|
||||||
./syncyomi.nix
|
(name: builtins.match "^.*\\.nix$" name != null)
|
||||||
./wallabag.nix
|
(builtins.attrNames (builtins.readDir servicesDir));
|
||||||
./upfast.nix
|
hostModules = map (fn: import "${servicesDir}/${fn}") serviceFiles;
|
||||||
./miniflux.nix
|
in {
|
||||||
./website.nix
|
imports =
|
||||||
./filebrowser.nix
|
[
|
||||||
];
|
../general
|
||||||
|
./secrets.nix
|
||||||
|
]
|
||||||
|
++ hostModules;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,15 @@
|
||||||
{...}: {
|
{...}: let
|
||||||
imports = [
|
servicesDir = ./services;
|
||||||
./changedetection-io.nix
|
serviceFiles =
|
||||||
./forgejo.nix
|
builtins.filter
|
||||||
./secrets.nix
|
(name: builtins.match "^.*\\.nix$" name != null)
|
||||||
./plausible.nix
|
(builtins.attrNames (builtins.readDir servicesDir));
|
||||||
./conduit.nix
|
hostModules = map (fn: import "${servicesDir}/${fn}") serviceFiles;
|
||||||
./lemmy.nix
|
in {
|
||||||
];
|
imports =
|
||||||
|
[
|
||||||
|
../general
|
||||||
|
./secrets.nix
|
||||||
|
]
|
||||||
|
++ hostModules;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,17 +1,15 @@
|
||||||
{
|
{...}: let
|
||||||
imports = [
|
servicesDir = ./services;
|
||||||
./syncthing.nix
|
serviceFiles =
|
||||||
./glance.nix
|
builtins.filter
|
||||||
./wallos.nix
|
(name: builtins.match "^.*\\.nix$" name != null)
|
||||||
./wireguard.nix
|
(builtins.attrNames (builtins.readDir servicesDir));
|
||||||
./secrets.nix
|
hostModules = map (fn: import "${servicesDir}/${fn}") serviceFiles;
|
||||||
./nfs-server.nix
|
in {
|
||||||
./dns.nix
|
imports =
|
||||||
./traefik.nix
|
[
|
||||||
./home-assistant.nix
|
../general
|
||||||
./mosquitto.nix
|
./secrets.nix
|
||||||
./linkwarden.nix
|
]
|
||||||
./paperless-ngx.nix
|
++ hostModules;
|
||||||
./komga.nix
|
|
||||||
];
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue