From a455c6954c6dc749b48d4a6d9b114f4e6a62c692 Mon Sep 17 00:00:00 2001 From: uttarayan21 Date: Tue, 29 Jul 2025 13:20:38 +0530 Subject: [PATCH] feat: Added stuff --- nixos/mirai/services/immich.nix | 4 +++- nixos/mirai/services/llama.nix | 2 +- nixos/mirai/services/lldap.nix | 2 -- nixos/tsuba/services/servarr.nix | 13 ++++++++++++- secrets/secrets.yaml | 6 +++--- 5 files changed, 19 insertions(+), 8 deletions(-) diff --git a/nixos/mirai/services/immich.nix b/nixos/mirai/services/immich.nix index 5137d6b8..e67c1155 100644 --- a/nixos/mirai/services/immich.nix +++ b/nixos/mirai/services/immich.nix @@ -3,10 +3,12 @@ secrets."authelia/oidc/immich/client_id" = { owner = config.systemd.services.authelia-darksailor.serviceConfig.User; mode = "0440"; + restartUnits = ["immich-server.service" "authelia-darksailor.service"]; }; secrets."authelia/oidc/immich/client_secret" = { owner = config.systemd.services.authelia-darksailor.serviceConfig.User; mode = "0440"; + restartUnits = ["immich-server.service" "authelia-darksailor.service"]; }; templates = { "immich-config.json" = { @@ -36,10 +38,10 @@ ''; mode = "0400"; owner = "immich"; + restartUnits = ["immich-server.service" "authelia-darksailor.service"]; }; }; }; - users.users.immich.extraGroups = [config.systemd.services.authelia-darksailor.serviceConfig.Group]; services.immich = { enable = true; mediaLocation = "/media/photos/immich"; diff --git a/nixos/mirai/services/llama.nix b/nixos/mirai/services/llama.nix index 28305d99..39d78f8f 100644 --- a/nixos/mirai/services/llama.nix +++ b/nixos/mirai/services/llama.nix @@ -28,7 +28,7 @@ }; }; open-webui = { - enable = false; + enable = true; port = 7070; environment = { SCARF_NO_ANALYTICS = "True"; diff --git a/nixos/mirai/services/lldap.nix b/nixos/mirai/services/lldap.nix index 3f6e78fd..c1fe9024 100644 --- a/nixos/mirai/services/lldap.nix +++ b/nixos/mirai/services/lldap.nix @@ -13,8 +13,6 @@ http_port = 5090; ldap_port = 389; ldap_host = "::"; - # environment = { - # }; environmentFile = '' LLDAP_LDAP_USER_PASS_FILE = ${config.sops.secrets."lldap/admin".path}; LLDAP_JWT_SECRET_FILE = ${config.sops.secrets."lldap/jwt".path}; diff --git a/nixos/tsuba/services/servarr.nix b/nixos/tsuba/services/servarr.nix index f950bb00..e2d01e10 100644 --- a/nixos/tsuba/services/servarr.nix +++ b/nixos/tsuba/services/servarr.nix @@ -4,26 +4,37 @@ lib, ... }: { - services = { + services = let + settings = { + auth = { + authentication_enabled = true; + authentication_method = "External"; + }; + }; + in { sonarr = { enable = true; package = unstablePkgs.sonarr; group = "media"; + inherit settings; }; radarr = { enable = true; package = unstablePkgs.radarr; group = "media"; + inherit settings; }; lidarr = { enable = true; package = unstablePkgs.lidarr; group = "media"; + inherit settings; }; bazarr = { enable = true; package = unstablePkgs.bazarr; group = "media"; + # settings.AuthenticationMethod = "External"; }; caddy.virtualHosts = { "sonarr.tsuba.darksailor.dev".extraConfig = '' diff --git a/secrets/secrets.yaml b/secrets/secrets.yaml index d44c654e..55ac2bf7 100644 --- a/secrets/secrets.yaml +++ b/secrets/secrets.yaml @@ -28,7 +28,7 @@ authelia: oidc: immich: client_id: ENC[AES256_GCM,data:LpB+nR7SGI2EV4YK0VptF5zJ6Ai/LDfikUpoAnFWnT8krMOQ/voqjS6jhqaFz9IKhtPQL9TNZOONr5JjkDZR7sI63Ohv4Lnx,iv:J96CL8EHHj88YbQW7rdQK9C6MxXaHnMt+mgL3iL5Heg=,tag:aXD/HdWXO/e6aKGnay0W+g==,type:str] - client_secret: ENC[AES256_GCM,data:O+EF+Cim65J5LZTCcXVj0ln0TES6IOUk/YZ04JKxJZNJevOKxFq/CJdhkEgXTfgnDklob8m0nOBLAzHR0KhX+5sYW54PKge+nrnAT2qqHnHPCz9RxvyIEE1IbaF2vkBbz/s7d5L/+tiWz95aq8D3H93JDf3x6Ej0tG0auDx1Ui8=,iv:pYGNnFy+EotN5a/ODnlmYu0lqVY29IVl1KGiwoldJ5M=,tag:hwh4XjO7T650WsLBP0QptA==,type:str] + client_secret: ENC[AES256_GCM,data:aQylVYsqDExbavjGsVAXPlf/rxileM3xLM0EXCKHfiNYxwzXck/f/bvwZl7ChQZ/AHDvZ8mkMkZHyTdyap25Hg==,iv:swSrM8MvhLcq7Gw/lV36j//8fnTzBcs5wU8aj+n9obE=,tag:neaHG+UCVhmZ2HLqVa/jGA==,type:str] jwks: ENC[AES256_GCM,data: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,iv:gGKyTUigpnqg3Fgd76INrESRT27hJRzYQ3xk8heNkWk=,tag:fVc8rg1Or63X/14neG+8Cw==,type:str] lldap: jwt: ENC[AES256_GCM,data:61dwC1ElOOGaf0CmalzXZnxImEyufKjUUWcNaEcOuv3TEODhQyHK7g==,iv:CVEJVuaCc2gDmSYWHS3fPL8FjbvblF6IladAzGoGb0o=,tag:OMm/OdKjliHjsGqJripLbg==,type:str] @@ -60,7 +60,7 @@ sops: VGZKdHpVeFRpQUxtSEkyaEhLMlBJcGsKLb0DvPNZosPBUuiX6qz1s5IO5INQh8CK ZtXTVClwMSmaUYhdSB2gKFrKVZHXTJZ4oAL5t/BpC0pOHyr+o96T3Q== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-07-28T23:58:36Z" - mac: ENC[AES256_GCM,data:7JGT769FVxF8SRs3CeXXzAo1arSST95bnzx6QIsFfifF4nI/xy+bGkDr+Iq4wL83AgEuL2DtJ+ZCUaCLYlfNiMgfEft/s5+fhOvJ9gB6O5YHwLOjwn2CKhqjQ38v/34URMG3P9N9GLR5nuqRpVKrjf95P5cLr9FQDMr6pe9GmPw=,iv:Pzrt44nn0Bxj8xZLi6G3bGl8nMwGHCcBFsV0b8YsJZw=,tag:tNljFnq1rb3lUBuAjQfcZA==,type:str] + lastmodified: "2025-07-29T07:19:37Z" + mac: ENC[AES256_GCM,data:bdLqeJPLiLLyeVjqYM3ec4HnLcrKN6dd5B8qYr49flEzi7+hRKHmhbZt/xTAMEx4YNN+6dPZMipX0+cn4c/LIozY9QlNiDV0mOfXmmM60xkkSd6Bo3Wge39E+oJ9n4Ne3RG2ynmW4sxsJDBd1d3bCj8RQVfvNeLmOh9fvW+5vug=,iv:H7JSEy5z5Dgvq8cbzL1/r5S6Nm0mx3uzWHaBzg0esXc=,tag:fP+Wu4mRQL8cAZ7KOh7+4g==,type:str] unencrypted_suffix: _unencrypted version: 3.10.2