From 5adb3502aa519f0b2da3bcb8a844a2ad963855e6 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Fri, 30 Aug 2024 00:46:49 +0200 Subject: [PATCH] nixos/services.subsonic: remove `with lib;` --- nixos/modules/services/misc/subsonic.nix | 49 +++++++++++------------- 1 file changed, 23 insertions(+), 26 deletions(-) diff --git a/nixos/modules/services/misc/subsonic.nix b/nixos/modules/services/misc/subsonic.nix index 2dda8970dd30..8d2ddf724f70 100644 --- a/nixos/modules/services/misc/subsonic.nix +++ b/nixos/modules/services/misc/subsonic.nix @@ -1,17 +1,14 @@ { config, lib, options, pkgs, ... }: - -with lib; - let cfg = config.services.subsonic; opt = options.services.subsonic; in { options = { services.subsonic = { - enable = mkEnableOption "Subsonic daemon"; + enable = lib.mkEnableOption "Subsonic daemon"; - home = mkOption { - type = types.path; + home = lib.mkOption { + type = lib.types.path; default = "/var/lib/subsonic"; description = '' The directory where Subsonic will create files. @@ -19,8 +16,8 @@ in { ''; }; - listenAddress = mkOption { - type = types.str; + listenAddress = lib.mkOption { + type = lib.types.str; default = "0.0.0.0"; description = '' The host name or IP address on which to bind Subsonic. @@ -30,8 +27,8 @@ in { ''; }; - port = mkOption { - type = types.port; + port = lib.mkOption { + type = lib.types.port; default = 4040; description = '' The port on which Subsonic will listen for @@ -39,8 +36,8 @@ in { ''; }; - httpsPort = mkOption { - type = types.port; + httpsPort = lib.mkOption { + type = lib.types.port; default = 0; description = '' The port on which Subsonic will listen for @@ -48,8 +45,8 @@ in { ''; }; - contextPath = mkOption { - type = types.path; + contextPath = lib.mkOption { + type = lib.types.path; default = "/"; description = '' The context path, i.e., the last part of the Subsonic @@ -57,8 +54,8 @@ in { ''; }; - maxMemory = mkOption { - type = types.int; + maxMemory = lib.mkOption { + type = lib.types.int; default = 100; description = '' The memory limit (max Java heap size) in megabytes. @@ -66,8 +63,8 @@ in { ''; }; - defaultMusicFolder = mkOption { - type = types.path; + defaultMusicFolder = lib.mkOption { + type = lib.types.path; default = "/var/music"; description = '' Configure Subsonic to use this folder for music. This option @@ -75,8 +72,8 @@ in { ''; }; - defaultPodcastFolder = mkOption { - type = types.path; + defaultPodcastFolder = lib.mkOption { + type = lib.types.path; default = "/var/music/Podcast"; description = '' Configure Subsonic to use this folder for Podcasts. This option @@ -84,8 +81,8 @@ in { ''; }; - defaultPlaylistFolder = mkOption { - type = types.path; + defaultPlaylistFolder = lib.mkOption { + type = lib.types.path; default = "/var/playlists"; description = '' Configure Subsonic to use this folder for playlists. This option @@ -93,10 +90,10 @@ in { ''; }; - transcoders = mkOption { - type = types.listOf types.path; + transcoders = lib.mkOption { + type = lib.types.listOf lib.types.path; default = [ "${pkgs.ffmpeg.bin}/bin/ffmpeg" ]; - defaultText = literalExpression ''[ "''${pkgs.ffmpeg.bin}/bin/ffmpeg" ]''; + defaultText = lib.literalExpression ''[ "''${pkgs.ffmpeg.bin}/bin/ffmpeg" ]''; description = '' List of paths to transcoder executables that should be accessible from Subsonic. Symlinks will be created to each executable inside @@ -106,7 +103,7 @@ in { }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { systemd.services.subsonic = { description = "Personal media streamer"; after = [ "network.target" ];