From f2d49cbc15ce51c6939e254b3fbc3b776929ca25 Mon Sep 17 00:00:00 2001 From: fi Date: Sat, 15 Feb 2025 15:48:18 +0100 Subject: [PATCH 1/5] Enable systemd-resolved for jellyseerr --- config/hosts/jellyseerr/configuration.nix | 6 ++++++ config/hosts/jellyseerr/jellyseerr.nix | 11 ++++++++++- hosts.nix | 1 + 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/config/hosts/jellyseerr/configuration.nix b/config/hosts/jellyseerr/configuration.nix index 05b8f3f..cf03358 100644 --- a/config/hosts/jellyseerr/configuration.nix +++ b/config/hosts/jellyseerr/configuration.nix @@ -10,6 +10,7 @@ firewall = { allowedTCPPorts = [ 80 443 ]; }; + nameservers = [ "193.138.218.74" ]; extraHosts = '' 10.202.46.101 jellyfin.grzb.de @@ -18,5 +19,10 @@ ''; }; + services.resolved = { + enable = true; + fallbackDns = [ ]; + }; + system.stateVersion = "23.11"; } diff --git a/config/hosts/jellyseerr/jellyseerr.nix b/config/hosts/jellyseerr/jellyseerr.nix index bd473b0..8e406b0 100644 --- a/config/hosts/jellyseerr/jellyseerr.nix +++ b/config/hosts/jellyseerr/jellyseerr.nix @@ -1,6 +1,15 @@ -{ ... }: +{ pkgs, ... }: +let + jellyseerrOverlay = final: prev: { + jellyseerr = prev.jellyseerr.overrideAttrs (finalAttr: previousAttr: { + dontCheckForBrokenSymlinks = true; + }); + }; + pkgs-overlay = pkgs.extend jellyseerrOverlay; +in { services.jellyseerr = { enable = true; + package = pkgs-overlay.jellyseerr; }; } diff --git a/hosts.nix b/hosts.nix index fc029b7..1dfc6fc 100644 --- a/hosts.nix +++ b/hosts.nix @@ -39,6 +39,7 @@ in environment = "proxmox"; }; jellyfin = { + hostNixpkgs = nixpkgs-unstable; site = "vs"; environment = "proxmox"; }; From 1f8814bf3068076c1deee8504b745aeebbea4e07 Mon Sep 17 00:00:00 2001 From: fi Date: Sun, 23 Feb 2025 18:42:28 +0100 Subject: [PATCH 2/5] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/8ae4ee7978617d3af98721a62f14f25befc0beef?narHash=sha256-2h/5uQaKwQeRXIgpOJpzgeO3qe93AonbJFk0CxTSygY%3D' (2025-02-10) → 'github:NixOS/nixpkgs/2ebb630421d52099270cee0ae14f4fa9ebbe3cdf?narHash=sha256-EJB%2BlbxCkATB8F37DTmEPzfMtiQmyPY0HtgsmJOzKy0%3D' (2025-02-23) • Updated input 'nixpkgs-master': 'github:NixOS/nixpkgs/83a2581c81ff5b06f7c1a4e7cc736a455dfcf7b4?narHash=sha256-L8Tq1dnW96U70vrNpCCGCLHz4rX1GhNRCrRI/iox9wc%3D' (2025-02-12) → 'github:NixOS/nixpkgs/b3a411b68f567a7251485e58901e9b7e5269ca9d?narHash=sha256-iTpw0TQ1FM9I4IE7vLOS/zAYANS//R79nCU352ZeclE%3D' (2025-02-23) • Updated input 'nixpkgs-unstable': 'github:NixOS/nixpkgs/6cc4213488e886db863878a1e3dc26cc932d38b8?narHash=sha256-c/Z/6gZLN8BIpYh1B3qMzEn0TArjf4F2lmy59lDLVBM%3D' (2025-02-11) → 'github:NixOS/nixpkgs/b7fe81518095c48a8ba94fc7cfe5c0fc8370851b?narHash=sha256-eDAiNagpMExcLoSIgjdef2ZYyvjuy1VTF8r9OZXCMGc%3D' (2025-02-23) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 9645052..ffdb21e 100644 --- a/flake.lock +++ b/flake.lock @@ -70,11 +70,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1739188370, - "narHash": "sha256-2h/5uQaKwQeRXIgpOJpzgeO3qe93AonbJFk0CxTSygY=", + "lastModified": 1740273543, + "narHash": "sha256-EJB+lbxCkATB8F37DTmEPzfMtiQmyPY0HtgsmJOzKy0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8ae4ee7978617d3af98721a62f14f25befc0beef", + "rev": "2ebb630421d52099270cee0ae14f4fa9ebbe3cdf", "type": "github" }, "original": { @@ -101,11 +101,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1739319052, - "narHash": "sha256-L8Tq1dnW96U70vrNpCCGCLHz4rX1GhNRCrRI/iox9wc=", + "lastModified": 1740331832, + "narHash": "sha256-iTpw0TQ1FM9I4IE7vLOS/zAYANS//R79nCU352ZeclE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "83a2581c81ff5b06f7c1a4e7cc736a455dfcf7b4", + "rev": "b3a411b68f567a7251485e58901e9b7e5269ca9d", "type": "github" }, "original": { @@ -117,11 +117,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1739303263, - "narHash": "sha256-c/Z/6gZLN8BIpYh1B3qMzEn0TArjf4F2lmy59lDLVBM=", + "lastModified": 1740301968, + "narHash": "sha256-eDAiNagpMExcLoSIgjdef2ZYyvjuy1VTF8r9OZXCMGc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6cc4213488e886db863878a1e3dc26cc932d38b8", + "rev": "b7fe81518095c48a8ba94fc7cfe5c0fc8370851b", "type": "github" }, "original": { From 2b94a2bbf4ae30637351769fcdeb9e8f524ff0b7 Mon Sep 17 00:00:00 2001 From: fi Date: Sun, 23 Feb 2025 18:50:46 +0100 Subject: [PATCH 3/5] ~/node_modules/@mastodon doesn't need to be removed anymore for building mastodon --- config/hosts/mastodon/mastodon.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/config/hosts/mastodon/mastodon.nix b/config/hosts/mastodon/mastodon.nix index 5aa22ad..29d674e 100644 --- a/config/hosts/mastodon/mastodon.nix +++ b/config/hosts/mastodon/mastodon.nix @@ -50,14 +50,6 @@ let ]; }; yarnHash = "sha256-e5c04M6XplAgaVyldU5HmYMYtY3MAWs+a8Z/BGSyGBg="; - }).overrideAttrs (old: { - mastodonModules = old.mastodonModules.overrideAttrs (old: { - # FIXME: Remove once fixed in nixpkgs. See https://github.com/NixOS/nixpkgs/issues/380366 - postBuild = '' - # Remove workspace "package" as it contains broken symlinks - rm -r ~/node_modules/@mastodon - ''; - }); }); }; pkgs-overlay = pkgs.extend mastodonNekoverseOverlay; From 4661715e04f92d3b13c779381fe650fee2b20bb4 Mon Sep 17 00:00:00 2001 From: fi Date: Thu, 6 Mar 2025 17:22:25 +0100 Subject: [PATCH 4/5] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-generators': 'github:nix-community/nixos-generators/d002ce9b6e7eb467cd1c6bb9aef9c35d191b5453?narHash=sha256-3Pe0yKlCc7EOeq1X/aJVDH0CtNL%2BtIBm49vpepwL1MQ%3D' (2025-01-16) → 'github:nix-community/nixos-generators/507911df8c35939050ae324caccc7cf4ffb76565?narHash=sha256-Co2kAD2SZalOm%2B5zoxmzEVZNvZ17TyafuFsD46BwSdY%3D' (2025-03-02) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/2ebb630421d52099270cee0ae14f4fa9ebbe3cdf?narHash=sha256-EJB%2BlbxCkATB8F37DTmEPzfMtiQmyPY0HtgsmJOzKy0%3D' (2025-02-23) → 'github:NixOS/nixpkgs/1907ea1e8f63d206c8bf7991552a539f8a4baeaa?narHash=sha256-WU1ktX7V2RwyPS0BSgdOjHc0vc/rDJtr22tzd5u3t%2BU%3D' (2025-03-06) • Updated input 'nixpkgs-master': 'github:NixOS/nixpkgs/b3a411b68f567a7251485e58901e9b7e5269ca9d?narHash=sha256-iTpw0TQ1FM9I4IE7vLOS/zAYANS//R79nCU352ZeclE%3D' (2025-02-23) → 'github:NixOS/nixpkgs/14a4a1f82773653ac1ac16ed577e42d927380802?narHash=sha256-rS7qyqAQp6h0t3aS%2BFQgzliGV%2BOmh/4TdVnVnRSsGvg%3D' (2025-03-06) • Updated input 'nixpkgs-unstable': 'github:NixOS/nixpkgs/b7fe81518095c48a8ba94fc7cfe5c0fc8370851b?narHash=sha256-eDAiNagpMExcLoSIgjdef2ZYyvjuy1VTF8r9OZXCMGc%3D' (2025-02-23) → 'github:NixOS/nixpkgs/ffe8d1b1030b5de6eba761102ee34b6e41d040ee?narHash=sha256-/mxmUVd%2BAE2bTmulNfM7yICocUvavlFQHcMYK67z3qI%3D' (2025-03-06) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index ffdb21e..b83d314 100644 --- a/flake.lock +++ b/flake.lock @@ -55,11 +55,11 @@ ] }, "locked": { - "lastModified": 1737057290, - "narHash": "sha256-3Pe0yKlCc7EOeq1X/aJVDH0CtNL+tIBm49vpepwL1MQ=", + "lastModified": 1740947705, + "narHash": "sha256-Co2kAD2SZalOm+5zoxmzEVZNvZ17TyafuFsD46BwSdY=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "d002ce9b6e7eb467cd1c6bb9aef9c35d191b5453", + "rev": "507911df8c35939050ae324caccc7cf4ffb76565", "type": "github" }, "original": { @@ -70,11 +70,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1740273543, - "narHash": "sha256-EJB+lbxCkATB8F37DTmEPzfMtiQmyPY0HtgsmJOzKy0=", + "lastModified": 1741237477, + "narHash": "sha256-WU1ktX7V2RwyPS0BSgdOjHc0vc/rDJtr22tzd5u3t+U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2ebb630421d52099270cee0ae14f4fa9ebbe3cdf", + "rev": "1907ea1e8f63d206c8bf7991552a539f8a4baeaa", "type": "github" }, "original": { @@ -101,11 +101,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1740331832, - "narHash": "sha256-iTpw0TQ1FM9I4IE7vLOS/zAYANS//R79nCU352ZeclE=", + "lastModified": 1741277795, + "narHash": "sha256-rS7qyqAQp6h0t3aS+FQgzliGV+Omh/4TdVnVnRSsGvg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b3a411b68f567a7251485e58901e9b7e5269ca9d", + "rev": "14a4a1f82773653ac1ac16ed577e42d927380802", "type": "github" }, "original": { @@ -117,11 +117,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1740301968, - "narHash": "sha256-eDAiNagpMExcLoSIgjdef2ZYyvjuy1VTF8r9OZXCMGc=", + "lastModified": 1741241576, + "narHash": "sha256-/mxmUVd+AE2bTmulNfM7yICocUvavlFQHcMYK67z3qI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b7fe81518095c48a8ba94fc7cfe5c0fc8370851b", + "rev": "ffe8d1b1030b5de6eba761102ee34b6e41d040ee", "type": "github" }, "original": { From 223739213da2ba69254b5611296bc4a0cf5f2935 Mon Sep 17 00:00:00 2001 From: fi Date: Thu, 6 Mar 2025 17:22:50 +0100 Subject: [PATCH 5/5] Update mastodon to 4.3.4 --- config/hosts/mastodon/mastodon.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/hosts/mastodon/mastodon.nix b/config/hosts/mastodon/mastodon.nix index 29d674e..d8ba670 100644 --- a/config/hosts/mastodon/mastodon.nix +++ b/config/hosts/mastodon/mastodon.nix @@ -16,14 +16,14 @@ let }; mastodonNekoverseOverlay = final: prev: { mastodon = (prev.mastodon.override rec { - version = "4.3.3"; + version = "4.3.4"; srcOverride = final.applyPatches { src = pkgs.stdenv.mkDerivation { name = "mastodonWithThemes"; src = pkgs.fetchgit { url = "https://github.com/mastodon/mastodon.git"; rev = "v${version}"; - sha256 = "sha256-6FyLhRy+/uW+RYt+IRHpkTABjKGTQYjR/4GSPN+GlGY="; + sha256 = "sha256-2FpiFSK9CBm7eHqVvV8pPp6fLc5jCcUektpSyxNnXtw="; }; # mastodon ships with broken symlinks, disable the check for that for now dontCheckForBrokenSymlinks = true;