From d952ecf17af54cb19f0a74c4d7c3c4e9e9e9992a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= Date: Wed, 4 Mar 2026 17:58:50 +0100 Subject: [PATCH] meteora: host on ful --- flake.lock | 41 ++++++++++++++++++++++++++++++++--- flake.nix | 3 +++ secrets | 2 +- secrets.txt | 6 +++++ systems/ful/configuration.nix | 1 + systems/ful/meteora.nix | 18 +++++++++++++++ 6 files changed, 67 insertions(+), 4 deletions(-) create mode 100644 systems/ful/meteora.nix diff --git a/flake.lock b/flake.lock index cab175c..fac910b 100644 --- a/flake.lock +++ b/flake.lock @@ -464,6 +464,24 @@ "type": "github" } }, + "meteora": { + "inputs": { + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1772641269, + "narHash": "sha256-o8G09GrqHjZO9BYbsCvYds+baGxLC0PhhlGTllkHC54=", + "ref": "refs/heads/master", + "rev": "0b2255c2e4003b208f19153e6fb7e484544c4399", + "revCount": 1377, + "type": "git", + "url": "ssh://git@github.com/kmein/meteora.git" + }, + "original": { + "type": "git", + "url": "ssh://git@github.com/kmein/meteora.git" + } + }, "naersk": { "inputs": { "fenix": [ @@ -651,6 +669,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1772479524, + "narHash": "sha256-u7nCaNiMjqvKpE+uZz9hE7pgXXTmm5yvdtFaqzSzUQI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "4215e62dc2cd3bc705b0a423b9719ff6be378a43", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1769598131, "narHash": "sha256-e7VO/kGLgRMbWtpBqdWl0uFg8Y2XWFMdz0uUJvlML8o=", @@ -666,7 +700,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1771369470, "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", @@ -753,7 +787,7 @@ }, "panoptikon": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1771686951, @@ -793,12 +827,13 @@ "llm-agents": "llm-agents", "menstruation-backend": "menstruation-backend", "menstruation-telegram": "menstruation-telegram", + "meteora": "meteora", "naersk": "naersk", "niphas": "niphas", "nix-index-database": "nix-index-database", "nix-topology": "nix-topology", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "nixpkgs-old": "nixpkgs-old", "nixpkgs-unstable": "nixpkgs-unstable", "nur": "nur", diff --git a/flake.nix b/flake.nix index ddb14dc..4e3adc0 100644 --- a/flake.nix +++ b/flake.nix @@ -28,6 +28,7 @@ wrappers.url = "github:lassulus/wrappers"; llm-agents.url = "github:numtide/llm-agents.nix"; opencrow.url = "github:pinpox/opencrow"; + meteora.url = "git+ssh://git@github.com/kmein/meteora.git"; voidrice.flake = false; @@ -96,6 +97,7 @@ stylix, voidrice, wetter, + meteora, ... }: let @@ -302,6 +304,7 @@ autorenkalender = autorenkalender.packages.${prev.stdenv.hostPlatform.system}.default; onomap = scripts.packages.${prev.stdenv.hostPlatform.system}.onomap; tinc-graph = tinc-graph.packages.${prev.stdenv.hostPlatform.system}.tinc-graph; + meteora-website = meteora.packages.${prev.stdenv.hostPlatform.system}.website; # krebs brainmelter = prev.callPackage packages/brainmelter.nix { }; diff --git a/secrets b/secrets index 4fa163a..0c10b2e 160000 --- a/secrets +++ b/secrets @@ -1 +1 @@ -Subproject commit 4fa163a68eb60cfcd53f0f467799ad561b6f8dbf +Subproject commit 0c10b2e8bb0d400d50e6dd7b3c785242f1829cb9 diff --git a/secrets.txt b/secrets.txt index b3b062f..808d3a0 100644 --- a/secrets.txt +++ b/secrets.txt @@ -1,4 +1,5 @@ secrets/alertmanager-token-reporters.age +secrets/anthropic-api-key.age secrets/brevo-key.age secrets/cifs-credentials-zodiac.age secrets/copecart-ipn.age @@ -54,6 +55,7 @@ secrets/matrix-token-lakai.age secrets/matrix-token-lakai-env.age secrets/maxmind-license-key.age secrets/mega-password.age +secrets/meteora-auth.age secrets/miniflux-api-token.age secrets/miniflux-credentials.age secrets/nextcloud-password-admin.age @@ -61,7 +63,11 @@ secrets/nextcloud-password-database.age secrets/nextcloud-password-fysi.age secrets/nextcloud-password-kieran.age secrets/onlyoffice-jwt-key.age +secrets/openclaw-gateway-token.age +secrets/openclaw-telegram-token.age +secrets/opencrow-gemini-key.age secrets/opencrow-matrix-token.age +secrets/opencrow-openrouter-key.age secrets/opencrow-soul.age secrets/openweathermap-api-key.age secrets/restic.age diff --git a/systems/ful/configuration.nix b/systems/ful/configuration.nix index cd4984e..9a8fa7e 100644 --- a/systems/ful/configuration.nix +++ b/systems/ful/configuration.nix @@ -17,6 +17,7 @@ ./wallabag.nix ./nethack.nix ./opencrow.nix + ./meteora.nix ]; niveum.passport = { diff --git a/systems/ful/meteora.nix b/systems/ful/meteora.nix new file mode 100644 index 0000000..141019f --- /dev/null +++ b/systems/ful/meteora.nix @@ -0,0 +1,18 @@ +{ config, pkgs, ... }: { + age.secrets.meteora-auth = { + file = ../../secrets/meteora-auth.age; + owner = "nginx"; + }; + + services.nginx = { + enable = true; + virtualHosts."meteora.xn--kiern-0qa.de" = { + forceSSL = true; + enableACME = true; + root = "${pkgs.meteora-website}"; + locations."/" = { + basicAuthFile = config.age.secrets.meteora-auth.path; + }; + }; + }; +}