X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fdefault.nix;h=2f06eb138d147146d78857efd4c100dc49a99181;hb=fa25ffd4583cc362075cd5e1b4130f33306103f0;hp=98dc77d8c34ff3e7678e958bd8338e88eab1fcdb;hpb=981fa80354fd6f00f49446777c38f77bd8a65f65;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/modules/default.nix b/modules/default.nix
index 98dc77d..2f06eb1 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -1,23 +1,29 @@
+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 = flakeLib.withNarKeyCompat flakeCompat ../flakes/fiche "nixosModule";
+  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;
+  zrepl = ./zrepl.nix;
   websites = ./websites;
-  acme2 = ./acme2.nix;
 } // (if builtins.pathExists ./private then import ./private else {})