Move secrets to flakes

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

diff --git a/modules/default.nix b/modules/default.nix
index 03b9adc9c92a162956dc003ae32eff3b1b82491c..cb2e7d99e76c13730757dea41f88d45c57d20a78 100644 (file)
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -1,21 +1,26 @@
+let
+  flakeCompat = import ../lib/flake-compat.nix;
+  flakeLib = (flakeCompat ../flakes/lib).lib;
+in
 {
-  myids = ./myids.nix;
-  secrets = ./secrets.nix;
-  filesWatcher = ./filesWatcher.nix;
+  myids = (flakeCompat ../flakes/myuids).nixosModule;
+  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;
-  peertube = ./webapps/peertube.nix;
+  peertube = (flakeCompat ../flakes/peertube).nixosModule;
   fiche = ./webapps/fiche.nix;
+  paste = flakeLib.withNarKeyCompat flakeCompat ../flakes/paste "nixosModule";
 
-  opendmarc = ./opendmarc.nix;
-  openarc = ./openarc.nix;
+  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;