flake.lock

@@ -373,11 +373,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1787762084,
+        "lastModified": 1787567814,
-        "narHash": "sha256-UsnVAWB3cw6zdpO1cqO1IrskYZUbVYhSKritpKHBuWI=",
+        "narHash": "sha256-8BSf34Trov63VbYt6eVoGspM381RsWANPMewm7BqKbA=",
         "ref": "refs/heads/main",
-        "rev": "d702eeffe16c5a93cd835bce5cec579211a4f09a",
+        "rev": "541dd298206648212d8a02e22bc9f81f9a926e05",
-        "revCount": 3910,
+        "revCount": 3849,
         "type": "git",
         "url": "https://forge.darkest.space/hyperhive/hyperhive.git"
       },

nixosConfigurations/muede-lpt2/default.nix

@@ -1,88 +1,71 @@
-{ pkgs, config, lib, ... }:
+{ pkgs, ... }:
 {
   imports = [
     ./containers.nix
     ./hardware.nix
   ];
 
-  config =
+  config = {
-    let
+    my = {
-      gw = config.services.hyperhive.gateway;
+      # keep-sorted start
-      old = "forge.pr1ma.darkest.space";
+      intelGraphics.enable = true;
-      new = "forge.constellation.darkest.space";
+      muedeDesktopSettings.enable = true;
-    in
+      podman.enable = true;
-    {
+      secureBoot.enable = true;
-      my = {
+      steam.enable = true;
-        # keep-sorted start
+      users.muede.enable = true;
-        intelGraphics.enable = true;
+      wineGaming.enable = true;
-        muedeDesktopSettings.enable = true;
+      # keep-sorted end
-        podman.enable = true;
-        secureBoot.enable = true;
-        steam.enable = true;
-        users.muede.enable = true;
-        wineGaming.enable = true;
-        # keep-sorted end
-      };
-
-      nix.settings.extra-platforms = [
-        "aarch64-linux"
-        "i686-linux"
-      ];
-
-      services.xserver.xkb = {
-        # Configure keymap in X11
-        layout = "de";
-        variant = "";
-      };
-
-      # Configure console keymap
-      console.keyMap = "de";
-
-      users.users.muede.openssh.authorizedKeys.keys = [
-        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFCJUpbpB3KEKVoKWsKoar9J4RNah8gmQoSH6jQEw5dY pixel-JuiceSSH"
-        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO1CRn4yYTL4XUdCebE8Z4ZeuMujBjorTdWifg911EOv pc2 home roaming"
-      ];
-
-      # brightnessctl's udev rules grant the `video` group write access to backlight brightness (muede is in `video`)
-      environment.systemPackages = [
-        pkgs.android-tools
-        pkgs.brightnessctl
-      ];
-      services.udev.packages = [ pkgs.brightnessctl ];
-
-      networking.firewall.allowedTCPPorts = [
-        8776
-        1337
-      ];
-
-      services.servicepoint-tanks = {
-        enable = false;
-        urls = [
-          "http://localhost:5666"
-          "http://localhost:5667"
-        ];
-      };
-      nixpkgs.config.permittedInsecurePackages = [
-        "mbedtls-2.28.10"
-      ];
-
-      boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
-
-      my.constellation-swarm = {
-        enable = true;
-        hiveName = "pr1ma";
-      };
-      services.hyperhive.enableAllLocalDefaults = true;
-      services.nginx.enable = true;
-
-      # DNS: the hive's resolver must still answer for the old name, or
-      # nothing ever reaches the redirect. The forge module drops it from
-      # this list the moment you change `swarm.forge.domain`.
-      services.hyperhive.gateway.localNames = [ old ];
-
-      services.nginx.virtualHosts.${old} = (gw.lib.tlsFor old) // {
-        listen = gw.lib.listen;
-        locations."/".return = "301 https://${new}$request_uri";
-      };
     };
+
+    nix.settings.extra-platforms = [
+      "aarch64-linux"
+      "i686-linux"
+    ];
+
+    services.xserver.xkb = {
+      # Configure keymap in X11
+      layout = "de";
+      variant = "";
+    };
+
+    # Configure console keymap
+    console.keyMap = "de";
+
+    users.users.muede.openssh.authorizedKeys.keys = [
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFCJUpbpB3KEKVoKWsKoar9J4RNah8gmQoSH6jQEw5dY pixel-JuiceSSH"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO1CRn4yYTL4XUdCebE8Z4ZeuMujBjorTdWifg911EOv pc2 home roaming"
+    ];
+
+    # brightnessctl's udev rules grant the `video` group write access to backlight brightness (muede is in `video`)
+    environment.systemPackages = [
+      pkgs.android-tools
+      pkgs.brightnessctl
+    ];
+    services.udev.packages = [ pkgs.brightnessctl ];
+
+    networking.firewall.allowedTCPPorts = [
+      8776
+      1337
+    ];
+
+    services.servicepoint-tanks = {
+      enable = false;
+      urls = [
+        "http://localhost:5666"
+        "http://localhost:5667"
+      ];
+    };
+    nixpkgs.config.permittedInsecurePackages = [
+      "mbedtls-2.28.10"
+    ];
+
+    boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
+
+    my.constellation-swarm = {
+      enable = true;
+      hiveName = "pr1ma";
+    };
+    services.hyperhive.enableAllLocalDefaults = true;
+  };
 }

nixosModules/constellation-swarm.nix

@@ -37,14 +37,20 @@ in
       name = "constellation";
       domain = "constellation.darkest.space";
       enableRequiredServices = true;
-      forge.ci = {
+      forge = {
-        enable = true;
+        # not default - still on hive domain
-        concurrency = 2;
+        domain = "forge.pr1ma.darkest.space";
+        ci = {
+          enable = true;
+          concurrency = 2;
+        };
+        sso.enable = true;
       };
       matrix = {
         # not default - both still on hive domain
         gatewayHost = "matrix.pr1ma.darkest.space";
         serverName = "pr1ma.darkest.space";
+        sso.enable = true;
       };
       hives = {
         "umbra" = {