From cba8485ba26056b99f402ac6a59d12534782de4f Mon Sep 17 00:00:00 2001 From: Vivian Roest Date: Sun, 7 May 2023 18:42:36 +0200 Subject: [PATCH] boop --- flake.lock | 42 +++++++++---------- nixos/common/desktop/home.nix | 1 + nixos/hosts/hades/pmm/config/Movies.yml | 10 +++-- nixos/hosts/olympus/ntfy/configuration.nix | 3 +- .../olympus/victoriametrics/configuration.nix | 10 ++++- 5 files changed, 39 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index ddbbfd5f..805b6150 100644 --- a/flake.lock +++ b/flake.lock @@ -502,11 +502,11 @@ ] }, "locked": { - "lastModified": 1683276742, - "narHash": "sha256-QURv/m81hd6TN5RMjlSHhE1zLpXHsvDEm66qv3MRBsM=", + "lastModified": 1683459775, + "narHash": "sha256-Ab1pIKOj7XRZbJAv4g9937ElhaZF7Pob3hqGTDKt5w8=", "owner": "nix-community", "repo": "home-manager", - "rev": "38271ead8e7b291beb9d3b8312e66c3268796c0a", + "rev": "6fc82e56971523acfe1a61dbcb20f4bb969b3990", "type": "github" }, "original": { @@ -799,11 +799,11 @@ }, "nixpkgs_22-11": { "locked": { - "lastModified": 1683207485, - "narHash": "sha256-gs+PHt/y/XQB7S8+YyBLAM8LjgYpPZUVFQBwpFSmJro=", + "lastModified": 1683383741, + "narHash": "sha256-rAQSBnFGNKNomUUyVl+7v0tnp45677t4Ovlh9f57k6Q=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cc45a3f8c98e1c33ca996e3504adefbf660a72d1", + "rev": "adc7c6f1bbaa73cda26be2323353b63a05b42f61", "type": "github" }, "original": { @@ -815,11 +815,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1683323880, - "narHash": "sha256-MvJ5gVYTTIaNynqm86SbSQa+JuOVaSrnO1JTmV0v+rA=", + "lastModified": 1683475240, + "narHash": "sha256-sy6MYoCaIZsOenYplbzVXI4Ce9Bp/vIOpuFa97+a6wc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6df56832726e108753d1c1669e58a3d7c5d7a40b", + "rev": "e040aab15638aaf8d0786894851a2b1ca09a7baf", "type": "github" }, "original": { @@ -831,11 +831,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1682526928, - "narHash": "sha256-2cKh4O6t1rQ8Ok+v16URynmb0rV7oZPEbXkU0owNLQs=", + "lastModified": 1683408522, + "narHash": "sha256-9kcPh6Uxo17a3kK3XCHhcWiV1Yu1kYj22RHiymUhMkU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d6b863fd9b7bb962e6f9fdf292419a775e772891", + "rev": "897876e4c484f1e8f92009fd11b7d988a121a4e7", "type": "github" }, "original": { @@ -931,11 +931,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1683202852, - "narHash": "sha256-AN4PZAtkiA4ATi9MwCMpU7WvAoQ642Hol8K8/n0477M=", + "lastModified": 1683465903, + "narHash": "sha256-rkuqTLd2JciPnMRXNkVtGV+taMT1rsvQdt9tvWDYksw=", "owner": "pta2002", "repo": "nixvim", - "rev": "8a637fc91fd670626a3e182a781a2e82615bbcc2", + "rev": "079b0c30cde91a735a7a1707ed6bf2571a1c93cc", "type": "github" }, "original": { @@ -946,11 +946,11 @@ }, "nur": { "locked": { - "lastModified": 1683319528, - "narHash": "sha256-5sHLy/lzcUZG/0okPWCv74gfjN07PR3PiCu29SdUcGU=", + "lastModified": 1683470760, + "narHash": "sha256-Xe5L52haU8nTz6f2pM4j/J0YaWfaeZX9mtNSy7UQGUc=", "owner": "nix-community", "repo": "NUR", - "rev": "0f4a887323828e19052addec3b8c3163b36b76a5", + "rev": "1836bc3c9f7f033a6abfbf6ac3dd36ee875f85ae", "type": "github" }, "original": { @@ -1015,11 +1015,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1682326782, - "narHash": "sha256-wj7p7iEwQXAfTZ6QokAe0dMbpQk5u7ympDnaiPvbv1w=", + "lastModified": 1682596858, + "narHash": "sha256-Hf9XVpqaGqe/4oDGr30W8HlsWvJXtMsEPHDqHZA6dDg=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "56cd2d47a9c937be98ab225cf014b450f1533cdb", + "rev": "fb58866e20af98779017134319b5663b8215d912", "type": "github" }, "original": { diff --git a/nixos/common/desktop/home.nix b/nixos/common/desktop/home.nix index b169f549..1121eaba 100644 --- a/nixos/common/desktop/home.nix +++ b/nixos/common/desktop/home.nix @@ -28,6 +28,7 @@ in { rustup solo2-cli tex + unzip yt-dlp ]; diff --git a/nixos/hosts/hades/pmm/config/Movies.yml b/nixos/hosts/hades/pmm/config/Movies.yml index 7810dd25..29e9f962 100644 --- a/nixos/hosts/hades/pmm/config/Movies.yml +++ b/nixos/hosts/hades/pmm/config/Movies.yml @@ -33,11 +33,9 @@ collections: Studio Ghibli: template: { name: Studio, company: 10342 } 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 studio’s mascot and most recognizable symbol is the character, Totoro, a giant cat-like spirit from the 1988 classic, My Neighbor Totoro. Pixar: template: { name: Studio, company: 3 } 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: tmdb_collection: - 151 @@ -47,4 +45,10 @@ collections: poster: https://theposterdb.com/api/assets/222279 background: https://i.imgur.com/Yp0NCZa.jpg Bad Trek: - tmdb_collection_details: 115575 + template: + name: Set + collection: 115575 + National Theatre: + template: + name: Studio + company: 16355 diff --git a/nixos/hosts/olympus/ntfy/configuration.nix b/nixos/hosts/olympus/ntfy/configuration.nix index e968178c..00777670 100644 --- a/nixos/hosts/olympus/ntfy/configuration.nix +++ b/nixos/hosts/olympus/ntfy/configuration.nix @@ -18,7 +18,7 @@ # Additional packages environment.systemPackages = with pkgs; [ ntfy-sh ]; - networking.firewall.allowedTCPPorts = [ 80 ]; + networking.firewall.allowedTCPPorts = [ 80 9090 ]; services.ntfy-sh = let datadir = "/var/lib/ntfy"; in { @@ -31,6 +31,7 @@ auth-default-access = "deny-all"; behind-proxy = true; attachment-cache-dir = "${datadir}/attachments"; + metrics-listen-http = ":9090"; }; }; } diff --git a/nixos/hosts/olympus/victoriametrics/configuration.nix b/nixos/hosts/olympus/victoriametrics/configuration.nix index 8879bac2..7fed0a27 100644 --- a/nixos/hosts/olympus/victoriametrics/configuration.nix +++ b/nixos/hosts/olympus/victoriametrics/configuration.nix @@ -25,7 +25,7 @@ in { enable = true; listenAddress = ":${toString vmPort}"; # Data Retention period in months - retentionPeriod = 12; + retentionPeriod = 36; }; services.vmagent = { @@ -53,7 +53,6 @@ in { } { job_name = "synapse"; - metrics_path = "/_synapse/metrics"; static_configs = [{ targets = [ "synapse.olympus:9000" ]; labels.app = "synapse"; @@ -66,6 +65,13 @@ in { labels.app = "wireguard"; }]; } + { + job_name = "ntfy"; + static_configs = [{ + targets = [ "ntfy.olympus:9090"]; + labels.app = "ntfy"; + }]; + } ]; }; };