diff --git a/flake.lock b/flake.lock index 8ee39d7..808a777 100644 --- a/flake.lock +++ b/flake.lock @@ -136,11 +136,11 @@ ] }, "locked": { - "lastModified": 1713809191, - "narHash": "sha256-9Tb5JKcacjxNF1f7gsu/4l4Gxa2qflq9x1hhdl10iwM=", + "lastModified": 1712390667, + "narHash": "sha256-ebq+fJZfobqpsAdGDGpxNWSySbQejRwW9cdiil6krCo=", "owner": "nix-community", "repo": "home-manager", - "rev": "e866aae5bbbcfe6798ca05d3004a4e62f1828954", + "rev": "b787726a8413e11b074cde42704b4af32d95545c", "type": "github" }, "original": { @@ -152,11 +152,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1713714899, - "narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=", + "lastModified": 1712439257, + "narHash": "sha256-aSpiNepFOMk9932HOax0XwNxbA38GOUVOiXfUVPOrck=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6143fc5eeb9c4f00163267708e26191d1e918932", + "rev": "ff0dbd94265ac470dda06a657d5fe49de93b4599", "type": "github" }, "original": { @@ -168,11 +168,11 @@ }, "nur": { "locked": { - "lastModified": 1713810384, - "narHash": "sha256-ze9APypWwgcNXvtc+Y/In/PCGmIzm/VefrwQKG7ge7E=", + "lastModified": 1712485930, + "narHash": "sha256-Gx1kXJYnYENoJKWdZpTSDj9fAbnhSzp/cTpFFIXre/M=", "owner": "nix-community", "repo": "NUR", - "rev": "5d454967f1d978fe45956d25ed7ee15b9910da18", + "rev": "e4dfbd7eb86b3ac1bf5b7d5c4ca200dba5cbb5a9", "type": "github" }, "original": { @@ -197,11 +197,11 @@ ] }, "locked": { - "lastModified": 1713775815, - "narHash": "sha256-Wu9cdYTnGQQwtT20QQMg7jzkANKQjwBD9iccfGKkfls=", + "lastModified": 1712055707, + "narHash": "sha256-4XLvuSIDZJGS17xEwSrNuJLL7UjDYKGJSbK1WWX2AK8=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "2ac4dcbf55ed43f3be0bae15e181f08a57af24a4", + "rev": "e35aed5fda3cc79f88ed7f1795021e559582093a", "type": "github" }, "original": { diff --git a/hosts/nixos/porthos/services.nix b/hosts/nixos/porthos/services.nix index 23901f7..a67ae3b 100644 --- a/hosts/nixos/porthos/services.nix +++ b/hosts/nixos/porthos/services.nix @@ -10,11 +10,6 @@ in adblock = { enable = true; }; - # Audiobook and podcast library - audiobookshelf = { - enable = true; - port = 9599; - }; # Backblaze B2 backup backup = { enable = true; @@ -139,7 +134,6 @@ in podgrab = { enable = true; passwordFile = secrets."podgrab/password".path; - dataDir = "/data/media/podcasts"; port = 9598; }; # Regular backups diff --git a/modules/nixos/services/audiobookshelf/default.nix b/modules/nixos/services/audiobookshelf/default.nix deleted file mode 100644 index 8c9719d..0000000 --- a/modules/nixos/services/audiobookshelf/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -# Audiobook and podcast library -{ config, lib, ... }: -let - cfg = config.my.services.audiobookshelf; -in -{ - options.my.services.audiobookshelf = with lib; { - enable = mkEnableOption "Audiobookshelf, a self-hosted podcast manager"; - - port = mkOption { - type = types.port; - default = 8000; - example = 4242; - description = "The port on which Audiobookshelf will listen for incoming HTTP traffic."; - }; - }; - - config = lib.mkIf cfg.enable { - services.audiobookshelf = { - enable = true; - inherit (cfg) port; - - group = "media"; - }; - - # Set-up media group - users.groups.media = { }; - - my.services.nginx.virtualHosts = { - audiobookshelf = { - inherit (cfg) port; - # Proxy websockets for RPC - extraConfig = { - locations."/".proxyWebsockets = true; - }; - }; - }; - }; -} diff --git a/modules/nixos/services/default.nix b/modules/nixos/services/default.nix index 60b2478..3b32d06 100644 --- a/modules/nixos/services/default.nix +++ b/modules/nixos/services/default.nix @@ -4,7 +4,6 @@ imports = [ ./adblock ./aria - ./audiobookshelf ./backup ./blog ./calibre-web diff --git a/modules/nixos/services/podgrab/default.nix b/modules/nixos/services/podgrab/default.nix index ea89e4e..5ceebb6 100644 --- a/modules/nixos/services/podgrab/default.nix +++ b/modules/nixos/services/podgrab/default.nix @@ -17,15 +17,6 @@ in ''; }; - dataDir = mkOption { - type = with types; nullOr str; - default = null; - example = "/mnt/podgrab"; - description = '' - Path to the directory to store the podcasts. Use default if null - ''; - }; - port = mkOption { type = types.port; default = 8080; @@ -38,14 +29,8 @@ in services.podgrab = { enable = true; inherit (cfg) passwordFile port; - - group = "media"; - dataDirectory = lib.mkIf (cfg.dataDir != null) cfg.dataDir; }; - # Set-up media group - users.groups.media = { }; - my.services.nginx.virtualHosts = { podgrab = { inherit (cfg) port;