From 7263e899b138005c51160cd835283e7f23232523 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?m=C3=BCde?= Date: Sat, 30 May 2026 11:30:31 +0200 Subject: [PATCH] hyperhive website: add docs, new hyperhive options namespace --- flake.lock | 99 +++++--------------- nixosConfigurations/hetzner-vpn2/nginx.nix | 4 +- nixosConfigurations/muede-lpt2/hyperhive.nix | 9 +- 3 files changed, 33 insertions(+), 79 deletions(-) diff --git a/flake.lock b/flake.lock index 5561314..b3f3331 100644 --- a/flake.lock +++ b/flake.lock @@ -129,6 +129,21 @@ } }, "crane": { + "locked": { + "lastModified": 1779130139, + "narHash": "sha256-BLrtr42azquO7MdGFU5a7KiMl3YpFlTeIXqy1fT5GlQ=", + "owner": "ipetkov", + "repo": "crane", + "rev": "edb38893982a3338972bb4a2ec7ce7c29ba10fd9", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, + "crane_2": { "locked": { "lastModified": 1765145449, "narHash": "sha256-aBVHGWWRzSpfL++LubA0CwOOQ64WNLegrYHwsVuVN7A=", @@ -143,7 +158,7 @@ "type": "github" } }, - "crane_2": { + "crane_3": { "locked": { "lastModified": 1777830388, "narHash": "sha256-2uoQAqUk2H0ijQtGiWAyNeQYGYc6yfAcRRLlJAz4Gp8=", @@ -158,7 +173,7 @@ "type": "github" } }, - "crane_3": { + "crane_4": { "locked": { "lastModified": 1779130139, "narHash": "sha256-BLrtr42azquO7MdGFU5a7KiMl3YpFlTeIXqy1fT5GlQ=", @@ -176,7 +191,6 @@ "fenix": { "inputs": { "nixpkgs": [ - "hyperhive", "naersk", "nixpkgs" ], @@ -196,28 +210,6 @@ "type": "github" } }, - "fenix_2": { - "inputs": { - "nixpkgs": [ - "naersk", - "nixpkgs" - ], - "rust-analyzer-src": "rust-analyzer-src_2" - }, - "locked": { - "lastModified": 1752475459, - "narHash": "sha256-z6QEu4ZFuHiqdOPbYss4/Q8B0BFhacR8ts6jO/F/aOU=", - "owner": "nix-community", - "repo": "fenix", - "rev": "bf0d6f70f4c9a9cf8845f992105652173f4b617f", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "fenix", - "type": "github" - } - }, "firefox-gnome-theme": { "flake": false, "locked": { @@ -361,7 +353,7 @@ }, "hyperhive": { "inputs": { - "naersk": "naersk", + "crane": "crane", "nixpkgs": [ "nixpkgs" ], @@ -371,11 +363,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1779974732, - "narHash": "sha256-/4P6dIPg62+kjFiwhm3BfzCMI93+HMqusIG4dVpyBxM=", + "lastModified": 1780085413, + "narHash": "sha256-lWF/VBNjKpsZdyJ5AX2CsqNxtzacjod8nmUaVXNeIdc=", "ref": "refs/heads/main", - "rev": "2d9109d1bd14ada2ec8a271741f3fe8c1a911b9f", - "revCount": 797, + "rev": "d074b25fac09a64f91a2e2126acfe6d74c53f948", + "revCount": 861, "type": "git", "url": "https://forge.darkest.space/hyperhive/hyperhive.git" }, @@ -406,7 +398,7 @@ }, "lanzaboote": { "inputs": { - "crane": "crane", + "crane": "crane_2", "nixpkgs": [ "nixpkgs" ], @@ -431,28 +423,6 @@ "naersk": { "inputs": { "fenix": "fenix", - "nixpkgs": [ - "hyperhive", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1778151388, - "narHash": "sha256-lldMJPUeouEjO8/7aLuwhcsIw29vVihm2ZALzjiqfec=", - "owner": "nix-community", - "repo": "naersk", - "rev": "efdddff9ff4d8e7d0056d57ec67dac50f75ab8f6", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "naersk", - "type": "github" - } - }, - "naersk_2": { - "inputs": { - "fenix": "fenix_2", "nixpkgs": [ "nixpkgs" ] @@ -731,7 +701,7 @@ }, "nova-shell": { "inputs": { - "crane": "crane_2", + "crane": "crane_3", "nixpkgs": [ "nixpkgs-unstable" ], @@ -826,7 +796,7 @@ "hyperhive": "hyperhive", "hyperhive-website": "hyperhive-website", "lanzaboote": "lanzaboote", - "naersk": "naersk_2", + "naersk": "naersk", "niri": "niri", "nix-filter": "nix-filter", "nix-vscode-extensions": "nix-vscode-extensions", @@ -861,23 +831,6 @@ "type": "github" } }, - "rust-analyzer-src_2": { - "flake": false, - "locked": { - "lastModified": 1752428706, - "narHash": "sha256-EJcdxw3aXfP8Ex1Nm3s0awyH9egQvB2Gu+QEnJn2Sfg=", - "owner": "rust-lang", - "repo": "rust-analyzer", - "rev": "591e3b7624be97e4443ea7b5542c191311aa141d", - "type": "github" - }, - "original": { - "owner": "rust-lang", - "ref": "nightly", - "repo": "rust-analyzer", - "type": "github" - } - }, "rust-overlay": { "inputs": { "nixpkgs": [ @@ -901,7 +854,7 @@ }, "servicepoint-cli": { "inputs": { - "crane": "crane_3", + "crane": "crane_4", "nix-filter": [ "nix-filter" ], diff --git a/nixosConfigurations/hetzner-vpn2/nginx.nix b/nixosConfigurations/hetzner-vpn2/nginx.nix index 0ee2f3c..7b4033d 100644 --- a/nixosConfigurations/hetzner-vpn2/nginx.nix +++ b/nixosConfigurations/hetzner-vpn2/nginx.nix @@ -1,4 +1,4 @@ -{ pkgs, hyperhive-website, ... }: +{ pkgs, hyperhive, hyperhive-website, ... }: let blog-domain-socket = "/run/nginx/blog.sock"; anubis-domain-socket = "/run/anubis/anubis-main/anubis.sock"; @@ -46,6 +46,8 @@ in forceSSL = true; enableACME = true; root = hyperhive-website.packages.${pkgs.stdenv.hostPlatform.system}.default; + locations."/options/".alias = + "${hyperhive.packages.${pkgs.stdenv.hostPlatform.system}.docs}/"; }; }; }; diff --git a/nixosConfigurations/muede-lpt2/hyperhive.nix b/nixosConfigurations/muede-lpt2/hyperhive.nix index cb41f90..a784d0a 100644 --- a/nixosConfigurations/muede-lpt2/hyperhive.nix +++ b/nixosConfigurations/muede-lpt2/hyperhive.nix @@ -1,9 +1,8 @@ { hyperhive, ... }: { - imports = [ - hyperhive.nixosModules.hive-c0re - hyperhive.nixosModules.hive-forge - ]; + imports = [ hyperhive.nixosModules.default ]; - config.services.hive-c0re.enable = true; + config.services.hyperhive = { + enable = true; + }; }