From 6ddf1846f6d769f2974d08daaf6bb6b075c444c6 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Tue, 20 Aug 2024 21:13:54 -0400 Subject: [PATCH] Added special folders + more jellyfin stuff --- hosts/fwbook.nix | 1 + hosts/hl-bigbox1.nix | 1 + hosts/hl-fws1.nix | 1 + hosts/hl-minipc1.nix | 1 + hosts/hl-terra1.nix | 1 + modules/nixos/server/admin.nix | 19 +++++++++++++++++++ modules/nixos/server/jellyfin.nix | 19 ++++++++++++++++++- 7 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 modules/nixos/server/admin.nix diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index e290f1a..a7f880c 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -8,6 +8,7 @@ in imports = [ ./fwbook.hardware-configuration.nix ]; # Skyg skyg.user.enabled = true; + skyg.server.admin.enable = true; skyg.nixos.desktop = { enabled = true; kde.enabled = true; diff --git a/hosts/hl-bigbox1.nix b/hosts/hl-bigbox1.nix index b3dabba..85f0a85 100644 --- a/hosts/hl-bigbox1.nix +++ b/hosts/hl-bigbox1.nix @@ -6,6 +6,7 @@ skyg.nixos.common.ssh-server.enabled = true; skyg.nixos.server.services.ai.enable = true; skyg.nixos.server.services.jellyfin.enable = true; + skyg.server.admin.enable = true; # firmware updater services.fwupd.enable = true; virtualisation.docker.enableNvidia = true; diff --git a/hosts/hl-fws1.nix b/hosts/hl-fws1.nix index 83b33ed..4896790 100644 --- a/hosts/hl-fws1.nix +++ b/hosts/hl-fws1.nix @@ -3,6 +3,7 @@ imports = [ ./hl-minipc1.hardware-configuration.nix ]; skyg.user.enabled = true; skyg.nixos.common.ssh-server.enabled = true; + skyg.server.admin.enable = true; # firmware updater services.fwupd.enable = true; diff --git a/hosts/hl-minipc1.nix b/hosts/hl-minipc1.nix index b55a0d0..5da546b 100644 --- a/hosts/hl-minipc1.nix +++ b/hosts/hl-minipc1.nix @@ -12,6 +12,7 @@ in imports = [ ./hl-minipc1.hardware-configuration.nix ]; skyg.user.enabled = true; skyg.nixos.common.ssh-server.enabled = true; + skyg.server.admin.enable = true; # Nix Stores services.nix-serve = { diff --git a/hosts/hl-terra1.nix b/hosts/hl-terra1.nix index c28fe3d..94ffb04 100644 --- a/hosts/hl-terra1.nix +++ b/hosts/hl-terra1.nix @@ -17,6 +17,7 @@ in imports = [ ./hl-terra1.hardware-configuration.nix ]; skyg.user.enabled = true; skyg.nixos.common.ssh-server.enabled = true; + skyg.server.admin.enable = true; # firmware updater services.fwupd.enable = true; # Bootloader. diff --git a/modules/nixos/server/admin.nix b/modules/nixos/server/admin.nix new file mode 100644 index 0000000..3dabf17 --- /dev/null +++ b/modules/nixos/server/admin.nix @@ -0,0 +1,19 @@ +{ config, lib, ... }: +with lib; +let cfg = config.skyg.server.admin; +in { + options = { + skyg.server.admin = { + enable = mkEnableOption + "Enable special linux user & groups"; + }; + }; + config = mkIf cfg.enable { + users.groups.shared-files = { + gid = 6660; + members = [ + config.skyg.user.name + ]; + }; + }; +} diff --git a/modules/nixos/server/jellyfin.nix b/modules/nixos/server/jellyfin.nix index 8a003fa..9d693f2 100644 --- a/modules/nixos/server/jellyfin.nix +++ b/modules/nixos/server/jellyfin.nix @@ -4,17 +4,34 @@ with lib; let cfg = config.skyg.nixos.server.services.jellyfin; + user = "jellyfin"; + group = "jellyfin"; in { options = { skyg.nixos.server.services.jellyfin = { enable = mkEnableOption - "Enable AI Services"; + "Enable Jellyfish"; }; }; config = mkIf cfg.enable { + users.users.${user} = { + uid = 7777; + isSystemUser = true; + }; + users.groups.${group} = { + gid = 7777; + members = [ + user + config.skyg.user.name + ]; + }; + users.groups.shared-files.members = [ + user + ]; services.jellyfin = { + inherit user group; enable = true; dataDir = "/mnt/apps/jellyfin/datadir"; configDir = "/mnt/apps/jellyfin/configdir";