Fix php-fpm that were on-demand instead of dynamic

[perso/Immae/Config/Nix.git] / modules / default.nix

diff --git a/modules/default.nix b/modules/default.nix
index 630e8f500da61c0e3c54435c6e6a9eb8017038c4..84e151f35faa6cc43bcb4b0aeccba94db1cffb05 100644 (file)
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -4,23 +4,23 @@ let
 in
 {
   myids = (flakeCompat ../flakes/myuids).nixosModule;
-  secrets = ./secrets.nix;
+  secrets = flakeLib.withNarKeyCompat flakeCompat ../flakes/secrets "nixosModule";
   filesWatcher = flakeLib.withNarKeyCompat flakeCompat ../flakes/files-watcher "nixosModule";
 
   webstats = ./webapps/webstats;
-  diaspora = ./webapps/diaspora.nix;
-  etherpad-lite = ./webapps/etherpad-lite.nix;
-  mastodon = ./webapps/mastodon.nix;
-  mediagoblin = ./webapps/mediagoblin.nix;
+  diaspora = (flakeCompat ../flakes/diaspora).nixosModule;
+  etherpad-lite = (flakeCompat ../flakes/etherpad-lite).nixosModule;
+  mastodon = (flakeCompat ../flakes/mastodon).nixosModule;
+  mediagoblin = (flakeCompat ../flakes/mediagoblin).nixosModule;
   peertube = (flakeCompat ../flakes/peertube).nixosModule;
-  fiche = ./webapps/fiche.nix;
+  fiche = flakeLib.withNarKeyCompat flakeCompat ../flakes/fiche "nixosModule";
   paste = flakeLib.withNarKeyCompat flakeCompat ../flakes/paste "nixosModule";
 
   opendmarc = flakeLib.withNarKeyCompat flakeCompat ../flakes/opendmarc "nixosModule";
   openarc = flakeLib.withNarKeyCompat flakeCompat ../flakes/openarc "nixosModule";
 
   duplyBackup = ./duply_backup;
-  rsyncBackup = ./rsync_backup;
+  rsyncBackup = flakeLib.withNarKeyCompat flakeCompat ../flakes/rsync_backup "nixosModule";
   naemon = ./naemon;
 
   php-application = ./websites/php-application.nix;