X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fdefault.nix;h=4516c8458099b67187531b77d76b3cff76bf70aa;hb=5492ca525f6b2e9339a29846b51662304bc7a49a;hp=7ce1cc2d1d836a39b89dd90b73c6bafedb2980e2;hpb=a9f52ec521e45204ad9363dd143b32ac9910b6b3;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/modules/default.nix b/modules/default.nix
index 7ce1cc2..4516c84 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -1,10 +1,11 @@
 let
   flakeCompat = import ../lib/flake-compat.nix;
+  flakeLib = (flakeCompat ../flakes/lib).lib;
 in
 {
   myids = (flakeCompat ../flakes/myuids).nixosModule;
-  secrets = ./secrets.nix;
-  filesWatcher = ./filesWatcher.nix;
+  secrets = flakeLib.withNarKeyCompat flakeCompat ../flakes/secrets "nixosModule";
+  filesWatcher = flakeLib.withNarKeyCompat flakeCompat ../flakes/files-watcher "nixosModule";
 
   webstats = ./webapps/webstats;
   diaspora = ./webapps/diaspora.nix;
@@ -12,17 +13,19 @@ in
   mastodon = ./webapps/mastodon.nix;
   mediagoblin = ./webapps/mediagoblin.nix;
   peertube = (flakeCompat ../flakes/peertube).nixosModule;
-  fiche = ./webapps/fiche.nix;
-  paste = (flakeCompat ../flakes/paste).nixosModule;
+  fiche = flakeLib.withNarKeyCompat flakeCompat ../flakes/fiche "nixosModule";
+  paste = flakeLib.withNarKeyCompat flakeCompat ../flakes/paste "nixosModule";
 
-  opendmarc = (flakeCompat ../flakes/opendmarc).nixosModule;
-  openarc = (flakeCompat ../flakes/openarc).nixosModule;
+  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;
+
+  galene = (flakeCompat ../flakes/backports).nixosModules.galene;
 } // (if builtins.pathExists ./private then import ./private else {})