X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Feldiron.nix;h=5b70eb3dccc643d2f7edbea61c6c6c925b134e55;hb=31a38b9f53fdaf1bd1141bc6dbf777605dfed590;hp=d6915c291076ad1238a6f70c03b644f0d5bb6665;hpb=7636abc6bfcdca34d4b90a144365235012275339;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/nixops/eldiron.nix b/nixops/eldiron.nix
index d6915c2..5b70eb3 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,11 @@
     with mylibs;
   {
     _module.args = {
-      mylibs = import ../libs.nix;
+      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 +30,9 @@
       ./modules/websites
       ./modules/mail
       ./modules/ftp
+      ./modules/pub
+      ./modules/task
+      ./modules/irc
     ];
     services.myGitolite.enable = true;
     services.myDatabases.enable = true;
@@ -36,6 +40,9 @@
     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.journald.extraConfig = ''
       MaxLevelStore="warning"
@@ -107,5 +114,11 @@
         ''
       ];
     };
+
+    # This value determines the NixOS release with which your system is
+    # to be compatible, in order to avoid breaking some software such as
+    # database servers. You should change this only after NixOS release
+    # notes say you should.
+    system.stateVersion = "18.09"; # Did you read the comment?
   };
 }