Refactor paste

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

diff --git a/modules/default.nix b/modules/default.nix
index 2c993c56b76a996a4383d33d322f0140e83230b6..630e8f500da61c0e3c54435c6e6a9eb8017038c4 100644 (file)
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -1,11 +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 = 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 = flakeLib.withNarKeyCompat flakeCompat ../flakes/opendmarc "nixosModule";
+  openarc = flakeLib.withNarKeyCompat 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 {})