From 8d8ca9682d637cc6cec870f7a9216925a49910e8 Mon Sep 17 00:00:00 2001 From: alexion Date: Sat, 12 Sep 2026 20:19:38 -0400 Subject: [PATCH] style(nixos): expand navidrome module config references --- configs/nixos/modules/services/navidrome.nix | 26 ++++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/configs/nixos/modules/services/navidrome.nix b/configs/nixos/modules/services/navidrome.nix index 975c87b..bdf259c 100644 --- a/configs/nixos/modules/services/navidrome.nix +++ b/configs/nixos/modules/services/navidrome.nix @@ -4,9 +4,6 @@ pkgs, ... }: -let - cfg = config.modules.services.navidrome; -in { options.modules.services.navidrome = { enable = lib.mkEnableOption "Navidrome"; @@ -67,24 +64,27 @@ in registry."stable-uid".${config.networking.hostName}.navidrome = 20004; } - (lib.mkIf cfg.enable { - users.users.${cfg.user} = { + (lib.mkIf config.modules.services.navidrome.enable { + users.users.${config.modules.services.navidrome.user} = { isSystemUser = true; uid = config.registry."stable-uid".${config.networking.hostName}.navidrome; - group = cfg.group; - home = cfg.dataDir; + group = config.modules.services.navidrome.group; + home = config.modules.services.navidrome.dataDir; }; services.navidrome = { enable = true; - inherit (cfg) package user group environmentFile; + package = config.modules.services.navidrome.package; + user = config.modules.services.navidrome.user; + group = config.modules.services.navidrome.group; + environmentFile = config.modules.services.navidrome.environmentFile; openFirewall = true; - settings = cfg.settings // { + settings = config.modules.services.navidrome.settings // { Address = "0.0.0.0"; - Port = cfg.port; - DataFolder = cfg.dataDir; - MusicFolder = cfg.musicDir; - EnableSharing = cfg.enableSharing; + Port = config.modules.services.navidrome.port; + DataFolder = config.modules.services.navidrome.dataDir; + MusicFolder = config.modules.services.navidrome.musicDir; + EnableSharing = config.modules.services.navidrome.enableSharing; }; }; })