boop
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful

This commit is contained in:
Vivian 2023-05-07 18:42:36 +02:00
parent e9c5170ec1
commit ac009b4593
5 changed files with 39 additions and 27 deletions

View file

@ -502,11 +502,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1683276742, "lastModified": 1683459775,
"narHash": "sha256-QURv/m81hd6TN5RMjlSHhE1zLpXHsvDEm66qv3MRBsM=", "narHash": "sha256-Ab1pIKOj7XRZbJAv4g9937ElhaZF7Pob3hqGTDKt5w8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "38271ead8e7b291beb9d3b8312e66c3268796c0a", "rev": "6fc82e56971523acfe1a61dbcb20f4bb969b3990",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -799,11 +799,11 @@
}, },
"nixpkgs_22-11": { "nixpkgs_22-11": {
"locked": { "locked": {
"lastModified": 1683207485, "lastModified": 1683383741,
"narHash": "sha256-gs+PHt/y/XQB7S8+YyBLAM8LjgYpPZUVFQBwpFSmJro=", "narHash": "sha256-rAQSBnFGNKNomUUyVl+7v0tnp45677t4Ovlh9f57k6Q=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cc45a3f8c98e1c33ca996e3504adefbf660a72d1", "rev": "adc7c6f1bbaa73cda26be2323353b63a05b42f61",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -815,11 +815,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1683323880, "lastModified": 1683475240,
"narHash": "sha256-MvJ5gVYTTIaNynqm86SbSQa+JuOVaSrnO1JTmV0v+rA=", "narHash": "sha256-sy6MYoCaIZsOenYplbzVXI4Ce9Bp/vIOpuFa97+a6wc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6df56832726e108753d1c1669e58a3d7c5d7a40b", "rev": "e040aab15638aaf8d0786894851a2b1ca09a7baf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -831,11 +831,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1682526928, "lastModified": 1683408522,
"narHash": "sha256-2cKh4O6t1rQ8Ok+v16URynmb0rV7oZPEbXkU0owNLQs=", "narHash": "sha256-9kcPh6Uxo17a3kK3XCHhcWiV1Yu1kYj22RHiymUhMkU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d6b863fd9b7bb962e6f9fdf292419a775e772891", "rev": "897876e4c484f1e8f92009fd11b7d988a121a4e7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -931,11 +931,11 @@
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1683202852, "lastModified": 1683465903,
"narHash": "sha256-AN4PZAtkiA4ATi9MwCMpU7WvAoQ642Hol8K8/n0477M=", "narHash": "sha256-rkuqTLd2JciPnMRXNkVtGV+taMT1rsvQdt9tvWDYksw=",
"owner": "pta2002", "owner": "pta2002",
"repo": "nixvim", "repo": "nixvim",
"rev": "8a637fc91fd670626a3e182a781a2e82615bbcc2", "rev": "079b0c30cde91a735a7a1707ed6bf2571a1c93cc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -946,11 +946,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1683319528, "lastModified": 1683470760,
"narHash": "sha256-5sHLy/lzcUZG/0okPWCv74gfjN07PR3PiCu29SdUcGU=", "narHash": "sha256-Xe5L52haU8nTz6f2pM4j/J0YaWfaeZX9mtNSy7UQGUc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "0f4a887323828e19052addec3b8c3163b36b76a5", "rev": "1836bc3c9f7f033a6abfbf6ac3dd36ee875f85ae",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1015,11 +1015,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1682326782, "lastModified": 1682596858,
"narHash": "sha256-wj7p7iEwQXAfTZ6QokAe0dMbpQk5u7ympDnaiPvbv1w=", "narHash": "sha256-Hf9XVpqaGqe/4oDGr30W8HlsWvJXtMsEPHDqHZA6dDg=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "56cd2d47a9c937be98ab225cf014b450f1533cdb", "rev": "fb58866e20af98779017134319b5663b8215d912",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -28,6 +28,7 @@ in {
rustup rustup
solo2-cli solo2-cli
tex tex
unzip
yt-dlp yt-dlp
]; ];

View file

@ -33,11 +33,9 @@ collections:
Studio Ghibli: Studio Ghibli:
template: { name: Studio, company: 10342 } template: { name: Studio, company: 10342 }
url_poster: https://theposterdb.com/api/assets/393 url_poster: https://theposterdb.com/api/assets/393
summary: Studio Ghibli Inc. is a Japanese animation film studio headquartered in Koganei, Tokyo. The studio is best known for its animated feature films, and has also produced several short films, television commercials, and one television film. The studios mascot and most recognizable symbol is the character, Totoro, a giant cat-like spirit from the 1988 classic, My Neighbor Totoro.
Pixar: Pixar:
template: { name: Studio, company: 3 } template: { name: Studio, company: 3 }
url_poster: https://theposterdb.com/api/assets/18894 url_poster: https://theposterdb.com/api/assets/18894
summary: Pixar Animation Studios, commonly known as Pixar, is an American computer animation studio based in Emeryville, California, a subsidiary of Disney Studios Content owned by The Walt Disney Company. Pixar began in 1979 as part of the Lucasfilm computer division, known as the Graphics Group, before its spin-off as a corporation on February 3, 1986, with funding from Apple co-founder Steve Jobs, who became its majority shareholder. Disney purchased Pixar in 2006 at a valuation of $7.4 billion by converting each share of Pixar stock to 2.3 shares of Disney stock, a transaction that resulted in Jobs becoming Disney's largest single shareholder at the time. Pixar is best known for its feature films technologically powered by RenderMan, the company's own implementation of the industry-standard RenderMan Interface Specification image-rendering application programming interface. Luxo Jr., a desk lamp from the studio's 1986 short film of the same name, is the studio's mascot.
Star Trek: Star Trek:
tmdb_collection: tmdb_collection:
- 151 - 151
@ -47,4 +45,10 @@ collections:
poster: https://theposterdb.com/api/assets/222279 poster: https://theposterdb.com/api/assets/222279
background: https://i.imgur.com/Yp0NCZa.jpg background: https://i.imgur.com/Yp0NCZa.jpg
Bad Trek: Bad Trek:
tmdb_collection_details: 115575 template:
name: Set
collection: 115575
National Theatre:
template:
name: Studio
company: 16355

View file

@ -18,7 +18,7 @@
# Additional packages # Additional packages
environment.systemPackages = with pkgs; [ ntfy-sh ]; environment.systemPackages = with pkgs; [ ntfy-sh ];
networking.firewall.allowedTCPPorts = [ 80 ]; networking.firewall.allowedTCPPorts = [ 80 9090 ];
services.ntfy-sh = let datadir = "/var/lib/ntfy"; services.ntfy-sh = let datadir = "/var/lib/ntfy";
in { in {
@ -31,6 +31,7 @@
auth-default-access = "deny-all"; auth-default-access = "deny-all";
behind-proxy = true; behind-proxy = true;
attachment-cache-dir = "${datadir}/attachments"; attachment-cache-dir = "${datadir}/attachments";
metrics-listen-http = ":9090";
}; };
}; };
} }

View file

@ -25,7 +25,7 @@ in {
enable = true; enable = true;
listenAddress = ":${toString vmPort}"; listenAddress = ":${toString vmPort}";
# Data Retention period in months # Data Retention period in months
retentionPeriod = 12; retentionPeriod = 36;
}; };
services.vmagent = { services.vmagent = {
@ -53,7 +53,6 @@ in {
} }
{ {
job_name = "synapse"; job_name = "synapse";
metrics_path = "/_synapse/metrics";
static_configs = [{ static_configs = [{
targets = [ "synapse.olympus:9000" ]; targets = [ "synapse.olympus:9000" ];
labels.app = "synapse"; labels.app = "synapse";
@ -66,6 +65,13 @@ in {
labels.app = "wireguard"; labels.app = "wireguard";
}]; }];
} }
{
job_name = "ntfy";
static_configs = [{
targets = [ "ntfy.olympus:9090"];
labels.app = "ntfy";
}];
}
]; ];
}; };
}; };