X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fdefault.nix;h=b6ac68a117c833477dafe1653ccb8e21043c0f40;hb=bd5c5d4e23ebd3863a960976767ed4a83dfd07fe;hp=9e9c4111f60b30b15862d3a609fea0681ae1318c;hpb=3bc32d9ebd9b0900eeef756122ad28f8857f8bfe;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/modules/default.nix b/modules/default.nix
index 9e9c411..b6ac68a 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -1,20 +1,29 @@
+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 = ./openarc.nix;
+  opendmarc = flakeLib.withNarKeyCompat flakeCompat ../flakes/opendmarc "nixosModule";
+  openarc = flakeLib.withNarKeyCompat flakeCompat ../flakes/openarc "nixosModule";
 
+  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 {})