merge files for vaultwarden

ttrss/default.nix

@@ -1,6 +1,6 @@
-{ pkgs
+{ customPkgs
+, pkgs
 , utils
-, customPkgs
 }:
 { serviceName ? "Ttrss"
 , siteName ? "ttrss"
@@ -28,14 +28,6 @@
 
 with pkgs.lib.attrsets;
 let
-  mkServices = services: listToAttrs (map (
-    x: nameValuePair x.name x
-  ) services);
-
-  mkDistribution = services: on: listToAttrs (map (
-    x: nameValuePair x.name on
-  ) services);
-
   rtdir = "/run/ttrss";
   lock_directory = "${rtdir}/lock";
   cache_directory = "${rtdir}/cache";
@@ -191,23 +183,23 @@ rec {
     };
   };
 
-  services = mkServices [
+  services = {
-    db
+    ${db.name} = db;
-    config
+    ${config.name} = config;
-    dbupgrade
+    ${dbupgrade.name} = dbupgrade;
-    service
+    ${service.name} = service;
-    phpfpmService
+    ${phpfpmService.name} = phpfpmService;
-    updateService
+    ${updateService.name} = updateService;
-  ];
+  };
 
-  distribute = mkDistribution [
+  distribute = on: {
-    db
+    ${db.name} = on;
-    config
+    ${config.name} = on;
-    dbupgrade
+    ${dbupgrade.name} = on;
-    service
+    ${service.name} = on;
-    phpfpmService
+    ${phpfpmService.name} = on;
-    updateService
+    ${updateService.name} = on;
-  ];
+  };
 
   directories_modes = {
     "${rtdir}" = "0550";

vaultwarden/default.nix

@@ -173,4 +173,16 @@ rec {
       };
     };
   };
+
+  services = {
+    ${db.name} = db;
+    ${web.name} = web;
+    ${service.name} = service;
+  };
+
+  distribute = on: {
+    ${db.name} = on;
+    ${web.name} = on;
+    ${service.name} = on;
+  };
 }