X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fdefault.nix;h=84dbc65da22d34edcf5a56783dcc014b53b70052;hb=cf8a423107a502c4e90dc776f56121a44edf1afe;hp=11b3081631df78b4e4ec14c20fd0132171aeba08;hpb=910c2e9eb4996bfa12cd1ef925843403f7d3e154;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/modules/default.nix b/modules/default.nix
index 11b3081..84dbc65 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -1,29 +1,30 @@
+flakes:
 let
-  flakeCompat = import ../lib/flake-compat.nix;
-  flakeLib = (flakeCompat ../flakes/lib).lib;
+  public = flakes.subflakes.public;
+  flakeLib = flakes.subflakes.public.lib.lib;
 in
 {
-  myids = (flakeCompat ../flakes/myuids).nixosModule;
-  secrets = ./secrets.nix;
-  filesWatcher = flakeLib.withNarKeyCompat flakeCompat ../flakes/files-watcher "nixosModule";
+  myids = public.myuids.nixosModule;
+  secrets = flakeLib.withNarKey public.secrets "nixosModule";
+  #filesWatcher = flakeLib.withNarKey public.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 = (flakeCompat ../flakes/peertube).nixosModule;
-  fiche = ./webapps/fiche.nix;
-  paste = (flakeCompat ../flakes/paste).nixosModule;
+  diaspora = public.diaspora.nixosModule;
+  etherpad-lite = public.etherpad-lite.nixosModule;
+  mastodon = public.mastodon.nixosModule;
+  mediagoblin = public.mediagoblin.nixosModule;
+  peertube = public.peertube.nixosModule;
+  fiche = flakeLib.withNarKey public.fiche "nixosModule";
 
-  opendmarc = flakeLib.withNarKeyCompat flakeCompat ../flakes/opendmarc "nixosModule";
-  openarc = flakeLib.withNarKeyCompat flakeCompat ../flakes/openarc "nixosModule";
+  #paste = flakeLib.withNarKey public.paste "nixosModule";
+
+  #opendmarc = flakeLib.withNarKey public.opendmarc "nixosModule";
+  #openarc = flakeLib.withNarKey public.openarc "nixosModule";
 
   duplyBackup = ./duply_backup;
-  rsyncBackup = ./rsync_backup;
+  rsyncBackup = flakeLib.withNarKey public.rsync_backup "nixosModule";
   naemon = ./naemon;
 
-  php-application = ./websites/php-application.nix;
   zrepl = ./zrepl.nix;
   websites = ./websites;
 } // (if builtins.pathExists ./private then import ./private else {})