Compare commits
5 commits
d8364d07c3
...
223739213d
Author | SHA1 | Date | |
---|---|---|---|
|
223739213d | ||
|
4661715e04 | ||
|
2b94a2bbf4 | ||
|
1f8814bf30 | ||
|
f2d49cbc15 |
|
@ -10,6 +10,7 @@
|
||||||
firewall = {
|
firewall = {
|
||||||
allowedTCPPorts = [ 80 443 ];
|
allowedTCPPorts = [ 80 443 ];
|
||||||
};
|
};
|
||||||
|
nameservers = [ "193.138.218.74" ];
|
||||||
extraHosts =
|
extraHosts =
|
||||||
''
|
''
|
||||||
10.202.46.101 jellyfin.grzb.de
|
10.202.46.101 jellyfin.grzb.de
|
||||||
|
@ -18,5 +19,10 @@
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
services.resolved = {
|
||||||
|
enable = true;
|
||||||
|
fallbackDns = [ ];
|
||||||
|
};
|
||||||
|
|
||||||
system.stateVersion = "23.11";
|
system.stateVersion = "23.11";
|
||||||
}
|
}
|
||||||
|
|
|
@ -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 = {
|
services.jellyseerr = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
package = pkgs-overlay.jellyseerr;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,14 +16,14 @@ let
|
||||||
};
|
};
|
||||||
mastodonNekoverseOverlay = final: prev: {
|
mastodonNekoverseOverlay = final: prev: {
|
||||||
mastodon = (prev.mastodon.override rec {
|
mastodon = (prev.mastodon.override rec {
|
||||||
version = "4.3.3";
|
version = "4.3.4";
|
||||||
srcOverride = final.applyPatches {
|
srcOverride = final.applyPatches {
|
||||||
src = pkgs.stdenv.mkDerivation {
|
src = pkgs.stdenv.mkDerivation {
|
||||||
name = "mastodonWithThemes";
|
name = "mastodonWithThemes";
|
||||||
src = pkgs.fetchgit {
|
src = pkgs.fetchgit {
|
||||||
url = "https://github.com/mastodon/mastodon.git";
|
url = "https://github.com/mastodon/mastodon.git";
|
||||||
rev = "v${version}";
|
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
|
# mastodon ships with broken symlinks, disable the check for that for now
|
||||||
dontCheckForBrokenSymlinks = true;
|
dontCheckForBrokenSymlinks = true;
|
||||||
|
@ -50,14 +50,6 @@ let
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
yarnHash = "sha256-e5c04M6XplAgaVyldU5HmYMYtY3MAWs+a8Z/BGSyGBg=";
|
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;
|
pkgs-overlay = pkgs.extend mastodonNekoverseOverlay;
|
||||||
|
|
24
flake.lock
24
flake.lock
|
@ -55,11 +55,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1737057290,
|
"lastModified": 1740947705,
|
||||||
"narHash": "sha256-3Pe0yKlCc7EOeq1X/aJVDH0CtNL+tIBm49vpepwL1MQ=",
|
"narHash": "sha256-Co2kAD2SZalOm+5zoxmzEVZNvZ17TyafuFsD46BwSdY=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixos-generators",
|
"repo": "nixos-generators",
|
||||||
"rev": "d002ce9b6e7eb467cd1c6bb9aef9c35d191b5453",
|
"rev": "507911df8c35939050ae324caccc7cf4ffb76565",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -70,11 +70,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1739188370,
|
"lastModified": 1741237477,
|
||||||
"narHash": "sha256-2h/5uQaKwQeRXIgpOJpzgeO3qe93AonbJFk0CxTSygY=",
|
"narHash": "sha256-WU1ktX7V2RwyPS0BSgdOjHc0vc/rDJtr22tzd5u3t+U=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "8ae4ee7978617d3af98721a62f14f25befc0beef",
|
"rev": "1907ea1e8f63d206c8bf7991552a539f8a4baeaa",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -101,11 +101,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-master": {
|
"nixpkgs-master": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1739319052,
|
"lastModified": 1741277795,
|
||||||
"narHash": "sha256-L8Tq1dnW96U70vrNpCCGCLHz4rX1GhNRCrRI/iox9wc=",
|
"narHash": "sha256-rS7qyqAQp6h0t3aS+FQgzliGV+Omh/4TdVnVnRSsGvg=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "83a2581c81ff5b06f7c1a4e7cc736a455dfcf7b4",
|
"rev": "14a4a1f82773653ac1ac16ed577e42d927380802",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -117,11 +117,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-unstable": {
|
"nixpkgs-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1739303263,
|
"lastModified": 1741241576,
|
||||||
"narHash": "sha256-c/Z/6gZLN8BIpYh1B3qMzEn0TArjf4F2lmy59lDLVBM=",
|
"narHash": "sha256-/mxmUVd+AE2bTmulNfM7yICocUvavlFQHcMYK67z3qI=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "6cc4213488e886db863878a1e3dc26cc932d38b8",
|
"rev": "ffe8d1b1030b5de6eba761102ee34b6e41d040ee",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
Loading…
Reference in a new issue