X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Feldiron.nix;h=69231d1336278e19bc620325e894e99babdde36e;hb=a1a8649a2be768685eb04c246c114fce36b8096f;hp=49940411c0b4972fcd42e573981586c8e4671b7a;hpb=c1b6f97a72e0b4897ce11414df28259d4ea3c5ab;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/nixops/eldiron.nix b/nixops/eldiron.nix
index 4994041..69231d1 100644
--- a/nixops/eldiron.nix
+++ b/nixops/eldiron.nix
@@ -5,14 +5,12 @@
     enableRollback = true;
   };
 
-  eldiron = { config, pkgs, mylibs, myconfig, ... }:
+  eldiron = { config, pkgs, myconfig, ... }:
   {
     nixpkgs.overlays = builtins.attrValues (import ../overlays);
     _module.args = {
       pkgsNext = import <nixpkgsNext> {};
       pkgsPrevious = import <nixpkgsPrevious> {};
-      mylibs = import ../libs.nix { nixpkgs = pkgs; };
-      mypkgs = import ../default.nix;
       myconfig = {
         inherit privateFiles;
         env = import "${privateFiles}/environment.nix";
@@ -36,25 +34,18 @@
       ./modules/ssh
       ./modules/certificates.nix
       ./modules/gitolite
-      ./modules/databases
-      ./modules/mpd
-      ./modules/websites
-      ./modules/mail
-      ./modules/ftp
+      ./modules/mpd.nix
+      ./modules/mail.nix
+      ./modules/ftp.nix
       ./modules/pub
       ./modules/task
-      ./modules/irc
       ./modules/buildbot
-      ./modules/dns
-      ./modules/secrets
-    ];
+      ./modules/dns.nix
+    ] ++ (builtins.attrValues (import ../modules));
+    myServices.databases.enable = true;
+    myServices.irc.enable = true;
     services.myGitolite.enable = true;
-    services.myDatabases.enable = true;
-    services.myWebsites.production.enable = true;
-    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;
@@ -84,13 +75,16 @@
       };
     };
 
-    environment.systemPackages = [
+    users.users.root.packages = [
       pkgs.telnet
       pkgs.htop
-      pkgs.vim
       pkgs.iftop
     ];
 
+    environment.systemPackages = [
+      pkgs.vim
+    ];
+
     services.cron = {
       enable = true;
       systemCronJobs = [