Remove use of environment variables

[perso/Immae/Config/Nix.git] / virtual / modules / websites / tools / diaspora / default.nix

diff --git a/virtual/modules/websites/tools/diaspora/default.nix b/virtual/modules/websites/tools/diaspora/default.nix
index 23670dcbc396bcd51b9d3f60cf693b6f3f749d86..b15b9ce9619791d3829acc877db5b2562176d03b 100644 (file)
--- a/virtual/modules/websites/tools/diaspora/default.nix
+++ b/virtual/modules/websites/tools/diaspora/default.nix
@@ -1,7 +1,8 @@
-{ lib, pkgs, config, mylibs, ... }:
+{ lib, pkgs, config, myconfig, mylibs, ... }:
 let
   diaspora = pkgs.callPackage ./diaspora.nix {
-    inherit (mylibs) fetchedGithub checkEnv;
+    inherit (mylibs) fetchedGithub;
+    env = myconfig.env.tools.diaspora;
   };
 
   cfg = config.services.myWebsites.tools.diaspora;
@@ -11,8 +12,6 @@ in {
   };
 
   config = lib.mkIf cfg.enable {
-    # FIXME: Can we use dynamic users from systemd?
-    # nixos/modules/misc/ids.nix
     ids.uids.diaspora = 398;
     ids.gids.diaspora = 398;
 
@@ -63,8 +62,6 @@ in {
       unitConfig.RequiresMountsFor = diaspora.varDir;
     };
 
-    # FIXME: initial sync
-    # FIXME: touch ${diaspora.varDir}/schedule.yml
     system.activationScripts.diaspora = {
       deps = [ "users" ];
       text = ''
@@ -81,7 +78,6 @@ in {
 
     services.myWebsites.tools.modules = [
       "headers" "proxy" "proxy_http" "proxy_balancer"
-      # FIXME: probably only one balancer method is needed:
       "lbmethod_byrequests" "lbmethod_bytraffic" "lbmethod_bybusyness" "lbmethod_heartbeat"
     ];
     security.acme.certs."eldiron".extraDomains."diaspora.immae.eu" = null;