diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-02-08 00:01:49 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-02-08 00:01:49 +0000 |
commit | 335510eb84fa270800feef5bfef6efb6ef907f8a (patch) | |
tree | f4f591e86efe32294e59e119240174db22a9328c /nixos | |
parent | 40bf8d25aa25969174ca5d1eb121191d984461c0 (diff) | |
parent | 60c52a73f1d5858020ac4f161cd5bf1c9650f8b8 (diff) | |
download | nixlib-335510eb84fa270800feef5bfef6efb6ef907f8a.tar nixlib-335510eb84fa270800feef5bfef6efb6ef907f8a.tar.gz nixlib-335510eb84fa270800feef5bfef6efb6ef907f8a.tar.bz2 nixlib-335510eb84fa270800feef5bfef6efb6ef907f8a.tar.lz nixlib-335510eb84fa270800feef5bfef6efb6ef907f8a.tar.xz nixlib-335510eb84fa270800feef5bfef6efb6ef907f8a.tar.zst nixlib-335510eb84fa270800feef5bfef6efb6ef907f8a.zip |
Merge master into staging-next
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/programs/calls.nix | 2 | ||||
-rw-r--r-- | nixos/modules/services/misc/plex.nix | 18 |
2 files changed, 7 insertions, 13 deletions
diff --git a/nixos/modules/programs/calls.nix b/nixos/modules/programs/calls.nix index 59961625e5d9..08a223b408d4 100644 --- a/nixos/modules/programs/calls.nix +++ b/nixos/modules/programs/calls.nix @@ -14,6 +14,8 @@ in { }; config = mkIf cfg.enable { + programs.dconf.enable = true; + environment.systemPackages = [ pkgs.calls ]; diff --git a/nixos/modules/services/misc/plex.nix b/nixos/modules/services/misc/plex.nix index 2ae4e80d5c3f..7000d45975fc 100644 --- a/nixos/modules/services/misc/plex.nix +++ b/nixos/modules/services/misc/plex.nix @@ -6,6 +6,10 @@ let cfg = config.services.plex; in { + imports = [ + (mkRemovedOptionModule [ "services" "plex" "managePlugins" ] "Please omit or define the option: `services.plex.extraPlugins' instead.") + ]; + options = { services.plex = { enable = mkEnableOption "Plex Media Server"; @@ -42,16 +46,6 @@ in ''; }; - managePlugins = mkOption { - type = types.bool; - default = true; - description = '' - If set to true, this option will cause all of the symlinks in Plex's - plugin directory to be removed and symlinks for paths specified in - <option>extraPlugins</option> to be added. - ''; - }; - extraPlugins = mkOption { type = types.listOf types.path; default = []; @@ -59,9 +53,7 @@ in A list of paths to extra plugin bundles to install in Plex's plugin directory. Every time the systemd unit for Plex starts up, all of the symlinks in Plex's plugin directory will be cleared and this module - will symlink all of the paths specified here to that directory. If - this behavior is undesired, set <option>managePlugins</option> to - false. + will symlink all of the paths specified here to that directory. ''; }; |