diff options
| author | Martin Fischer <martin@push-f.com> | 2025-12-25 20:59:34 +0100 |
|---|---|---|
| committer | Martin Fischer <martin@push-f.com> | 2025-12-26 08:03:25 +0100 |
| commit | fbc48c342145b566e24990e5250951cfd6f76b3b (patch) | |
| tree | 93e757b416cc7492b31b8994217be58d71226125 | |
| parent | a36b384657a11acdb267bfefa9bc7719ab6ab4a0 (diff) | |
refactor: define dirs in main modules
| -rw-r--r-- | nixos/hosts/ev/default.nix | 1 | ||||
| -rw-r--r-- | nixos/hosts/ev/navidrome.nix | 5 | ||||
| -rw-r--r-- | nixos/hosts/tente/default.nix | 1 | ||||
| -rw-r--r-- | nixos/hosts/tente/web-personal.nix | 5 |
4 files changed, 10 insertions, 2 deletions
diff --git a/nixos/hosts/ev/default.nix b/nixos/hosts/ev/default.nix index 459b48f..1e4186f 100644 --- a/nixos/hosts/ev/default.nix +++ b/nixos/hosts/ev/default.nix @@ -101,6 +101,7 @@ in navidrome = { port = ports.navidrome; + musicDir = "/mnt/personal/music"; }; qbittorrent = { diff --git a/nixos/hosts/ev/navidrome.nix b/nixos/hosts/ev/navidrome.nix index ea96341..0556ef5 100644 --- a/nixos/hosts/ev/navidrome.nix +++ b/nixos/hosts/ev/navidrome.nix @@ -8,6 +8,9 @@ in port = lib.mkOption { type = lib.types.port; }; + musicDir = lib.mkOption { + type = lib.types.str; + }; }; config = { @@ -16,7 +19,7 @@ in settings = { Address = "0.0.0.0"; Port = cfg.port; - MusicFolder = "/mnt/personal/music"; + MusicFolder = cfg.musicDir; }; }; }; diff --git a/nixos/hosts/tente/default.nix b/nixos/hosts/tente/default.nix index 54880dd..277bc58 100644 --- a/nixos/hosts/tente/default.nix +++ b/nixos/hosts/tente/default.nix @@ -136,6 +136,7 @@ in web-personal = { domain = baseDomain; + dir = "/srv/www/${baseDomain}"; # not managed via Nix matrixApiDomain = config.matrix.apiDomain; }; diff --git a/nixos/hosts/tente/web-personal.nix b/nixos/hosts/tente/web-personal.nix index d706b9d..093525f 100644 --- a/nixos/hosts/tente/web-personal.nix +++ b/nixos/hosts/tente/web-personal.nix @@ -9,6 +9,9 @@ in domain = lib.mkOption { type = lib.types.str; }; + dir = lib.mkOption { + type = lib.types.str; + }; matrixApiDomain = lib.mkOption { type = lib.types.str; }; @@ -27,7 +30,7 @@ in { enableACME = true; forceSSL = true; - root = "/srv/www/${cfg.domain}"; + root = cfg.dir; extraConfig = helpers.mkNginxConfig cfg.domain; locations."= /.well-known/matrix/server".extraConfig = mkWellKnown { |