From 7b37c0e9c3f0851322189763be6f47a4655d3075 Mon Sep 17 00:00:00 2001
From: Chris Kruining <c.kruining@4dotnet.nl>
Date: Sun, 5 Apr 2026 16:05:01 +0200
Subject: [PATCH] various fixes

---
 modules/nixos/services/media/servarr/default.nix   |  1 +
 .../nixos/services/networking/caddy/default.nix    | 14 ++++----------
 .../services/security/vaultwarden/default.nix      |  2 +-
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/modules/nixos/services/media/servarr/default.nix b/modules/nixos/services/media/servarr/default.nix
index c7a066c..a98399d 100644
--- a/modules/nixos/services/media/servarr/default.nix
+++ b/modules/nixos/services/media/servarr/default.nix
@@ -103,6 +103,7 @@ in {
                 port = 2009;
                 host_whitelist = "${config.networking.hostName}";
 
+                permissions = "770";
                 download_dir = "/var/media/downloads/incomplete";
                 complete_dir = "/var/media/downloads/done";
               };
diff --git a/modules/nixos/services/networking/caddy/default.nix b/modules/nixos/services/networking/caddy/default.nix
index ec9df3a..e18a707 100644
--- a/modules/nixos/services/networking/caddy/default.nix
+++ b/modules/nixos/services/networking/caddy/default.nix
@@ -10,15 +10,6 @@
 
   cfg = config.${namespace}.services.networking.caddy;
   hasHosts = (cfg.hosts |> attrNames |> length) > 0;
-  caddyBase = pkgs.callPackage "${pkgs.path}/pkgs/by-name/ca/caddy/package.nix" {
-    buildGo125Module = pkgs.buildGo126Module;
-    caddy = caddyBase;
-  };
-  caddyPackage =
-    caddyBase.withPlugins {
-      plugins = ["github.com/corazawaf/coraza-caddy/v2@v2.1.0"];
-      hash = "sha256-pSXjLaZoRtKV3eFl2ySRSjl3yxi514G1Cb7pfrpxxtE=";
-    };
 in {
   options.${namespace}.services.networking.caddy = {
     enable = mkEnableOption "enable caddy" // {default = true;};
@@ -36,7 +27,10 @@ in {
     services.caddy = {
       enable = cfg.enable;
 
-      package = caddyPackage;
+      package = pkgs.caddy.withPlugins {
+        plugins = ["github.com/corazawaf/coraza-caddy/v2@v2.1.0"];
+        hash = "sha256-pSXjLaZoRtKV3eFl2ySRSjl3yxi514G1Cb7pfrpxxtE=";
+      };
 
       virtualHosts =
         cfg.hosts
diff --git a/modules/nixos/services/security/vaultwarden/default.nix b/modules/nixos/services/security/vaultwarden/default.nix
index 7dce380..089c945 100644
--- a/modules/nixos/services/security/vaultwarden/default.nix
+++ b/modules/nixos/services/security/vaultwarden/default.nix
@@ -118,7 +118,7 @@ in {
         enable = true;
         dbBackend = "postgresql";
 
-        package = pkgs.${namespace}.vaultwarden;
+        package = pkgs.vaultwarden-postgresql;
 
         config = {
           SIGNUPS_ALLOWED = false;