X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fdefault.nix;h=84e151f35faa6cc43bcb4b0aeccba94db1cffb05;hb=73f885394ee2a3af5a9d4cb67f770c5ad4d3f33b;hp=05f2bfe0e14ee193b31f60baf3cb1638debfa3c5;hpb=6a8252b11bb02f3e67857d5a9d733b1affa6a625;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/modules/default.nix b/modules/default.nix
index 05f2bfe..84e151f 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -1,21 +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;
+  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 = 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";
 
-  backup = ./backup;
+  duplyBackup = ./duply_backup;
+  rsyncBackup = flakeLib.withNarKeyCompat flakeCompat ../flakes/rsync_backup "nixosModule";
   naemon = ./naemon;
 
   php-application = ./websites/php-application.nix;
+  zrepl = ./zrepl.nix;
   websites = ./websites;
 } // (if builtins.pathExists ./private then import ./private else {})