Refactor paste

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

diff --git a/modules/default.nix b/modules/default.nix
index 059a9d8374d824b0cc8b3015ac869bef52107f81..630e8f500da61c0e3c54435c6e6a9eb8017038c4 100644 (file)
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -1,21 +1,23 @@
 let
   flakeCompat = import ../lib/flake-compat.nix;
+  flakeLib = (flakeCompat ../flakes/lib).lib;
 in
 {
-  myids = ./myids.nix;
+  myids = (flakeCompat ../flakes/myuids).nixosModule;
   secrets = ./secrets.nix;
-  filesWatcher = ./filesWatcher.nix;
+  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 = (flakeCompat ../flakes/openarc).nixosModule;
+  opendmarc = flakeLib.withNarKeyCompat flakeCompat ../flakes/opendmarc "nixosModule";
+  openarc = flakeLib.withNarKeyCompat flakeCompat ../flakes/openarc "nixosModule";
 
   duplyBackup = ./duply_backup;
   rsyncBackup = ./rsync_backup;