X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fdefault.nix;h=5359e9cf233afb68ccdf65d06cefe0d492174b02;hb=27dd65fc95a91155367acbe15754dc22c8869552;hp=e36f1a06e10b43ed06a0b2007a794029a484b9a1;hpb=17f6eae9907a122d4472da727ae8b1ac1c40c027;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/modules/default.nix b/modules/default.nix
index e36f1a0..5359e9c 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -1,14 +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 = (flakeCompat ../flakes/paste).nixosModule;
 
+  opendmarc = (flakeCompat ../flakes/opendmarc).nixosModule;
+  openarc = (flakeCompat ../flakes/openarc).nixosModule;
+
+  duplyBackup = ./duply_backup;
+  rsyncBackup = ./rsync_backup;
+  naemon = ./naemon;
+
+  php-application = ./websites/php-application.nix;
+  zrepl = ./zrepl.nix;
   websites = ./websites;
 } // (if builtins.pathExists ./private then import ./private else {})