From b10a2331c4c7ccfe20465cfe1b5f1dece8d6d550 Mon Sep 17 00:00:00 2001
From: xunuwu <xunuwu@gmail.com>
Date: Wed, 21 May 2025 15:20:26 +0200
Subject: [PATCH] fix vaultwarden domain

this makes vaultwarden send downloads work correctly
---
 flake.nix                               | 4 +++-
 lib/default.nix                         | 1 +
 sys/machines/hopper/lab/vaultwarden.nix | 8 ++++++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/flake.nix b/flake.nix
index 3018167..f8063e9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -15,10 +15,12 @@
       systems = ["x86_64-linux"];
 
       flake.nixosConfigurations = mylib.loadConfigurations ./sys/machines (hostname: {
-        inherit inputs self systemProfiles homeProfiles homeSuites vars;
+        inherit inputs self systemProfiles homeProfiles homeSuites vars mylib;
         hostVars = ./vars/${hostname};
       });
 
+      flake._mylib = mylib;
+
       perSystem = {pkgs, ...}: {
         imports = [
           ./shells
diff --git a/lib/default.nix b/lib/default.nix
index a2fde45..ce56564 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -7,4 +7,5 @@ in {
         modules = [(dir + /${name})];
         specialArgs = specialArgsFromHost name;
       })) (b.readDir dir);
+  stripPort = url: builtins.match "(.*):[0-9]*" url |> builtins.head;
 }
diff --git a/sys/machines/hopper/lab/vaultwarden.nix b/sys/machines/hopper/lab/vaultwarden.nix
index c54c491..ded4a10 100644
--- a/sys/machines/hopper/lab/vaultwarden.nix
+++ b/sys/machines/hopper/lab/vaultwarden.nix
@@ -1,4 +1,8 @@
-{config, ...}: {
+{
+  config,
+  mylib,
+  ...
+}: {
   systemd.services.vaultwarden = {
     serviceConfig.EnvironmentFile = config.sops.secrets.vaultwarden-env.path;
   };
@@ -6,7 +10,7 @@
   services.vaultwarden = {
     enable = true;
     config = {
-      DOMAIN = "https://${config.services.caddy.virtualHosts.vaultwarden.hostName}";
+      DOMAIN = mylib.stripPort "https://${config.services.caddy.virtualHosts.vaultwarden.hostName}";
       ROCKET_ADDRESS = "0.0.0.0";
       ROCKET_PORT = 35381;
       ROCKET_LOG = "critical";