From e89ab6bda15ebdd41f2461e2f4841bdaed29fe30 Mon Sep 17 00:00:00 2001 From: Noah Pederson Date: Thu, 14 Aug 2025 20:48:37 -0500 Subject: [PATCH] FIX: override immich and plex --- configuration.nix | 1 - flake.nix | 4 +++- noah-home.nix | 2 +- overrides/immich-sources.json | 26 ++++++++++++++++++++++++++ services.nix | 19 ++++++++++++++++++- users.nix | 2 +- 6 files changed, 49 insertions(+), 5 deletions(-) create mode 100644 overrides/immich-sources.json diff --git a/configuration.nix b/configuration.nix index 9d4d09b..c1d2d46 100644 --- a/configuration.nix +++ b/configuration.nix @@ -16,7 +16,6 @@ ./packages.nix ./services.nix ]; - # Set your time zone. time.timeZone = "America/Chicago"; diff --git a/flake.nix b/flake.nix index 87c4e92..0732a10 100644 --- a/flake.nix +++ b/flake.nix @@ -49,7 +49,9 @@ devShells = forAllSystems (system: { default = nixpkgs.legacyPackages.${system}.mkShell { inherit (self.checks.${system}.pre-commit-check) shellHook; - buildInputs = self.checks.${system}.pre-commit-check.enabledPackages; + buildInputs = [ + pkgs.nixfmt-rfc-style + ] ++ self.checks.${system}.pre-commit-check.enabledPackages; }; }); }; diff --git a/noah-home.nix b/noah-home.nix index 320aa09..0251580 100644 --- a/noah-home.nix +++ b/noah-home.nix @@ -137,7 +137,7 @@ in services.mbsync = { enable = true; - frequency = "hourly"; + frequency = "*:0/10"; #configFile = ./mbsyncrc; }; diff --git a/overrides/immich-sources.json b/overrides/immich-sources.json new file mode 100644 index 0000000..458ad05 --- /dev/null +++ b/overrides/immich-sources.json @@ -0,0 +1,26 @@ +{ + "version": "1.137.3", + "hash": "sha256-oKDIx63LayDWhd4uE16rqFWmmwwSWUsUvgZKsgE3KWg=", + "components": { + "cli": { + "npmDepsHash": "sha256-Cjk95tsQM89LkMq6H3B5WYdYrMi3hB6d1XpN2xhHv2U=", + "version": "2.2.77" + }, + "server": { + "npmDepsHash": "sha256-CvczIXE3Z3LwZezG7kbfJqg2fak2BRXTr0op1Jo1LIg=", + "version": "1.137.3" + }, + "web": { + "npmDepsHash": "sha256-PcNgD/JFt3221Qgi54XzQZNa53iw3BUe31DM8k+nz/4=", + "version": "1.137.3" + }, + "open-api/typescript-sdk": { + "npmDepsHash": "sha256-M4ahH6ZP0E3wEgK4VLqSsNjhMFNVTMeRFdzU9EO53vE=", + "version": "1.137.3" + }, + "geonames": { + "timestamp": "20250812073904", + "hash": "sha256-02ADfg5wHT1R3vu6imPP22BbT5Y5315eRGmI0mEryGc=" + } + } +} diff --git a/services.nix b/services.nix index 81dc005..2af2f9e 100644 --- a/services.nix +++ b/services.nix @@ -1,10 +1,26 @@ -{ config, lib, pkgs, ... }: +{ config +, lib +, pkgs +, ... +}: let unstable = import { config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "plexmediaserver" "teamspeak-server" ]; + overlays = [ + (final: prev: { + plex = prev.plex.overrideAttrs (_: rec { + version = "1.42.1.10060-4e8b05daf"; + src = final.fetchurl { + url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; + sha256 = "OoItvG0IpgUKlZ0JmzDc2WqMtyZrlNCF7MCnUKqBl/Q="; + }; + }); + immich = prev.immich.override { sourcesJSON = ./overrides/immich-sources.json; }; + }) + ]; }; _age = import { }; in @@ -323,6 +339,7 @@ in services.immich = { enable = true; + package = unstable.immich; accelerationDevices = [ "/dev/dri/renderD128" ]; mediaLocation = "/srv/shokuhou/pictures/immich"; }; diff --git a/users.nix b/users.nix index 3b8684b..e5aed07 100644 --- a/users.nix +++ b/users.nix @@ -27,7 +27,7 @@ in name = "chiefnoah.keys"; # Update this with: # `curl https://meta.sr.ht/~chiefnoah.keys | sha256sum` - sha256 = "19x8lim69kd06spqxjs7ril68izrqzkgqdvn45z2vkqgkw0jjzxh"; + sha256 = "0l295n3i2b1agx8xl8l12zlck35qn9vja8fgvhk4g0v4132wfzgg"; })); }; -- 2.51.2