From 3387c105b46b56b77adf6496ff443848456650a0 Mon Sep 17 00:00:00 2001 From: Aleksandr Lebedev Date: Wed, 15 Oct 2025 03:06:06 +0200 Subject: [PATCH] Update --- flake.lock | 48 +++++++++---------- flake.nix | 2 +- .../stargate/services/jellyfin.nix | 17 ++++++- .../stargate/services/nextcloud.nix | 23 +++++++-- 4 files changed, 60 insertions(+), 30 deletions(-) diff --git a/flake.lock b/flake.lock index 7236b3c..985b926 100644 --- a/flake.lock +++ b/flake.lock @@ -179,11 +179,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1760344646, - "narHash": "sha256-ong/r42W1SkvQsdX5J8vM0Y4oy/EKTsHh+9ZB4nep4w=", + "lastModified": 1760395520, + "narHash": "sha256-4hVEyj3H4i0kwtO8dDIKee1WoZ0iMZxr3ageSdJ6Cck=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "72ee6f4622d41d0b19c2bb4f521ef4cd970424c4", + "rev": "c438d72cee048fe6203df15c81a230efb16fa409", "type": "github" }, "original": { @@ -333,11 +333,11 @@ ] }, "locked": { - "lastModified": 1760391849, - "narHash": "sha256-3a+CNuiAXqdMC14N1nmXHM9j461k4VGSKy2v3+Da2Ow=", + "lastModified": 1760475170, + "narHash": "sha256-kkSgLR0s+GmAo/6NzBhWAmTvRD74EPZVJsSW46YW7pE=", "owner": "KyleKrein", "repo": "DesktopShell", - "rev": "a3ada5b2bb735c45ca66634f40c4277ab24767ce", + "rev": "5f95fa5e79f1ae2c0856a9e4e8acf99501665d8e", "type": "github" }, "original": { @@ -1202,11 +1202,11 @@ }, "master": { "locked": { - "lastModified": 1760394959, - "narHash": "sha256-qhwkiyu42Fn2eDiLWB61qPlgk+qg74C9qCu3RUT/++E=", + "lastModified": 1760481285, + "narHash": "sha256-jCbF0LPZb0ExCTJi+Uj+VHg6mqVZt8s9QCA+Ps4jpOY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c4a1dc3b9f5751bb8f6b108c7c8b0dd3d9e84203", + "rev": "3cba776f4720a87e64917ccdcb97c0640860b390", "type": "github" }, "original": { @@ -1228,11 +1228,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1760376620, - "narHash": "sha256-wx2gkuQcEm4VAVn4YHLMHinyzbSKj669zk60gEuIEHc=", + "lastModified": 1760432014, + "narHash": "sha256-shqc+38nKs/XS2scgJV8KP5/D0PWAXYYgf5nT6BfHNE=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "d704fb90b155dcd19311fc42e21b9d1739b17a09", + "rev": "f2aa74f5d28fed7fca48cd4bea4c0803699c0f6c", "type": "github" }, "original": { @@ -1261,11 +1261,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1759395653, - "narHash": "sha256-sv9J1z6CrTPf9lRJLyCN90fZVdQz7LFeX7pIlInH8BQ=", + "lastModified": 1760426302, + "narHash": "sha256-HEeX0wTT2DTRAgADnOmcyk7k/J8KlFosBpFp0yIVfm0=", "owner": "YaLTeR", "repo": "niri", - "rev": "ba6e5e082a79901dc89b0d49c5da1b769d652aec", + "rev": "87dc96fa69738b5d57562a0a556efa7def138539", "type": "github" }, "original": { @@ -1444,11 +1444,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1759833546, - "narHash": "sha256-rOfkgIiiZNPUbf61OqEym60wXEODeDG8XH+gV/SUoUc=", + "lastModified": 1760454217, + "narHash": "sha256-qG4cQaYRKrAMj4OjISYYoWqJc+xcoJnLx2jsws7EdGg=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "7c0c0f4c3a51761434f18209fa9499b8579ff730", + "rev": "a8209ae46721f2a70214d0a70388a812ec7740da", "type": "github" }, "original": { @@ -1460,11 +1460,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1760038930, - "narHash": "sha256-Oncbh0UmHjSlxO7ErQDM3KM0A5/Znfofj2BSzlHLeVw=", + "lastModified": 1760284886, + "narHash": "sha256-TK9Kr0BYBQ/1P5kAsnNQhmWWKgmZXwUQr4ZMjCzWf2c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0b4defa2584313f3b781240b29d61f6f9f7e0df3", + "rev": "cf3f5c4def3c7b5f1fc012b3d839575dbe552d43", "type": "github" }, "original": { @@ -2001,11 +2001,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1760352574, - "narHash": "sha256-Wtp6XEiVDVmxGSYafyM6gdZVyOoqg7NMQd07RkpFFWM=", + "lastModified": 1760478648, + "narHash": "sha256-Y4l+Y3zUvqIDbyLrtOrzNvp1o50Fp9TYK+iwtwweFU4=", "owner": "danth", "repo": "stylix", - "rev": "ca10aa9c6703b088bdac02d8352fd91d5496e4ed", + "rev": "1ec254101285777db13922303cc47ded06e10bb3", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 5c253ba..7e1e883 100644 --- a/flake.nix +++ b/flake.nix @@ -44,7 +44,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; beeengine = { - url = "git+https://github.com/KyleKrein/BeeEngine?submodules=1"; #"git+https://gitlab.kylekrein.com/beeengine/BeeEngine?shallow=1"; + url = "git+https://github.com/KyleKrein/BeeEngine?submodules=1"; #"git+https://git.kylekrein.com/BeeEngine/BeeEngine?shallow=1"; inputs.nixpkgs.follows = "nixpkgs"; }; conduwuit = { diff --git a/systems/x86_64-linux/stargate/services/jellyfin.nix b/systems/x86_64-linux/stargate/services/jellyfin.nix index a6c3a56..507eea2 100644 --- a/systems/x86_64-linux/stargate/services/jellyfin.nix +++ b/systems/x86_64-linux/stargate/services/jellyfin.nix @@ -19,7 +19,18 @@ with lib.custom; { }; services.declarative-jellyfin = { enable = true; - openFirewall = true; + libraries = { + Movies = { + enabled = true; + contentType = "movies"; + pathInfos = ["/zstorage/media/movies"]; + }; + Series = { + enabled = true; + contentType = "tvshows"; + pathInfos = ["/zstorage/media/series"]; + }; + }; users = { admin = { mutable = false; @@ -38,12 +49,14 @@ with lib.custom; { ]; system = { serverName = "Jellyfin Homeserver for Bees"; + enableExternalContentInSuggestions = false; + preferredMetadataLanguage = "ru"; # Use Hardware Acceleration for trickplay image generation trickplayOptions = { enableHwAcceleration = true; enableHwEncoding = true; }; - UICulture = "ru"; + UICulture = "ru-RU"; }; encoding = { enableHardwareEncoding = true; diff --git a/systems/x86_64-linux/stargate/services/nextcloud.nix b/systems/x86_64-linux/stargate/services/nextcloud.nix index 0781118..7855a6d 100644 --- a/systems/x86_64-linux/stargate/services/nextcloud.nix +++ b/systems/x86_64-linux/stargate/services/nextcloud.nix @@ -24,12 +24,29 @@ with lib.custom; { }; hostName = "nextcloud.kylekrein.com"; https = true; + # https://github.com/NixOS/nixpkgs/blob/nixpkgs-unstable/pkgs/servers/nextcloud/packages/nextcloud-apps.json extraApps = { - inherit (config.services.nextcloud.package.packages.apps) contacts calendar tasks whiteboard; + inherit + (config.services.nextcloud.package.packages.apps) + contacts + calendar + tasks + whiteboard + #twofactor_totp + spreed + maps + integration_paperless + deck + ; }; autoUpdateApps.enable = true; extraAppsEnable = true; - - configureRedis = false; + configureRedis = true; + }; + services.nextcloud-whiteboard-server = { + enable = false;#true; + settings = { + NEXTCLOUD_URL = "https://nextcloud.kylekrein.com"; + }; }; }