X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Feldiron.nix;h=5b70eb3dccc643d2f7edbea61c6c6c925b134e55;hb=45cbd03cf9c4732fa0746a97e9c0cd93806725db;hp=2376e542c95d39fbab8b830d70803fd9b037c4ca;hpb=46228a293a4463a6384be301f56b78c5aeeb1e01;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/nixops/eldiron.nix b/nixops/eldiron.nix
index 2376e54..5b70eb3 100644
--- a/nixops/eldiron.nix
+++ b/nixops/eldiron.nix
@@ -1,4 +1,4 @@
-{ environment ? ./environment.nix }:
+{ privateFiles ? ./. }:
 {
   network = {
     description = "Immae's network";
@@ -9,9 +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";
@@ -28,6 +30,9 @@
       ./modules/websites
       ./modules/mail
       ./modules/ftp
+      ./modules/pub
+      ./modules/task
+      ./modules/irc
     ];
     services.myGitolite.enable = true;
     services.myDatabases.enable = true;
@@ -35,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"
@@ -106,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?
   };
 }