X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=inline;f=modules%2Fdefault.nix;h=84dbc65da22d34edcf5a56783dcc014b53b70052;hb=420ca31ba31007c6802389ad01e7b04be7f1f618;hp=2c993c56b76a996a4383d33d322f0140e83230b6;hpb=9eae2b47b7b315b05a0e010f3003bd875685e260;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/modules/default.nix b/modules/default.nix
index 2c993c5..84dbc65 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -1,11 +1,30 @@
+flakes:
+let
+  public = flakes.subflakes.public;
+  flakeLib = flakes.subflakes.public.lib.lib;
+in
 {
-  myids = ./myids.nix;
-  secrets = ./secrets.nix;
+  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 = ./webapps/peertube.nix;
-}
+  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";
+
+  #paste = flakeLib.withNarKey public.paste "nixosModule";
+
+  #opendmarc = flakeLib.withNarKey public.opendmarc "nixosModule";
+  #openarc = flakeLib.withNarKey public.openarc "nixosModule";
+
+  duplyBackup = ./duply_backup;
+  rsyncBackup = flakeLib.withNarKey public.rsync_backup "nixosModule";
+  naemon = ./naemon;
+
+  zrepl = ./zrepl.nix;
+  websites = ./websites;
+} // (if builtins.pathExists ./private then import ./private else {})