From 71e559b7cfa1ec56b51995e6ac2cc4e8ebcbb225 Mon Sep 17 00:00:00 2001 From: ooks-io Date: Sun, 26 May 2024 13:13:53 +1200 Subject: [PATCH] refactor(nixarr): move nixarr module to media-server role dir --- inputs/system/modules/roles/media-server/default.nix | 5 +++++ .../modules/roles/media-server/services/default.nix | 5 +++++ .../roles/media-server/services}/nixarr.nix | 9 ++++++--- 3 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 inputs/system/modules/roles/media-server/default.nix create mode 100644 inputs/system/modules/roles/media-server/services/default.nix rename inputs/system/{hosts/ooksmedia => modules/roles/media-server/services}/nixarr.nix (78%) diff --git a/inputs/system/modules/roles/media-server/default.nix b/inputs/system/modules/roles/media-server/default.nix new file mode 100644 index 0000000..f35bfde --- /dev/null +++ b/inputs/system/modules/roles/media-server/default.nix @@ -0,0 +1,5 @@ +{ + imports = [ + ./services + ]; +} diff --git a/inputs/system/modules/roles/media-server/services/default.nix b/inputs/system/modules/roles/media-server/services/default.nix new file mode 100644 index 0000000..17f57b8 --- /dev/null +++ b/inputs/system/modules/roles/media-server/services/default.nix @@ -0,0 +1,5 @@ +{ + imports = [ + ./nixarr.nix + ]; +} diff --git a/inputs/system/hosts/ooksmedia/nixarr.nix b/inputs/system/modules/roles/media-server/services/nixarr.nix similarity index 78% rename from inputs/system/hosts/ooksmedia/nixarr.nix rename to inputs/system/modules/roles/media-server/services/nixarr.nix index ad8fa7a..0652eff 100644 --- a/inputs/system/hosts/ooksmedia/nixarr.nix +++ b/inputs/system/modules/roles/media-server/services/nixarr.nix @@ -1,5 +1,8 @@ -{ inputs, ... }: - +{ config, inputs, ... }: + +let + admin = config.systemModules.host.admin; +in { imports = [ inputs.nixarr.nixosModules.default ]; @@ -7,7 +10,7 @@ enable = true; mediaDir = "/jellyfin"; stateDir = "/var/lib/nixarr"; - mediaUsers = ["ooks"]; + mediaUsers = ["${admin.name}"]; jellyfin.enable = true; sonarr.enable = true;