X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=nixops%2Feldiron.nix;h=e95110fad2d1c613b6c81bef81b7656c1d905e75;hb=caa08508100ce2307a4c64ff047241572ff85b45;hp=8dc8c4d8273a8e09e624fc26e64d51f403f9a460;hpb=3de01f9b82ba8f80b2043f5c885ddca784d6701f;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/nixops/eldiron.nix b/nixops/eldiron.nix
index 8dc8c4d..e95110f 100644
--- a/nixops/eldiron.nix
+++ b/nixops/eldiron.nix
@@ -1,4 +1,4 @@
-{ environment ? ./environment.nix }:
+{ privateFiles ? ./. }:
 {
   network = {
     description = "Immae's network";
@@ -9,10 +9,12 @@
     with mylibs;
   {
     _module.args = {
-      mylibs = import ../libs.nix;
+      pkgsNext = import <nixpkgsNext> {};
+      mylibs = import ../libs.nix { nixpkgs = pkgs; };
       mypkgs = import ../default.nix;
       myconfig = {
-        env = import environment;
+        inherit privateFiles;
+        env = import "${privateFiles}/environment.nix";
         ips = {
           main = "176.9.151.89";
           production = "176.9.151.154";
@@ -29,6 +31,10 @@
       ./modules/websites
       ./modules/mail
       ./modules/ftp
+      ./modules/pub
+      ./modules/task
+      ./modules/irc
+      ./modules/buildbot
     ];
     services.myGitolite.enable = true;
     services.myDatabases.enable = true;
@@ -36,6 +42,10 @@
     services.myWebsites.integration.enable = true;
     services.myWebsites.tools.enable = true;
     services.pure-ftpd.enable = true;
+    services.irc.enable = true;
+    services.pub.enable = true;
+    services.myTasks.enable = true;
+    services.buildbot.enable = true;
 
     services.journald.extraConfig = ''
       MaxLevelStore="warning"