refactor

2026-06-23 21:23:35 +02:00
parent 2626e9fe32
commit d135a15bcd
38 changed files with 354 additions and 876 deletions
@@ -1,38 +1,21 @@
 { config, ... }:
 let
-  repo = config.repo;
-  repoHelpers = repo.helpers;
-  service = repo.services.vaultwarden;
+  service = config.facts.services.vaultwarden;
 in
 {
-  repo.services.vaultwarden = {
-    domain = "vault.jelles.net";
-    host = "127.0.0.1";
-    port = 8100;
-    url = "https://vault.jelles.net";
+  flake.modules.nixos.vaultwarden = {
+    services.vaultwarden = {
+      enable = true;
+      backupDir = "/var/backup/vaultwarden";
+      config = {
+        DOMAIN = service.url;
+        SIGNUPS_ALLOWED = false;
+        ROCKET_PORT = service.port;
+        ROCKET_LOG = "critical";
+      };
+    };
+
+    services.caddy.virtualHosts.${service.domain}.extraConfig =
+      "reverse_proxy :${toString service.port}";
  };
-
-  flake.modules.nixos.vaultwarden =
-    { lib, ... }:
-    lib.mkMerge [
-      {
-        services.vaultwarden = {
-          enable = true;
-          backupDir = "/var/backup/vaultwarden";
-          config = {
-            DOMAIN = service.url;
-            SIGNUPS_ALLOWED = false;
-            ROCKET_PORT = service.port;
-            ROCKET_LOG = "critical";
-          };
-        };
-      }
-
-      (repoHelpers.mkCaddyReverseProxy {
-        inherit (service)
-          domain
-          port
-          ;
-      })
-    ];
 }